diff --git a/infra/libkookie/nixpkgs/.github/CODEOWNERS b/infra/libkookie/nixpkgs/.github/CODEOWNERS index 7d0681a720c..048218a6d49 100644 --- a/infra/libkookie/nixpkgs/.github/CODEOWNERS +++ b/infra/libkookie/nixpkgs/.github/CODEOWNERS @@ -100,7 +100,7 @@ # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq -/pkgs/build-support/rust @andir @zowoq +/pkgs/build-support/rust @andir @danieldk @zowoq # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers diff --git a/infra/libkookie/nixpkgs/.github/workflows/rebase-staging.yml b/infra/libkookie/nixpkgs/.github/workflows/rebase-staging.yml deleted file mode 100644 index 41b06f95668..00000000000 --- a/infra/libkookie/nixpkgs/.github/workflows/rebase-staging.yml +++ /dev/null @@ -1,60 +0,0 @@ -on: - issue_comment: - types: - - created - -# This action allows people with write access to the repo to rebase a PRs base branch from -# master to staging by commenting `/rebase-staging` on the PR while avoiding CODEOWNER notifications. - -jobs: - rebase: - runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging') - steps: - - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ github.event.comment.id }} - reactions: eyes - - uses: scherermichael-oss/action-has-permission@1.0.6 - id: check-write-access - with: - required-permission: write - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: check base branch is master - if: steps.check-write-access.outputs.has-permission - run: | - if [ "$(curl https://api.github.com/repos/NixOS/nixpkgs/pulls/${{ github.event.issue.number }} | jq -r '.base.ref')" != "master" ]; then - echo "This action only works when the current base branch is master." - exit 1 - fi - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - if: steps.check-write-access.outputs.has-permission - - name: rebase pull request - if: steps.check-write-access.outputs.has-permission - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PULL_REQUEST: ${{ github.event.issue.number }} - run: | - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" - git fetch origin - gh pr checkout "$PULL_REQUEST" - git rebase \ - --onto="$(git merge-base origin/master origin/staging)" \ - "HEAD~$(git rev-list --count HEAD ^master)" - git push --force - curl \ - -X POST \ - -H "Accept: application/vnd.github.v3+json" \ - -H "Authorization: token $GITHUB_TOKEN" \ - -d '{ "base": "staging" }' \ - "https://api.github.com/repos/NixOS/nixpkgs/pulls/$PULL_REQUEST" - - uses: peter-evans/create-or-update-comment@v1 - if: ${{ failure() }} - with: - issue-number: ${{ github.event.issue.number }} - body: | - [Failed to rebase on `staging`](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}) diff --git a/infra/libkookie/nixpkgs/.github/workflows/rebase.yml b/infra/libkookie/nixpkgs/.github/workflows/rebase.yml new file mode 100644 index 00000000000..50d066dd754 --- /dev/null +++ b/infra/libkookie/nixpkgs/.github/workflows/rebase.yml @@ -0,0 +1,134 @@ +on: + issue_comment: + types: + - created + +# This action allows people with write access to the repo to rebase a PRs base branch +# by commenting `/rebase ${branch}` on the PR while avoiding CODEOWNER notifications. + +jobs: + rebase: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') + steps: + - uses: peter-evans/create-or-update-comment@v1 + with: + comment-id: ${{ github.event.comment.id }} + reactions: eyes + - uses: scherermichael-oss/action-has-permission@1.0.6 + id: check-write-access + with: + required-permission: write + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: check permissions + run: | + echo "Commenter doesn't have write access to the repo" + exit 1 + if: "! steps.check-write-access.outputs.has-permission" + - name: setup + run: | + curl "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}" 2>/dev/null >pr.json + cat <>"$GITHUB_ENV" + CAN_MODIFY=$(jq -r '.maintainer_can_modify' pr.json) + COMMITS=$(jq -r '.commits' pr.json) + CURRENT_BASE=$(jq -r '.base.ref' pr.json) + PR_BRANCH=$(jq -r '.head.ref' pr.json) + COMMENT_BRANCH=$(echo ${{ github.event.comment.body }} | awk "/^\/rebase / {print \$2}") + PULL_REQUEST=${{ github.event.issue.number }} + EOF + rm pr.json + - name: check branch + env: + PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging" + VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|staging|staging-20.09|staging-next" + run: | + message() { + cat < - + diff --git a/infra/libkookie/nixpkgs/doc/builders/images/dockertools.section.md b/infra/libkookie/nixpkgs/doc/builders/images/dockertools.section.md new file mode 100644 index 00000000000..0d7774e891e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/doc/builders/images/dockertools.xml b/infra/libkookie/nixpkgs/doc/builders/images/dockertools.xml deleted file mode 100644 index d881e712a04..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/doc/builders/packages/eclipse.section.md b/infra/libkookie/nixpkgs/doc/builders/packages/eclipse.section.md new file mode 100644 index 00000000000..faabb188450 --- /dev/null +++ b/infra/libkookie/nixpkgs/doc/builders/packages/eclipse.section.md @@ -0,0 +1,64 @@ +# Eclipse {#sec-eclipse} + +The Nix expressions related to the Eclipse platform and IDE are in [`pkgs/applications/editors/eclipse`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse). + +Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: + +```ShellSession +$ nix-env -f '' -qaP -A eclipses --description +``` + +Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. + +If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add + +```nix +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ plugins.color-theme ]; + }; +} +``` + +to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running + +```ShellSession +$ nix-env -f '' -qaP -A eclipses.plugins --description +``` + +If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively. + +Expanding the previous example with two plugins using the above functions we have + +```nix +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ + plugins.color-theme + (plugins.buildEclipsePlugin { + name = "myplugin1-1.0"; + srcFeature = fetchurl { + url = "http://…/features/myplugin1.jar"; + sha256 = "123…"; + }; + srcPlugin = fetchurl { + url = "http://…/plugins/myplugin1.jar"; + sha256 = "123…"; + }; + }); + (plugins.buildEclipseUpdateSite { + name = "myplugin2-1.0"; + src = fetchurl { + stripRoot = false; + url = "http://…/myplugin2.zip"; + sha256 = "123…"; + }; + }); + ]; + }; +} +``` diff --git a/infra/libkookie/nixpkgs/doc/builders/packages/eclipse.xml b/infra/libkookie/nixpkgs/doc/builders/packages/eclipse.xml deleted file mode 100644 index fc5094ed8f3..00000000000 --- a/infra/libkookie/nixpkgs/doc/builders/packages/eclipse.xml +++ /dev/null @@ -1,72 +0,0 @@ -
- Eclipse - - - The Nix expressions related to the Eclipse platform and IDE are in pkgs/applications/editors/eclipse. - - - - Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: - -$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description - - Once an Eclipse variant is installed it can be run using the eclipse command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. - - - - If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an Eclipse environment. This type of environment is created using the function eclipseWithPlugins found inside the nixpkgs.eclipses attribute set. This function takes as argument { eclipse, plugins ? [], jvmArgs ? [] } where eclipse is a one of the Eclipse packages described above, plugins is a list of plugin derivations, and jvmArgs is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add - -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ plugins.color-theme ]; - }; -} - - to your Nixpkgs configuration (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using eclipseWithPlugins by running - -$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description - - - - - If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the buildEclipseUpdateSite and buildEclipsePlugin functions found in the nixpkgs.eclipses.plugins attribute set. Use the buildEclipseUpdateSite function to install a plugin distributed as an Eclipse update site. This function takes { name, src } as argument where src indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the buildEclipsePlugin function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument { name, srcFeature, srcPlugin } where srcFeature and srcPlugin are the feature and plugin JARs, respectively. - - - - Expanding the previous example with two plugins using the above functions we have - -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ - plugins.color-theme - (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; - srcFeature = fetchurl { - url = "http://…/features/myplugin1.jar"; - sha256 = "123…"; - }; - srcPlugin = fetchurl { - url = "http://…/plugins/myplugin1.jar"; - sha256 = "123…"; - }; - }); - (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; - src = fetchurl { - stripRoot = false; - url = "http://…/myplugin2.zip"; - sha256 = "123…"; - }; - }); - ]; - }; -} - - -
diff --git a/infra/libkookie/nixpkgs/doc/builders/packages/index.xml b/infra/libkookie/nixpkgs/doc/builders/packages/index.xml index e4f8a1d3120..fac82180b26 100644 --- a/infra/libkookie/nixpkgs/doc/builders/packages/index.xml +++ b/infra/libkookie/nixpkgs/doc/builders/packages/index.xml @@ -7,7 +7,7 @@ - + diff --git a/infra/libkookie/nixpkgs/doc/contributing/submitting-changes.chapter.md b/infra/libkookie/nixpkgs/doc/contributing/submitting-changes.chapter.md index 40fc5ea7892..44e981f12a5 100644 --- a/infra/libkookie/nixpkgs/doc/contributing/submitting-changes.chapter.md +++ b/infra/libkookie/nixpkgs/doc/contributing/submitting-changes.chapter.md @@ -174,10 +174,13 @@ digraph { "staging-next" -> master [color="#E85EB0"] [label="stabilization ends"] [fontcolor="#E85EB0"] "staging" -> "staging-next" [color="#E85EB0"] [label="stabilization starts"] [fontcolor="#E85EB0"] - master -> "staging-next" -> staging [color="#5F5EE8"] [label="every six hours/any time"] [fontcolor="#5F5EE8"] + master -> "staging-next" -> staging [color="#5F5EE8"] [label="every six hours (GitHub Action)"] [fontcolor="#5F5EE8"] } ``` +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/merge-staging.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours. + + ### Master branch {#submitting-changes-master-branch} The `master` branch is the main development branch. It should only see non-breaking commits that do not cause mass rebuilds. diff --git a/infra/libkookie/nixpkgs/doc/languages-frameworks/python.section.md b/infra/libkookie/nixpkgs/doc/languages-frameworks/python.section.md index 71193ed0cc0..46491a785a7 100644 --- a/infra/libkookie/nixpkgs/doc/languages-frameworks/python.section.md +++ b/infra/libkookie/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" ]; ``` @@ -1554,9 +1554,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 +1570,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/infra/libkookie/nixpkgs/doc/languages-frameworks/qt.section.md b/infra/libkookie/nixpkgs/doc/languages-frameworks/qt.section.md index 5dd415852c1..b6525490c85 100644 --- a/infra/libkookie/nixpkgs/doc/languages-frameworks/qt.section.md +++ b/infra/libkookie/nixpkgs/doc/languages-frameworks/qt.section.md @@ -1,77 +1,88 @@ # Qt {#sec-language-qt} -This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. +Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software. +This section assumes some knowledge of the latter. +There are two problems that the Nixpkgs Qt infrastructure addresses, +which are not shared by other C++ software: -There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime. +1. There are usually multiple supported versions of Qt in Nixpkgs. + All of a package's dependencies must be built with the same version of Qt. + This is similar to the version constraints imposed on interpreted languages like Python. +2. Qt makes extensive use of runtime dependency detection. + Runtime dependencies are made into build dependencies through wrappers. ## Nix expression for a Qt package (default.nix) {#qt-default-nix} ```{=docbook} -{ mkDerivation, qtbase }: +{ stdenv, lib, qtbase, wrapQtAppsHook }: -mkDerivation { +stdenv.mkDerivation { pname = "myapp"; version = "1.0"; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ wrapQtAppsHook ]; } - Import mkDerivation and Qt (such as qtbase modules directly. Do not import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures. + Import Qt modules directly, that is: qtbase, qtdeclarative, etc. + Do not import Qt package sets such as qt5 + because the Qt versions of dependencies may not be coherent, causing build and runtime failures. - - Use mkDerivation instead of stdenv.mkDerivation. mkDerivation is a wrapper around stdenv.mkDerivation which applies some Qt-specific settings. This deriver accepts the same arguments as stdenv.mkDerivation; refer to for details. - - - To use another deriver instead of stdenv.mkDerivation, use mkDerivationWith: - -mkDerivationWith myDeriver { - # ... -} - - If you cannot use mkDerivationWith, please refer to . - - - - - mkDerivation accepts the same arguments as stdenv.mkDerivation, such as buildInputs. - + + All Qt packages must include wrapQtAppsHook in + nativeBuildInputs, or you must explicitly set + dontWrapQtApps. + ``` ## Locating runtime dependencies {#qt-runtime-dependencies} -Qt applications need to be wrapped to find runtime dependencies. If you cannot use `mkDerivation` or `mkDerivationWith` above, include `wrapQtAppsHook` in `nativeBuildInputs`: + +Qt applications must be wrapped to find runtime dependencies. +Include `wrapQtAppsHook` in `nativeBuildInputs`: ```nix +{ stdenv, wrapQtAppsHook }: + stdenv.mkDerivation { # ... - nativeBuildInputs = [ wrapQtAppsHook ]; } ``` -Entries added to `qtWrapperArgs` are used to modify the wrappers created by `wrapQtAppsHook`. The entries are passed as arguments to [wrapProgram executable makeWrapperArgs](#fun-wrapProgram). + +Add entries to `qtWrapperArgs` are to modify the wrappers created by +`wrapQtAppsHook`: ```nix -mkDerivation { - # ... +{ stdenv, wrapQtAppsHook }: +stdenv.mkDerivation { + # ... + nativeBuildInputs = [ wrapQtAppsHook ]; qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ]; } ``` -Set `dontWrapQtApps` to stop applications from being wrapped automatically. It is required to wrap applications manually with `wrapQtApp`, using the syntax of [wrapProgram executable makeWrapperArgs](#fun-wrapProgram): +The entries are passed as arguments to [wrapProgram](#fun-wrapProgram). + +Set `dontWrapQtApps` to stop applications from being wrapped automatically. +Wrap programs manually with `wrapQtApp`, using the syntax of +[wrapProgram](#fun-wrapProgram): ```nix -mkDerivation { - # ... +{ stdenv, lib, wrapQtAppsHook }: +stdenv.mkDerivation { + # ... + nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin @@ -79,21 +90,16 @@ mkDerivation { } ``` -> Note: `wrapQtAppsHook` ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT. +::: note +`wrapQtAppsHook` ignores files that are non-ELF executables. +This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. +An example of when you'd always need to do this is with Python applications that use PyQt. +::: -Libraries are built with every available version of Qt. Use the `meta.broken` attribute to disable the package for unsupported Qt versions: - -```nix -mkDerivation { - # ... - - # Disable this library with Qt < 5.9.0 - meta.broken = builtins.compareVersions qtbase.version "5.9.0" < 0; -} -``` ## Adding a library to Nixpkgs -Qt libraries are added to `qt5-packages.nix` and are made available for every Qt -version supported. +Add Qt libraries to `qt5-packages.nix` to make them available for every +supported Qt version. + ### Example adding a Qt library {#qt-library-all-packages-nix} The following represents the contents of `qt5-packages.nix`. @@ -106,9 +112,23 @@ The following represents the contents of `qt5-packages.nix`. # ... } ``` + +Libraries are built with every available version of Qt. +Use the `meta.broken` attribute to disable the package for unsupported Qt versions: + +```nix +{ stdenv, lib, qtbase }: + +stdenv.mkDerivation { + # ... + # Disable this library with Qt < 5.9.0 + meta.broken = lib.versionOlder qtbase.version "5.9.0"; +} +``` + ## Adding an application to Nixpkgs -Applications that use Qt are also added to `qt5-packages.nix`. An alias is added -in the top-level `all-packages.nix` pointing to the package with the desired Qt5 version. +Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix` +to select the Qt 5 version used for the application. ### Example adding a Qt application {#qt-application-all-packages-nix} diff --git a/infra/libkookie/nixpkgs/doc/languages-frameworks/rust.section.md b/infra/libkookie/nixpkgs/doc/languages-frameworks/rust.section.md index 8f6db28ab4d..94f94aaffe3 100644 --- a/infra/libkookie/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/infra/libkookie/nixpkgs/doc/languages-frameworks/rust.section.md @@ -80,6 +80,33 @@ The fetcher will verify that the `Cargo.lock` file is in sync with the `src` attribute, and fail the build if not. It will also will compress the vendor directory into a tar.gz archive. +The tarball with vendored dependencies contains a directory with the +package's `name`, which is normally composed of `pname` and +`version`. This means that the vendored dependencies hash +(`cargoSha256`/`cargoHash`) is dependent on the package name and +version. The `cargoDepsName` attribute can be used to use another name +for the directory of vendored dependencies. For example, the hash can +be made invariant to the version by setting `cargoDepsName` to +`pname`: + +```nix +rustPlatform.buildRustPackage rec { + pname = "broot"; + version = "1.2.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38"; + }; + + cargoHash = "sha256-JmBZcDVYJaK1cK05cxx5BrnGWp4t8ca6FLUbvIot67s="; + cargoDepsName = pname; + + # ... +} +``` + + ### Cross compilation By default, Rust packages are compiled for the host platform, just like any @@ -196,7 +223,7 @@ sometimes it may be necessary to disable this so the tests run consecutively. ```nix rustPlatform.buildRustPackage { /* ... */ - cargoParallelTestThreads = false; + dontUseCargoParallelTests = true; } ``` @@ -237,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/infra/libkookie/nixpkgs/doc/manual.xml b/infra/libkookie/nixpkgs/doc/manual.xml index 8cecb01fc22..b0490ec74ae 100644 --- a/infra/libkookie/nixpkgs/doc/manual.xml +++ b/infra/libkookie/nixpkgs/doc/manual.xml @@ -19,7 +19,7 @@ - + Builders diff --git a/infra/libkookie/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/infra/libkookie/nixpkgs/doc/stdenv/cross-compilation.chapter.md index d7a07a621be..ee090c82114 100644 --- a/infra/libkookie/nixpkgs/doc/stdenv/cross-compilation.chapter.md +++ b/infra/libkookie/nixpkgs/doc/stdenv/cross-compilation.chapter.md @@ -16,7 +16,7 @@ Nixpkgs follows the [conventions of GNU autoconf](https://gcc.gnu.org/onlinedocs In Nixpkgs, these three platforms are defined as attribute sets under the names `buildPlatform`, `hostPlatform`, and `targetPlatform`. They are always defined as attributes in the standard environment. That means one can access them like: ```nix -{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... +{ stdenv, fooDep, barDep, ... }: ...stdenv.buildPlatform... ``` `buildPlatform` @@ -99,15 +99,26 @@ Some examples will make this table clearer. Suppose there's some package that is Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list! +#### My package fails to find a binutils command (`cc`/`ar`/`ld` etc.) {#cross-qa-fails-to-find-binutils} +Many packages assume that an unprefixed binutils (`cc`/`ar`/`ld` etc.) is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefix. For instance, instead of `cc`, use `${stdenv.cc.targetPrefix}cc`. + +```nix +makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; +``` + +#### How do I avoid compiling a GCC cross-compiler from source? {#cross-qa-avoid-compiling-gcc-cross-compiler} +On less powerful machines, it can be inconvenient to cross-compile a package only to find out that GCC has to be compiled from source, which could take up to several hours. Nixpkgs maintains a limited [cross-related jobset on Hydra](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk), which tests cross-compilation to various platforms from build platforms "x86\_64-darwin", "x86\_64-linux", and "aarch64-linux". See `pkgs/top-level/release-cross.nix` for the full list of target platforms and packages. For instance, the following invocation fetches the pre-built cross-compiled GCC for `armv6l-unknown-linux-gnueabihf` and builds GNU Hello from source. + +```ShellSession +$ nix-build '' -A pkgsCross.raspberryPi.hello +``` + #### What if my package's build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment} Add the following to your `mkDerivation` invocation. ```nix depsBuildBuild = [ buildPackages.stdenv.cc ]; ``` -#### My package fails to find `ar`. {#cross-qa-fails-to-find-ar} -Many packages assume that an unprefixed `ar` is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`. - #### My package's testsuite needs to run host platform code. {#cross-testsuite-runs-host-code} Add the following to your `mkDerivation` invocation. diff --git a/infra/libkookie/nixpkgs/doc/stdenv/multiple-output.xml b/infra/libkookie/nixpkgs/doc/stdenv/multiple-output.xml index 20658918db7..f710a9959ad 100644 --- a/infra/libkookie/nixpkgs/doc/stdenv/multiple-output.xml +++ b/infra/libkookie/nixpkgs/doc/stdenv/multiple-output.xml @@ -154,7 +154,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 +164,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 +194,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 +204,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 +214,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 +224,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/infra/libkookie/nixpkgs/doc/stdenv/platform-notes.chapter.md b/infra/libkookie/nixpkgs/doc/stdenv/platform-notes.chapter.md new file mode 100644 index 00000000000..03e61e333f8 --- /dev/null +++ b/infra/libkookie/nixpkgs/doc/stdenv/platform-notes.chapter.md @@ -0,0 +1,62 @@ +# Platform Notes {#chap-platform-notes} + +## Darwin (macOS) {#sec-darwin} + +Some common issues when packaging software for Darwin: + +- The Darwin `stdenv` uses clang instead of gcc. When referring to the compiler `$CC` or `cc` will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like `makeFlags = [ "CC=cc" ];` or by patching the build scripts. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildPhase = '' + $CC -o hello hello.c + ''; + } + ``` + +- On Darwin, libraries are linked using absolute paths, libraries are resolved by their `install_name` at link time. Sometimes packages won’t set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running `install_name_tool -id` during the `fixupPhase`. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; + } + ``` + +- Even if the libraries are linked using absolute paths and resolved via their `install_name` correctly, tests can sometimes fail to run binaries. This happens because the `checkPhase` runs before the libraries are installed. + + This can usually be solved by running the tests after the `installPhase` or alternatively by using `DYLD_LIBRARY_PATH`. More information about this variable can be found in the *dyld(1)* manpage. + + ``` + dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib + Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq + Reason: image not found + ./tests/jqtest: line 5: 75779 Abort trap: 6 + ``` + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + doInstallCheck = true; + installCheckTarget = "check"; + } + ``` + +- Some packages assume xcode is available and use `xcrun` to resolve build tools like `clang`, etc. This causes errors like `xcode-select: error: no developer tools were found at '/Applications/Xcode.app'` while the build doesn’t actually depend on xcode. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin/xcrun clang' clang + ''; + } + ``` + + The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. diff --git a/infra/libkookie/nixpkgs/doc/stdenv/platform-notes.xml b/infra/libkookie/nixpkgs/doc/stdenv/platform-notes.xml deleted file mode 100644 index cc8efaece12..00000000000 --- a/infra/libkookie/nixpkgs/doc/stdenv/platform-notes.xml +++ /dev/null @@ -1,83 +0,0 @@ - - Platform Notes -
- Darwin (macOS) - - - Some common issues when packaging software for Darwin: - - - - - - The Darwin stdenv uses clang instead of gcc. When referring to the compiler $CC or cc will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like makeFlags = [ "CC=cc" ]; or by patching the build scripts. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - buildPhase = '' - $CC -o hello hello.c - ''; -} - - - - - On Darwin, libraries are linked using absolute paths, libraries are resolved by their install_name at link time. Sometimes packages won't set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running install_name_tool -id during the fixupPhase. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; -} - - - - - Even if the libraries are linked using absolute paths and resolved via their install_name correctly, tests can sometimes fail to run binaries. This happens because the checkPhase runs before the libraries are installed. - - - This can usually be solved by running the tests after the installPhase or alternatively by using DYLD_LIBRARY_PATH. More information about this variable can be found in the - dyld - 1 manpage. - - -dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib -Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq -Reason: image not found -./tests/jqtest: line 5: 75779 Abort trap: 6 - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - doInstallCheck = true; - installCheckTarget = "check"; -} - - - - - Some packages assume xcode is available and use xcrun to resolve build tools like clang, etc. This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' while the build doesn't actually depend on xcode. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - prePatch = '' - substituteInPlace Makefile \ - --replace '/usr/bin/xcrun clang' clang - ''; -} - - - The package xcbuild can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. - - - -
- diff --git a/infra/libkookie/nixpkgs/doc/using/configuration.xml b/infra/libkookie/nixpkgs/doc/using/configuration.xml index 2cd2615f54a..8e63e0072c8 100644 --- a/infra/libkookie/nixpkgs/doc/using/configuration.xml +++ b/infra/libkookie/nixpkgs/doc/using/configuration.xml @@ -151,26 +151,26 @@ - It is also possible to whitelist and blacklist licenses that are specifically acceptable or not acceptable, using whitelistedLicenses and blacklistedLicenses, respectively. + It is also possible to allow and block licenses that are specifically acceptable or not acceptable, using allowlistedLicenses and blocklistedLicenses, respectively. - The following example configuration whitelists the licenses amd and wtfpl: + The following example configuration allowlists the licenses amd and wtfpl: { - whitelistedLicenses = with lib.licenses; [ amd wtfpl ]; + allowlistedLicenses = with lib.licenses; [ amd wtfpl ]; } - The following example configuration blacklists the gpl3Only and agpl3Only licenses: + The following example configuration blocklists the gpl3Only and agpl3Only licenses: { - blacklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ]; + blocklistedLicenses = with lib.licenses; [ agpl3Only gpl3Only ]; } - Note that whitelistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic whitelist for all types of licenses. blacklistedLicenses 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/infra/libkookie/nixpkgs/lib/licenses.nix b/infra/libkookie/nixpkgs/lib/licenses.nix index ee136c7337c..993783db3ed 100644 --- a/infra/libkookie/nixpkgs/lib/licenses.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/maintainers/maintainer-list.nix b/infra/libkookie/nixpkgs/maintainers/maintainer-list.nix index f46e36c9899..78fc353a8bf 100644 --- a/infra/libkookie/nixpkgs/maintainers/maintainer-list.nix +++ b/infra/libkookie/nixpkgs/maintainers/maintainer-list.nix @@ -82,6 +82,12 @@ githubId = 882455; name = "Elliot Cameron"; }; + _414owen = { + email = "owen@owen.cafe"; + github = "414owen"; + githubId = 1714287; + name = "Owen Shepherd"; + }; _6AA4FD = { email = "f6442954@gmail.com"; github = "6AA4FD"; @@ -267,7 +273,7 @@ name = "James Alexander Feldman-Crough"; }; aforemny = { - email = "alexanderforemny@googlemail.com"; + email = "aforemny@posteo.de"; github = "aforemny"; githubId = 610962; name = "Alexander Foremny"; @@ -768,6 +774,12 @@ githubId = 3965744; name = "Arthur Lee"; }; + arthurteisseire = { + email = "arthurteisseire33@gmail.com"; + github = "arthurteisseire"; + githubId = 37193992; + name = "Arthur Teisseire"; + }; arturcygan = { email = "arczicygan@gmail.com"; github = "arcz"; @@ -1591,12 +1603,6 @@ githubId = 89596; name = "Florian Friesdorf"; }; - charvp = { - email = "nixpkgs@cvpetegem.be"; - github = "charvp"; - githubId = 42220376; - name = "Charlotte Van Petegem"; - }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; @@ -1705,6 +1711,18 @@ 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"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; @@ -2097,6 +2115,12 @@ email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; }; + davhau = { + email = "d.hauer.it@gmail.com"; + name = "David Hauer"; + github = "DavHau"; + githubId = 42246742; + }; david-sawatzke = { email = "d-nix@sawatzke.dev"; github = "david-sawatzke"; @@ -2399,6 +2423,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"; @@ -3043,6 +3077,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"; @@ -3279,6 +3319,12 @@ githubId = 10528737; name = "Severin Fürbringer"; }; + fufexan = { + email = "fufexan@protonmail.com"; + github = "fufexan"; + githubId = 36706276; + name = "Fufezan Mihai"; + }; funfunctor = { email = "eocallaghan@alterapraxis.com"; name = "Edward O'Callaghan"; @@ -3499,6 +3545,12 @@ githubId = 6893840; name = "Yacine Hmito"; }; + graham33 = { + email = "graham@grahambennett.org"; + github = "graham33"; + githubId = 10908649; + name = "Graham Bennett"; + }; grahamc = { email = "graham@grahamc.com"; github = "grahamc"; @@ -3581,6 +3633,12 @@ githubId = 443978; name = "Gabriel Volpe"; }; + gytis-ivaskevicius = { + name = "Gytis Ivaskevicius"; + email = "me@gytis.io"; + github = "gytis-ivaskevicius"; + githubId = 23264966; + }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; @@ -5848,6 +5906,12 @@ githubId = 35892750; name = "Maxine Aubrey"; }; + maxhbr = { + email = "nixos@maxhbr.dev"; + github = "maxhbr"; + githubId = 1187050; + name = "Maximilian Huber"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -5860,6 +5924,12 @@ githubId = 22836301; name = "Mateusz Mazur"; }; + mbaeten = { + email = "mbaeten@users.noreply.github.com"; + github = "mbaeten"; + githubId = 2649304; + name = "M. Baeten"; + }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; @@ -6007,7 +6077,7 @@ name = "Celine Mercier"; }; metadark = { - email = "kira.bruneau@gmail.com"; + email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; github = "metadark"; githubId = 382041; @@ -7155,6 +7225,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"; @@ -7371,6 +7447,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"; @@ -7401,6 +7487,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"; @@ -7985,6 +8081,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"; @@ -8289,6 +8391,12 @@ githubId = 2320433; name = "Sam Boosalis"; }; + sbruder = { + email = "nixos@sbruder.de"; + github = "sbruder"; + githubId = 15986681; + name = "Simon Bruder"; + }; scalavision = { email = "scalavision@gmail.com"; github = "scalavision"; @@ -8848,7 +8956,7 @@ name = "Guillaume Loetscher"; }; sternenseemann = { - email = "post@lukasepple.de"; + email = "sternenseemann@systemli.org"; github = "sternenseemann"; githubId = 3154475; name = "Lukas Epple"; @@ -9294,7 +9402,7 @@ name = "Jan Beinke"; }; thesola10 = { - email = "thesola10@bobile.fr"; + email = "me@thesola.io"; github = "thesola10"; githubId = 7287268; keys = [{ @@ -9363,6 +9471,16 @@ githubId = 1391883; name = "Tom Hall"; }; + Thunderbottom = { + email = "chinmaydpai@gmail.com"; + github = "Thunderbottom"; + githubId = 11243138; + name = "Chinmay D. Pai"; + keys = [{ + longkeyid = "rsa4096/0x75507BE256F40CED"; + fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; + }]; + }; tiagolobocastro = { email = "tiagolobocastro@gmail.com"; github = "tiagolobocastro"; @@ -9948,6 +10066,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"; @@ -10686,6 +10810,16 @@ 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"; @@ -10698,4 +10832,16 @@ github = "felixscheinost"; githubId = 31761492; }; + benneti = { + name = "Benedikt Tissot"; + email = "benedikt.tissot@googlemail.com"; + github = "benneti"; + githubId = 11725645; + }; + p3psi = { + name = "Elliot Boo"; + email = "p3psi.boo@gmail.com"; + github = "p3psi-boo"; + githubId = 43925055; + }; } diff --git a/infra/libkookie/nixpkgs/maintainers/scripts/nixpkgs-lint.nix b/infra/libkookie/nixpkgs/maintainers/scripts/nixpkgs-lint.nix index b0267281b38..873905373af 100644 --- a/infra/libkookie/nixpkgs/maintainers/scripts/nixpkgs-lint.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/config-file.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/config-file.xml index 7ccb5b3664e..19cfb57920d 100644 --- a/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/config-file.xml +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/networking.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/networking.xml index 02cf811e0bd..8369e9c9c85 100644 --- a/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/networking.xml +++ b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/networking.xml @@ -15,5 +15,6 @@ + diff --git a/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml index 04fa1643d0f..9c70cf35204 100644 --- a/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml +++ b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml @@ -16,6 +16,6 @@ On images where the installation media also becomes an installation target, copying over configuration.nix should be disabled by setting installer.cloneConfig to false. - For example, this is done in sd-image-aarch64.nix. + For example, this is done in sd-image-aarch64-installer.nix. diff --git a/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml new file mode 100644 index 00000000000..d760bb3a4da --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml @@ -0,0 +1,67 @@ +
+ Renaming network interfaces + + + NixOS uses the udev + predictable naming scheme + to assign names to network interfaces. This means that by default + cards are not given the traditional names like + eth0 or eth1, whose order can + change unpredictably across reboots. Instead, relying on physical + locations and firmware information, the scheme produces names like + ens1, enp2s0, etc. + + + + These names are predictable but less memorable and not necessarily + stable: for example installing new hardware or changing firmware + settings can result in a + name change. + If this is undesirable, for example if you have a single ethernet + card, you can revert to the traditional scheme by setting + to + false. + + +
+ Assigning custom names + + In case there are multiple interfaces of the same type, it’s better to + assign custom names based on the device hardware address. For + example, we assign the name wan to the interface + with MAC address 52:54:00:12:01:01 using a + netword link unit: + + + systemd.network.links."10-wan" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "wan"; + }; + + + Note that links are directly read by udev, not networkd, + and will work even if networkd is disabled. + + + Alternatively, we can use a plain old udev rule: + + + services.udev.initrdRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ + ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" + ''; + + + + The rule must be installed in the initrd using + services.udev.initrdRules, not the usual + services.udev.extraRules option. This is to avoid race + conditions with other programs controlling the interface. + +
+ +
diff --git a/infra/libkookie/nixpkgs/nixos/doc/manual/development/writing-modules.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/development/writing-modules.xml index d244356dbed..fad4637f51f 100644 --- a/infra/libkookie/nixpkgs/nixos/doc/manual/development/writing-modules.xml +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 4957b700946..019e5098a8e 100644 --- a/infra/libkookie/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/infra/libkookie/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -83,17 +83,12 @@ VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the /etc/nixos/configuration.nix to auto-mount them. If you do - not add "nofail", the system will not boot properly. The - same goes for disabling rngd which is normally used to get - randomness but this does not work in virtual machines. + not add "nofail", the system will not boot properly. { config, pkgs, ...} : { - security.rngd.enable = false; // otherwise vm will not boot - ... - fileSystems."/virtualboxshare" = { fsType = "vboxsf"; device = "nameofthesharedfolder"; diff --git a/infra/libkookie/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/infra/libkookie/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index 6dd14d6051e..566cd5d7240 100644 --- a/infra/libkookie/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/infra/libkookie/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -91,6 +91,27 @@ + + + If you are using to assign + custom names to network interfaces, this may stop working due to a change + in the initialisation of dhcpcd and systemd networkd. To avoid this, either + move them to or see the new + Assigning custom names section + of the NixOS manual for an example using networkd links. + + + + + The module has been removed. + It was broken since the switch to cgroups-v2. + + + + + The systemConfig kernel parameter is no longer added to boot loader entries. It has been unused since September 2010, but if do have a system generation from that era, you will now be unable to boot into them. + + systemd-journal2gelf no longer parses json and expects the receiving system to handle it. How to achieve this with Graylog is described in this GitHub issue. @@ -494,6 +515,30 @@ self: super: services.flashpolicyd module. + + + The security.rngd module has been removed. + It was disabled by default in 20.09 as it was functionally redundant + with krngd in the linux kernel. It is not necessary for any device that the kernel recognises + 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. + + @@ -528,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. @@ -700,6 +747,13 @@ 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. + + diff --git a/infra/libkookie/nixpkgs/nixos/lib/make-squashfs.nix b/infra/libkookie/nixpkgs/nixos/lib/make-squashfs.nix index ee76c9c5bf2..8690c42e7ac 100644 --- a/infra/libkookie/nixpkgs/nixos/lib/make-squashfs.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/config/console.nix b/infra/libkookie/nixpkgs/nixos/modules/config/console.nix index 1339227f1e0..84ad76246fd 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/config/console.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/config/console.nix @@ -144,11 +144,16 @@ in ''} ''; - systemd.services.systemd-vconsole-setup = - { - before = optional config.services.xserver.enable "display-manager.service"; - after = [ "systemd-udev-settle.service" ]; + systemd.services.reload-systemd-vconsole-setup = + { description = "Reset console on configuration changes"; + wantedBy = [ "multi-user.target" ]; restartTriggers = [ vconsoleConf consoleEnv ]; + reloadIfChanged = true; + serviceConfig = + { RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "/run/current-system/systemd/bin/systemctl restart systemd-vconsole-setup"; + }; }; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/config/swap.nix b/infra/libkookie/nixpkgs/nixos/modules/config/swap.nix index 4bb66e9b514..59bc9e9d11e 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/config/swap.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/config/swap.nix @@ -185,8 +185,6 @@ in { description = "Initialisation of swap device ${sw.device}"; wantedBy = [ "${realDevice'}.swap" ]; before = [ "${realDevice'}.swap" ]; - # If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot - after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ]; path = [ pkgs.util-linux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup; script = diff --git a/infra/libkookie/nixpkgs/nixos/modules/config/users-groups.nix b/infra/libkookie/nixpkgs/nixos/modules/config/users-groups.nix index 5b3e9a8ceb7..1a530b9f013 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/config/users-groups.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/config/users-groups.nix @@ -568,7 +568,7 @@ in { # Install all the user shells environment.systemPackages = systemShells; - environment.etc = (mapAttrs' (name: { packages, ... }: { + environment.etc = (mapAttrs' (_: { packages, name, ... }: { name = "profiles/per-user/${name}"; value.source = pkgs.buildEnv { name = "user-environment"; diff --git a/infra/libkookie/nixpkgs/nixos/modules/hardware/ksm.nix b/infra/libkookie/nixpkgs/nixos/modules/hardware/ksm.nix index 0938dbdc110..829c3532c45 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/hardware/ksm.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix index 2882fbcc730..a669d61571f 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix @@ -1,7 +1,14 @@ -{ pkgs, ... }: - +{ config, ... }: { - imports = [ ./sd-image-aarch64.nix ]; - - boot.kernelPackages = pkgs.linuxPackages_latest; + imports = [ + ../sd-card/sd-image-aarch64-new-kernel-installer.nix + ]; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead. + '' + ]; + }; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index e4ec2d6240d..76c1509b8f7 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -1,80 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix + ../sd-card/sd-image-aarch64-installer.nix ]; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; - - boot.consoleLogLevel = lib.mkDefault 7; - - # The serial ports listed here are: - # - ttyS0: for Tegra (Jetson TX1) - # - ttyAMA0: for QEMU's -machine virt - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; - - boot.initrd.availableKernelModules = [ - # Allows early (earlier) modesetting for the Raspberry Pi - "vc4" "bcm2835_dma" "i2c_bcm2835" - # Allows early (earlier) modesetting for Allwinner SoCs - "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer" - ]; - - sdImage = { - populateFirmwareCommands = let - configTxt = pkgs.writeText "config.txt" '' - [pi3] - kernel=u-boot-rpi3.bin - - [pi4] - kernel=u-boot-rpi4.bin - enable_gic=1 - armstub=armstub8-gic.bin - - # Otherwise the resolution will be weird in most cases, compared to - # what the pi3 firmware does by default. - disable_overscan=1 - - [all] - # Boot in 64-bit mode. - arm_64bit=1 - - # U-Boot needs this to work, regardless of whether UART is actually used or not. - # Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still - # a requirement in the future. - enable_uart=1 - - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 - ''; - in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - - # Add the config - cp ${configTxt} firmware/config.txt - - # Add pi3 specific files - cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin - - # Add pi4 specific files - cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin - cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ - ''; - populateRootCommands = '' - mkdir -p ./files/boot - ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot - ''; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead. + '' + ]; }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index d2ba611532e..6ee0eb9e9b8 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -1,57 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix + ../sd-card/sd-image-armv7l-multiplatform-installer.nix ]; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; - - boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_latest; - # The serial ports listed here are: - # - ttyS0: for Tegra (Jetson TK1) - # - ttymxc0: for i.MX6 (Wandboard) - # - ttyAMA0: for Allwinner (pcDuino3 Nano) and QEMU's -machine virt - # - ttyO0: for OMAP (BeagleBone Black) - # - ttySAC2: for Exynos (ODROID-XU3) - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; - - sdImage = { - populateFirmwareCommands = let - configTxt = pkgs.writeText "config.txt" '' - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 - - [pi2] - kernel=u-boot-rpi2.bin - - [pi3] - kernel=u-boot-rpi3.bin - - # U-Boot used to need this to work, regardless of whether UART is actually used or not. - # TODO: check when/if this can be removed. - enable_uart=1 - ''; - in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - cp ${pkgs.ubootRaspberryPi2}/u-boot.bin firmware/u-boot-rpi2.bin - cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin firmware/u-boot-rpi3.bin - cp ${configTxt} firmware/config.txt - ''; - populateRootCommands = '' - mkdir -p ./files/boot - ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot - ''; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead. + '' + ]; }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 40a01f96177..747440ba9c6 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -1,46 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix + ../sd-card/sd-image-raspberrypi-installer.nix ]; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; - - boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_rpi1; - - sdImage = { - populateFirmwareCommands = let - configTxt = pkgs.writeText "config.txt" '' - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 - - [pi0] - kernel=u-boot-rpi0.bin - - [pi1] - kernel=u-boot-rpi1.bin - ''; - in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin firmware/u-boot-rpi0.bin - cp ${pkgs.ubootRaspberryPi}/u-boot.bin firmware/u-boot-rpi1.bin - cp ${configTxt} firmware/config.txt - ''; - populateRootCommands = '' - mkdir -p ./files/boot - ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot - ''; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead. + '' + ]; }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 5bdec7de86e..79db1fa29bc 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -1,8 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { - imports = [ ./sd-image-aarch64.nix ]; - boot.kernelPackages = pkgs.linuxPackages_rpi4; + imports = [ + ../sd-card/sd-image-raspberrypi4-installer.nix + ]; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead. + '' + ]; + }; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix index b811ae07eb0..e2d6dcb3fe3 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix @@ -1,245 +1,14 @@ -# This module creates a bootable SD card image containing the given NixOS -# configuration. The generated image is MBR partitioned, with a FAT -# /boot/firmware partition, and ext4 root partition. The generated image -# is sized to fit its contents, and a boot script automatically resizes -# the root partition to fit the device on the first boot. -# -# The firmware partition is built with expectation to hold the Raspberry -# Pi firmware and bootloader, and be removed and replaced with a firmware -# build for the target SoC for other board families. -# -# The derivation for the SD image will be placed in -# config.system.build.sdImage - -{ config, lib, pkgs, ... }: - -with lib; - -let - rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ - inherit (config.sdImage) storePaths; - compressImage = true; - populateImageCommands = config.sdImage.populateRootCommands; - volumeLabel = "NIXOS_SD"; - } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { - uuid = config.sdImage.rootPartitionUUID; - }); -in +{ config, ... }: { imports = [ - (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.") - (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.") + ../sd-card/sd-image.nix ]; - - options.sdImage = { - imageName = mkOption { - default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.img"; - description = '' - Name of the generated image file. - ''; - }; - - imageBaseName = mkOption { - default = "nixos-sd-image"; - description = '' - Prefix of the name of the generated image file. - ''; - }; - - storePaths = mkOption { - type = with types; listOf package; - example = literalExample "[ pkgs.stdenv ]"; - description = '' - Derivations to be included in the Nix store in the generated SD image. - ''; - }; - - firmwarePartitionID = mkOption { - type = types.str; - default = "0x2178694e"; - description = '' - Volume ID for the /boot/firmware partition on the SD card. This value - must be a 32-bit hexadecimal number. - ''; - }; - - firmwarePartitionName = mkOption { - type = types.str; - default = "FIRMWARE"; - description = '' - Name of the filesystem which holds the boot firmware. - ''; - }; - - rootPartitionUUID = mkOption { - type = types.nullOr types.str; - default = null; - example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7"; - description = '' - UUID for the filesystem on the main NixOS partition on the SD card. - ''; - }; - - firmwareSize = mkOption { - type = types.int; - # As of 2019-08-18 the Raspberry pi firmware + u-boot takes ~18MiB - default = 30; - description = '' - Size of the /boot/firmware partition, in megabytes. - ''; - }; - - populateFirmwareCommands = mkOption { - example = literalExample "'' cp \${pkgs.myBootLoader}/u-boot.bin firmware/ ''"; - description = '' - Shell commands to populate the ./firmware directory. - All files in that directory are copied to the - /boot/firmware partition on the SD image. - ''; - }; - - populateRootCommands = mkOption { - example = literalExample "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''"; - description = '' - Shell commands to populate the ./files directory. - All files in that directory are copied to the - root (/) partition on the SD image. Use this to - populate the ./files/boot (/boot) directory. - ''; - }; - - postBuildCommands = mkOption { - example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''"; - default = ""; - description = '' - Shell commands to run after the image is built. - Can be used for boards requiring to dd u-boot SPL before actual partitions. - ''; - }; - - compressImage = mkOption { - type = types.bool; - default = true; - description = '' - Whether the SD image should be compressed using - zstd. - ''; - }; - - }; - config = { - fileSystems = { - "/boot/firmware" = { - device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}"; - fsType = "vfat"; - # Alternatively, this could be removed from the configuration. - # The filesystem is not needed at runtime, it could be treated - # as an opaque blob instead of a discrete FAT32 filesystem. - options = [ "nofail" "noauto" ]; - }; - "/" = { - device = "/dev/disk/by-label/NIXOS_SD"; - fsType = "ext4"; - }; - }; - - sdImage.storePaths = [ config.system.build.toplevel ]; - - system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, - mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation { - name = config.sdImage.imageName; - - nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ]; - - inherit (config.sdImage) compressImage; - - buildCommand = '' - mkdir -p $out/nix-support $out/sd-image - export img=$out/sd-image/${config.sdImage.imageName} - - echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system - if test -n "$compressImage"; then - echo "file sd-image $img.zst" >> $out/nix-support/hydra-build-products - else - echo "file sd-image $img" >> $out/nix-support/hydra-build-products - fi - - echo "Decompressing rootfs image" - zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img - - # Gap in front of the first partition, in MiB - gap=8 - - # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. - rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') - firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512)) - imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024)) - truncate -s $imageSize $img - - # type=b is 'W95 FAT32', type=83 is 'Linux'. - # The "bootable" partition is where u-boot will look file for the bootloader - # information (dtbs, extlinux.conf file). - sfdisk $img <zstd. + ''; + }; + + }; + + config = { + fileSystems = { + "/boot/firmware" = { + device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}"; + fsType = "vfat"; + # Alternatively, this could be removed from the configuration. + # The filesystem is not needed at runtime, it could be treated + # as an opaque blob instead of a discrete FAT32 filesystem. + options = [ "nofail" "noauto" ]; + }; + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; + }; + + sdImage.storePaths = [ config.system.build.toplevel ]; + + system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, + mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation { + name = config.sdImage.imageName; + + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ]; + + inherit (config.sdImage) compressImage; + + buildCommand = '' + mkdir -p $out/nix-support $out/sd-image + export img=$out/sd-image/${config.sdImage.imageName} + + echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system + if test -n "$compressImage"; then + echo "file sd-image $img.zst" >> $out/nix-support/hydra-build-products + else + echo "file sd-image $img" >> $out/nix-support/hydra-build-products + fi + + echo "Decompressing rootfs image" + zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img + + # Gap in front of the first partition, in MiB + gap=8 + + # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. + rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') + firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512)) + imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024)) + truncate -s $imageSize $img + + # type=b is 'W95 FAT32', type=83 is 'Linux'. + # The "bootable" partition is where u-boot will look file for the bootloader + # information (dtbs, extlinux.conf file). + sfdisk $img <nixos-generate-config saves to /etc/nixos/configuration.nix. @@ -136,6 +137,8 @@ in # keyMap = "us"; # }; + $xserverConfig + $desktopConfiguration # Configure keymap in X11 # services.xserver.layout = "us"; diff --git a/infra/libkookie/nixpkgs/nixos/modules/misc/crashdump.nix b/infra/libkookie/nixpkgs/nixos/modules/misc/crashdump.nix index 11dec37b3fa..796078d7ef8 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/misc/crashdump.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/misc/crashdump.nix @@ -53,7 +53,7 @@ in ${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \ --initrd=/run/current-system/initrd \ --reset-vga --console-vga \ - --command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" + --command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" ''; kernelParams = [ "crashkernel=${crashdump.reservedMemory}" diff --git a/infra/libkookie/nixpkgs/nixos/modules/module-list.nix b/infra/libkookie/nixpkgs/nixos/modules/module-list.nix index 5242ac05357..f91c21ad5cb 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/module-list.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/module-list.nix @@ -80,6 +80,7 @@ ./hardware/video/displaylink.nix ./hardware/video/hidpi.nix ./hardware/video/nvidia.nix + ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix ./hardware/xpadneo.nix @@ -206,7 +207,6 @@ ./security/dhparams.nix ./security/duosec.nix ./security/google_oslogin.nix - ./security/hidepid.nix ./security/lock-kernel-modules.nix ./security/misc.nix ./security/oath.nix @@ -256,6 +256,8 @@ ./services/backup/tsm.nix ./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 @@ -320,7 +322,8 @@ ./services/desktops/gsignond.nix ./services/desktops/gvfs.nix ./services/desktops/malcontent.nix - ./services/desktops/pipewire.nix + ./services/desktops/pipewire/pipewire.nix + ./services/desktops/pipewire/pipewire-media-session.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix @@ -379,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 @@ -459,6 +463,7 @@ ./services/misc/errbot.nix ./services/misc/etcd.nix ./services/misc/etebase-server.nix + ./services/misc/etesync-dav.nix ./services/misc/ethminer.nix ./services/misc/exhibitor.nix ./services/misc/felix.nix @@ -485,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 @@ -507,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 diff --git a/infra/libkookie/nixpkgs/nixos/modules/profiles/hardened.nix b/infra/libkookie/nixpkgs/nixos/modules/profiles/hardened.nix index 680fa40b911..00aafc6831b 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/profiles/hardened.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/profiles/hardened.nix @@ -22,8 +22,6 @@ with lib; environment.memoryAllocator.provider = mkDefault "scudo"; environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; - security.hideProcessInformation = mkDefault true; - security.lockKernelModules = mkDefault true; security.protectKernelImage = mkDefault true; diff --git a/infra/libkookie/nixpkgs/nixos/modules/programs/steam.nix b/infra/libkookie/nixpkgs/nixos/modules/programs/steam.nix index 3c919c47a0c..6b805c374a0 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/programs/steam.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/programs/steam.nix @@ -4,12 +4,20 @@ with lib; let cfg = config.programs.steam; + + steam = pkgs.steam.override { + extraLibraries = pkgs: with config.hardware.opengl; + if pkgs.hostPlatform.is64bit + then [ package ] ++ extraPackages + else [ package32 ] ++ extraPackages32; + }; in { options.programs.steam.enable = mkEnableOption "steam"; 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; }; @@ -18,7 +26,7 @@ in { hardware.steam-hardware.enable = true; - environment.systemPackages = [ pkgs.steam ]; + environment.systemPackages = [ steam steam.run ]; }; meta.maintainers = with maintainers; [ mkg20001 ]; diff --git a/infra/libkookie/nixpkgs/nixos/modules/rename.nix b/infra/libkookie/nixpkgs/nixos/modules/rename.nix index 2d07e421efe..9f1efc46279 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/rename.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/rename.nix @@ -73,6 +73,11 @@ with lib; (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") + (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' + The hidepid module was removed, since the underlying machinery + is broken when using cgroups-v2. + '') + # Do NOT add any option renames here, see top of the file ]; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/security/hidepid.nix b/infra/libkookie/nixpkgs/nixos/modules/security/hidepid.nix deleted file mode 100644 index 4953f517e93..00000000000 --- a/infra/libkookie/nixpkgs/nixos/modules/security/hidepid.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, ... }: -with lib; - -{ - meta = { - maintainers = [ maintainers.joachifm ]; - doc = ./hidepid.xml; - }; - - options = { - security.hideProcessInformation = mkOption { - type = types.bool; - default = false; - description = '' - Restrict process information to the owning user. - ''; - }; - }; - - config = mkIf config.security.hideProcessInformation { - users.groups.proc.gid = config.ids.gids.proc; - users.groups.proc.members = [ "polkituser" ]; - - boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ]; - systemd.services.systemd-logind.serviceConfig.SupplementaryGroups = [ "proc" ]; - - # Disable cgroupsv2, which doesn't work with hidepid. - # https://github.com/NixOS/nixpkgs/pull/104094#issuecomment-729996203 - systemd.enableUnifiedCgroupHierarchy = false; - }; -} diff --git a/infra/libkookie/nixpkgs/nixos/modules/security/hidepid.xml b/infra/libkookie/nixpkgs/nixos/modules/security/hidepid.xml deleted file mode 100644 index 5a17cb1da41..00000000000 --- a/infra/libkookie/nixpkgs/nixos/modules/security/hidepid.xml +++ /dev/null @@ -1,28 +0,0 @@ - - Hiding process information - - Setting - - = true; - - ensures that access to process information is restricted to the owning user. - This implies, among other things, that command-line arguments remain private. - Unless your deployment relies on unprivileged users being able to inspect the - process information of other users, this option should be safe to enable. - - - Members of the proc group are exempt from process - information hiding. - - - To allow a service foo to run without process - information hiding, set - -systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; - - - diff --git a/infra/libkookie/nixpkgs/nixos/modules/security/rngd.nix b/infra/libkookie/nixpkgs/nixos/modules/security/rngd.nix index cb885c4762d..8cca1c26d68 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/security/rngd.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/security/rngd.nix @@ -1,56 +1,16 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ lib, ... }: let - cfg = config.security.rngd; + removed = k: lib.mkRemovedOptionModule [ "security" "rngd" k ]; in { - options = { - security.rngd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the rng daemon. Devices that the kernel recognises - as entropy sources are handled automatically by krngd. - ''; - }; - debug = mkOption { - type = types.bool; - default = false; - description = "Whether to enable debug output (-d)."; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.rngd = { - bindsTo = [ "dev-random.device" ]; - - after = [ "dev-random.device" ]; - - # Clean shutdown without DefaultDependencies - conflicts = [ "shutdown.target" ]; - before = [ - "sysinit.target" - "shutdown.target" - ]; - - description = "Hardware RNG Entropy Gatherer Daemon"; - - # rngd may have to start early to avoid entropy starvation during boot with encrypted swap - unitConfig.DefaultDependencies = false; - serviceConfig = { - ExecStart = "${pkgs.rng-tools}/sbin/rngd -f" - + optionalString cfg.debug " -d"; - # PrivateTmp would introduce a circular dependency if /tmp is on tmpfs and swap is encrypted, - # thus depending on rngd before swap, while swap depends on rngd to avoid entropy starvation. - NoNewPrivileges = true; - PrivateNetwork = true; - ProtectSystem = "full"; - ProtectHome = true; - }; - }; - }; + imports = [ + (removed "enable" '' + rngd is not necessary for any device that the kernel recognises + 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. + '') + (removed "debug" + "The rngd module was removed, so its debug option does nothing.") + ]; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/backup/zrepl.nix b/infra/libkookie/nixpkgs/nixos/modules/services/backup/zrepl.nix new file mode 100644 index 00000000000..4356479b663 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix b/infra/libkookie/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix new file mode 100644 index 00000000000..be3f40f6bd8 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix @@ -0,0 +1,178 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + eachGeth = config.services.geth; + + gethOpts = { config, lib, name, ...}: { + + options = { + + enable = lib.mkEnableOption "Go Ethereum Node"; + + port = mkOption { + type = types.port; + default = 30303; + description = "Port number Go Ethereum will be listening on, both TCP and UDP."; + }; + + http = { + enable = lib.mkEnableOption "Go Ethereum HTTP API"; + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Listen address of Go Ethereum HTTP API."; + }; + + port = mkOption { + type = types.port; + default = 8545; + description = "Port number of Go Ethereum HTTP API."; + }; + + apis = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = "APIs to enable over WebSocket"; + example = ["net" "eth"]; + }; + }; + + websocket = { + enable = lib.mkEnableOption "Go Ethereum WebSocket API"; + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Listen address of Go Ethereum WebSocket API."; + }; + + port = mkOption { + type = types.port; + default = 8546; + description = "Port number of Go Ethereum WebSocket API."; + }; + + apis = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = "APIs to enable over WebSocket"; + example = ["net" "eth"]; + }; + }; + + metrics = { + enable = lib.mkEnableOption "Go Ethereum prometheus metrics"; + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Listen address of Go Ethereum metrics service."; + }; + + port = mkOption { + type = types.port; + default = 6060; + description = "Port number of Go Ethereum metrics service."; + }; + }; + + network = mkOption { + type = types.nullOr (types.enum [ "goerli" "rinkeby" "yolov2" "ropsten" ]); + default = null; + description = "The network to connect to. Mainnet (null) is the default ethereum network."; + }; + + syncmode = mkOption { + type = types.enum [ "fast" "full" "light" ]; + default = "fast"; + description = "Blockchain sync mode."; + }; + + gcmode = mkOption { + type = types.enum [ "full" "archive" ]; + default = "full"; + description = "Blockchain garbage collection mode."; + }; + + maxpeers = mkOption { + type = types.int; + default = 50; + description = "Maximum peers to connect to."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + description = "Additional arguments passed to Go Ethereum."; + default = []; + }; + + package = mkOption { + default = pkgs.go-ethereum.geth; + type = types.package; + description = "Package to use as Go Ethereum node."; + }; + }; + }; +in + +{ + + ###### interface + + options = { + services.geth = mkOption { + type = types.attrsOf (types.submodule gethOpts); + default = {}; + description = "Specification of one or more geth instances."; + }; + }; + + ###### implementation + + config = mkIf (eachGeth != {}) { + + environment.systemPackages = flatten (mapAttrsToList (gethName: cfg: [ + cfg.package + ]) eachGeth); + + systemd.services = mapAttrs' (gethName: cfg: ( + nameValuePair "geth-${gethName}" (mkIf cfg.enable { + description = "Go Ethereum node (${gethName})"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + Restart = "always"; + StateDirectory = "goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network}"; + + # Hardening measures + PrivateTmp = "true"; + ProtectSystem = "full"; + NoNewPrivileges = "true"; + PrivateDevices = "true"; + MemoryDenyWriteExecute = "true"; + }; + + script = '' + ${cfg.package}/bin/geth \ + --nousb \ + --ipcdisable \ + ${optionalString (cfg.network != null) ''--${cfg.network}''} \ + --syncmode ${cfg.syncmode} \ + --gcmode ${cfg.gcmode} \ + --port ${toString cfg.port} \ + --maxpeers ${toString cfg.maxpeers} \ + ${if cfg.http.enable then ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}'' else ""} \ + ${optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''} \ + ${if cfg.websocket.enable then ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}'' else ""} \ + ${optionalString (cfg.websocket.apis != null) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''} \ + ${optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \ + ${lib.escapeShellArgs cfg.extraArgs} \ + --datadir /var/lib/goethereum/${gethName}/${if (cfg.network == null) then "mainnet" else cfg.network} + ''; + }))) eachGeth; + + }; + +} diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/infra/libkookie/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index 887a0cbf9a7..2206ac522e4 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/databases/mysql.nix b/infra/libkookie/nixpkgs/nixos/modules/services/databases/mysql.nix index 7d0a3f9afc4..cf105daeb04 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/databases/mysql.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/databases/mysql.nix @@ -375,6 +375,18 @@ in fi ''; + script = '' + # https://mariadb.com/kb/en/getting-started-with-mariadb-galera-cluster/#systemd-and-galera-recovery + if test -n "''${_WSREP_START_POSITION}"; then + if test -e "${cfg.package}/bin/galera_recovery"; then + VAR=$(cd ${cfg.package}/bin/..; ${cfg.package}/bin/galera_recovery); [[ $? -eq 0 ]] && export _WSREP_START_POSITION=$VAR || exit 1 + fi + fi + + # The last two environment variables are used for starting Galera clusters + exec ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION + ''; + postStart = let # The super user account to use on *first* run of MySQL server superUser = if isMariaDB then cfg.user else "root"; @@ -481,8 +493,7 @@ in Type = if hasNotify then "notify" else "simple"; Restart = "on-abort"; RestartSec = "5s"; - # The last two environment variables are used for starting Galera clusters - ExecStart = "${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION"; + # User and group User = cfg.user; Group = cfg.group; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire.nix b/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire.nix deleted file mode 100644 index 134becf6b0c..00000000000 --- a/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire.nix +++ /dev/null @@ -1,183 +0,0 @@ -# pipewire service. -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.pipewire; - enable32BitAlsaPlugins = cfg.alsa.support32Bit - && pkgs.stdenv.isx86_64 - && pkgs.pkgsi686Linux.pipewire != null; - - # The package doesn't output to $out/lib/pipewire directly so that the - # overlays can use the outputs to replace the originals in FHS environments. - # - # This doesn't work in general because of missing development information. - jack-libs = pkgs.runCommand "jack-libs" {} '' - mkdir -p "$out/lib" - ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire" - ''; -in { - - meta = { - maintainers = teams.freedesktop.members; - }; - - ###### interface - options = { - services.pipewire = { - enable = mkEnableOption "pipewire service"; - - package = mkOption { - type = types.package; - default = pkgs.pipewire; - defaultText = "pkgs.pipewire"; - example = literalExample "pkgs.pipewire"; - description = '' - The pipewire derivation to use. - ''; - }; - - socketActivation = mkOption { - default = true; - type = types.bool; - description = '' - Automatically run pipewire when connections are made to the pipewire socket. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Literal string to append to /etc/pipewire/pipewire.conf. - ''; - }; - - sessionManager = mkOption { - type = types.nullOr types.string; - default = null; - example = literalExample ''"''${pipewire}/bin/pipewire-media-session"''; - description = '' - Path to the pipewire session manager executable. - ''; - }; - - sessionManagerArguments = mkOption { - type = types.listOf types.string; - default = []; - example = literalExample ''[ "-p" "bluez5.msbc-support=true" ]''; - description = '' - Arguments passed to the pipewire session manager. - ''; - }; - - alsa = { - enable = mkEnableOption "ALSA support"; - support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; - }; - - jack = { - enable = mkEnableOption "JACK audio emulation"; - }; - - pulse = { - enable = mkEnableOption "PulseAudio server emulation"; - }; - }; - }; - - - ###### implementation - config = mkIf cfg.enable { - assertions = [ - { - assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; - message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; - } - { - assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; - message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; - } - ]; - - services.pipewire.sessionManager = mkDefault "${cfg.package}/bin/pipewire-media-session"; - - environment.systemPackages = [ cfg.package ] - ++ lib.optional cfg.jack.enable jack-libs; - - systemd.packages = [ cfg.package ] - ++ lib.optional cfg.pulse.enable cfg.package.pulse; - - # PipeWire depends on DBUS but doesn't list it. Without this booting - # into a terminal results in the service crashing with an error. - systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; - systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; - systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; - services.udev.packages = [ cfg.package ]; - - # If any paths are updated here they must also be updated in the package test. - environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable { - text = '' - pcm_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; - ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} - } - ctl_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; - ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} - } - ''; - }; - environment.etc."alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable { - source = "${cfg.package}/share/alsa/alsa.conf.d/50-pipewire.conf"; - }; - environment.etc."alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable { - source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf"; - }; - environment.sessionVariables.LD_LIBRARY_PATH = - lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; - - environment.etc."pipewire/pipewire.conf" = { - # Adapted from src/daemon/pipewire.conf.in - text = '' - set-prop link.max-buffers 16 # version < 3 clients can't handle more - - add-spa-lib audio.convert* audioconvert/libspa-audioconvert - add-spa-lib api.alsa.* alsa/libspa-alsa - add-spa-lib api.v4l2.* v4l2/libspa-v4l2 - add-spa-lib api.libcamera.* libcamera/libspa-libcamera - add-spa-lib api.bluez5.* bluez5/libspa-bluez5 - add-spa-lib api.vulkan.* vulkan/libspa-vulkan - add-spa-lib api.jack.* jack/libspa-jack - add-spa-lib support.* support/libspa-support - - load-module libpipewire-module-rtkit # rt.prio=20 rt.time.soft=200000 rt.time.hard=200000 - load-module libpipewire-module-protocol-native - load-module libpipewire-module-profiler - load-module libpipewire-module-metadata - load-module libpipewire-module-spa-device-factory - load-module libpipewire-module-spa-node-factory - load-module libpipewire-module-client-node - load-module libpipewire-module-client-device - load-module libpipewire-module-portal - load-module libpipewire-module-access - load-module libpipewire-module-adapter - load-module libpipewire-module-link-factory - load-module libpipewire-module-session-manager - - create-object spa-node-factory factory.name=support.node.driver node.name=Dummy priority.driver=8000 - - exec ${cfg.sessionManager} ${lib.concatStringsSep " " cfg.sessionManagerArguments} - - ${cfg.extraConfig} - ''; - }; - - environment.etc."pipewire/media-session.d/with-alsa" = mkIf cfg.alsa.enable { text = ""; }; - environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf cfg.pulse.enable { text = ""; }; - environment.etc."pipewire/media-session.d/with-jack" = mkIf cfg.jack.enable { text = ""; }; - }; -} diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix new file mode 100644 index 00000000000..81f4762e1e6 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -0,0 +1,341 @@ +# pipewire example session manager. +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pipewire.media-session; + enable32BitAlsaPlugins = cfg.alsa.support32Bit + && pkgs.stdenv.isx86_64 + && pkgs.pkgsi686Linux.pipewire != null; + + # 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 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)}") + attrs + ) + ); + + toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs); +in { + + meta = { + maintainers = teams.freedesktop.members; + }; + + ###### interface + options = { + services.pipewire.media-session = { + enable = mkOption { + type = types.bool; + default = config.services.pipewire.enable; + defaultText = "config.services.pipewire.enable"; + description = "Example pipewire session manager"; + }; + + package = mkOption { + type = types.package; + default = pkgs.pipewire.mediaSession; + example = literalExample "pkgs.pipewire.mediaSession"; + description = '' + The pipewire-media-session derivation to use. + ''; + }; + + 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" + ]; + }; + }; + }; + + 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; + }; + }; + } + ]; + }; + }; + + 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; + }; + }; + } + ]; + }; + }; + + 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; + }; + }; + } + ]; + }; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.pipewire.sessionManagerExecutable = "${cfg.package}/bin/pipewire-media-session"; + + 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/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/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/with-jack" = mkIf config.services.pipewire.jack.enable { text = ""; }; + }; +} diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix new file mode 100644 index 00000000000..044120de7c7 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -0,0 +1,265 @@ +# pipewire service. +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pipewire; + enable32BitAlsaPlugins = cfg.alsa.support32Bit + && pkgs.stdenv.isx86_64 + && pkgs.pkgsi686Linux.pipewire != null; + + # The package doesn't output to $out/lib/pipewire directly so that the + # overlays can use the outputs to replace the originals in FHS environments. + # + # This doesn't work in general because of missing development information. + jack-libs = pkgs.runCommand "jack-libs" {} '' + mkdir -p "$out/lib" + ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire" + ''; + + # 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 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)}") + attrs + ) + ); + + toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs); +in { + + meta = { + maintainers = teams.freedesktop.members; + }; + + ###### interface + options = { + services.pipewire = { + enable = mkEnableOption "pipewire service"; + + package = mkOption { + type = types.package; + default = pkgs.pipewire; + defaultText = "pkgs.pipewire"; + example = literalExample "pkgs.pipewire"; + description = '' + The pipewire derivation to use. + ''; + }; + + socketActivation = mkOption { + default = true; + type = types.bool; + description = '' + Automatically run pipewire when connections are made to the pipewire socket. + ''; + }; + + 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}\""; }; + }; + }; + }; + + sessionManagerExecutable = mkOption { + type = types.str; + default = ""; + example = literalExample ''${pkgs.pipewire.mediaSession}/bin/pipewire-media-session''; + description = '' + Path to the session manager executable. + ''; + }; + + sessionManagerArguments = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''["-p" "bluez5.msbc-support=true"]''; + description = '' + Arguments passed to the pipewire session manager. + ''; + }; + + alsa = { + enable = mkEnableOption "ALSA support"; + support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; + }; + + jack = { + enable = mkEnableOption "JACK audio emulation"; + }; + + pulse = { + enable = mkEnableOption "PulseAudio server emulation"; + }; + }; + }; + + + ###### implementation + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; + message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; + } + { + assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; + message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; + } + ]; + + environment.systemPackages = [ cfg.package ] + ++ lib.optional cfg.jack.enable jack-libs; + + systemd.packages = [ cfg.package ] + ++ lib.optional cfg.pulse.enable cfg.package.pulse; + + # PipeWire depends on DBUS but doesn't list it. Without this booting + # into a terminal results in the service crashing with an error. + systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; + systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; + systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; + services.udev.packages = [ cfg.package ]; + + # If any paths are updated here they must also be updated in the package test. + environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable { + text = '' + pcm_type.pipewire { + libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; + ${optionalString enable32BitAlsaPlugins + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} + } + ctl_type.pipewire { + libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; + ${optionalString enable32BitAlsaPlugins + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} + } + ''; + }; + environment.etc."alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable { + source = "${cfg.package}/share/alsa/alsa.conf.d/50-pipewire.conf"; + }; + environment.etc."alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable { + source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf"; + }; + + 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); + }; + }; +} diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/acpid.nix b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/acpid.nix index 4c97485d972..3e619fe32ef 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/acpid.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/hardware/bluetooth.nix b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/bluetooth.nix index 6f5a6d3bf28..08ad90126b1 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/bluetooth.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/bluetooth.nix @@ -1,12 +1,39 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.hardware.bluetooth; - bluez-bluetooth = cfg.package; + package = cfg.package; + + inherit (lib) + mkDefault mkEnableOption mkIf mkOption + mkRenamedOptionModule mkRemovedOptionModule + concatStringsSep escapeShellArgs + optional optionals optionalAttrs recursiveUpdate types; + + cfgFmt = pkgs.formats.ini { }; + + # bluez will complain if some of the sections are not found, so just make them + # empty (but present in the file) for now + defaults = { + General.ControllerMode = "dual"; + Controller = { }; + GATT = { }; + Policy.AutoEnable = cfg.powerOnBoot; + }; + + hasDisabledPlugins = builtins.length cfg.disabledPlugins > 0; -in { +in +{ + imports = [ + (mkRenamedOptionModule [ "hardware" "bluetooth" "config" ] [ "hardware" "bluetooth" "settings" ]) + (mkRemovedOptionModule [ "hardware" "bluetooth" "extraConfig" ] '' + Use hardware.bluetooth.settings instead. + + This is part of the general move to use structured settings instead of raw + text for config as introduced by RFC0042: + https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md + '') + ]; ###### interface @@ -18,7 +45,7 @@ in { hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation"; powerOnBoot = mkOption { - type = types.bool; + type = types.bool; default = true; description = "Whether to power up the default Bluetooth controller on boot."; }; @@ -38,8 +65,15 @@ in { ''; }; - config = mkOption { - type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); + disabledPlugins = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Built-in plugins to disable"; + }; + + settings = mkOption { + type = cfgFmt.type; + default = { }; example = { General = { ControllerMode = "bredr"; @@ -47,79 +81,65 @@ in { }; description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; - - extraConfig = mkOption { - type = with types; nullOr lines; - default = null; - example = '' - [General] - ControllerMode = bredr - ''; - description = '' - Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). - ''; - }; }; - }; ###### implementation config = mkIf cfg.enable { - warnings = optional (cfg.extraConfig != null) "hardware.bluetooth.`extraConfig` is deprecated, please use hardware.bluetooth.`config`."; + environment.systemPackages = [ package ] + ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; - hardware.bluetooth.config = { - Policy = { - AutoEnable = mkDefault cfg.powerOnBoot; - }; - }; - - environment.systemPackages = [ bluez-bluetooth ] - ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ]; - - environment.etc."bluetooth/main.conf"= { - source = pkgs.writeText "main.conf" - (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig); - }; - - services.udev.packages = [ bluez-bluetooth ]; - services.dbus.packages = [ bluez-bluetooth ] - ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ]; - systemd.packages = [ bluez-bluetooth ]; + environment.etc."bluetooth/main.conf".source = + cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); + services.udev.packages = [ package ]; + services.dbus.packages = [ package ] + ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; + systemd.packages = [ package ]; systemd.services = { - bluetooth = { + bluetooth = + let + # `man bluetoothd` will refer to main.conf in the nix store but bluez + # will in fact load the configuration file at /etc/bluetooth/main.conf + # so force it here to avoid any ambiguity and things suddenly breaking + # if/when the bluez derivation is changed. + args = [ "-f" "/etc/bluetooth/main.conf" ] + ++ optional hasDisabledPlugins + "--noplugin=${concatStringsSep "," cfg.disabledPlugins}"; + in + { + wantedBy = [ "bluetooth.target" ]; + aliases = [ "dbus-org.bluez.service" ]; + serviceConfig.ExecStart = [ + "" + "${package}/libexec/bluetooth/bluetoothd ${escapeShellArgs args}" + ]; + # restarting can leave people without a mouse/keyboard + unitConfig.X-RestartIfChanged = false; + }; + } + // (optionalAttrs cfg.hsphfpd.enable { + hsphfpd = { + after = [ "bluetooth.service" ]; + requires = [ "bluetooth.service" ]; wantedBy = [ "bluetooth.target" ]; - aliases = [ "dbus-org.bluez.service" ]; - # restarting can leave people without a mouse/keyboard - unitConfig.X-RestartIfChanged = false; + + description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices"; + serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl"; }; - } - // (optionalAttrs cfg.hsphfpd.enable { - hsphfpd = { - after = [ "bluetooth.service" ]; - requires = [ "bluetooth.service" ]; - wantedBy = [ "multi-user.target" ]; - - description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices"; - serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl"; - }; - }) - ; + }); systemd.user.services = { obex.aliases = [ "dbus-org.bluez.obex.service" ]; } - // (optionalAttrs cfg.hsphfpd.enable { - telephony_client = { - wantedBy = [ "default.target"]; - - description = "telephony_client for hsphfpd"; - serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl"; - }; - }) - ; + // optionalAttrs cfg.hsphfpd.enable { + telephony_client = { + wantedBy = [ "default.target" ]; + description = "telephony_client for hsphfpd"; + serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl"; + }; + }; }; - } diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/spacenavd.nix b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/spacenavd.nix new file mode 100644 index 00000000000..7afae76cc4f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/hardware/trezord.nix b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/trezord.nix index 8c609bbf825..a65d4250c2e 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/trezord.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/hardware/udev.nix b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/udev.nix index 63027f7744d..d48b5444677 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/udev.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/udev.nix @@ -202,12 +202,26 @@ in ''; }; - extraRules = mkOption { + initrdRules = mkOption { default = ""; example = '' SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card" ''; type = types.lines; + description = '' + udev rules to include in the initrd + only. They'll be written into file + 99-local.rules. Thus they are read and applied + after the essential initrd rules. + ''; + }; + + extraRules = mkOption { + default = ""; + example = '' + ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="0825", ENV{PULSE_IGNORE}="1" + ''; + type = types.lines; description = '' Additional udev rules. They'll be written into file 99-local.rules. Thus they are @@ -284,6 +298,13 @@ in boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ]; + boot.initrd.extraUdevRulesCommands = optionalString (cfg.initrdRules != "") + '' + cat <<'EOF' > $out/99-local.rules + ${cfg.initrdRules} + EOF + ''; + environment.etc = { "udev/rules.d".source = udevRules; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/xow.nix b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/xow.nix index a18d60ad83b..311181176bd 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/hardware/xow.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/hardware/xow.nix @@ -10,7 +10,10 @@ in { config = lib.mkIf cfg.enable { hardware.uinput.enable = true; + boot.extraModprobeConfig = lib.readFile "${pkgs.xow}/lib/modprobe.d/xow-blacklist.conf"; + systemd.packages = [ pkgs.xow ]; + systemd.services.xow.wantedBy = [ "multi-user.target" ]; services.udev.packages = [ pkgs.xow ]; }; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/mail/mlmmj.nix b/infra/libkookie/nixpkgs/nixos/modules/services/mail/mlmmj.nix index d58d93c4214..fd74f2dc5f0 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/mail/mlmmj.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/mail/mlmmj.nix @@ -16,7 +16,14 @@ let alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\""; subjectPrefix = list: "[${list}]"; listAddress = domain: list: "${list}@${domain}"; - customHeaders = domain: list: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ]; + customHeaders = domain: list: [ + "List-Id: ${list}" + "Reply-To: ${list}@${domain}" + "List-Post: " + "List-Help: " + "List-Subscribe: " + "List-Unsubscribe: " + ]; footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}"; createList = d: l: let ctlDir = listCtl d l; in @@ -110,17 +117,29 @@ in services.postfix = { enable = true; recipientDelimiter= "+"; - extraMasterConf = '' - mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop - ''; + masterConfig.mlmmj = { + type = "unix"; + private = true; + privileged = true; + chroot = false; + wakeup = 0; + command = "pipe"; + args = [ + "flags=ORhu" + "user=mlmmj" + "argv=${pkgs.mlmmj}/bin/mlmmj-receive" + "-F" + "-L" + "${spoolDir}/$nexthop" + ]; + }; extraAliases = concatMapLines (alias cfg.listDomain) cfg.mailLists; - extraConfig = '' - transport_maps = hash:${stateDir}/transports - virtual_alias_maps = hash:${stateDir}/virtuals - propagate_unmatched_extensions = virtual - ''; + extraConfig = "propagate_unmatched_extensions = virtual"; + + virtual = concatMapLines (virtual cfg.listDomain) cfg.mailLists; + transport = concatMapLines (transport cfg.listDomain) cfg.mailLists; }; environment.systemPackages = [ pkgs.mlmmj ]; @@ -129,10 +148,8 @@ in ${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain} ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir} ${concatMapLines (createList cfg.listDomain) cfg.mailLists} - echo "${concatMapLines (virtual cfg.listDomain) cfg.mailLists}" > ${stateDir}/virtuals - echo "${concatMapLines (transport cfg.listDomain) cfg.mailLists}" > ${stateDir}/transports - ${pkgs.postfix}/bin/postmap ${stateDir}/virtuals - ${pkgs.postfix}/bin/postmap ${stateDir}/transports + ${pkgs.postfix}/bin/postmap /etc/postfix/virtual + ${pkgs.postfix}/bin/postmap /etc/postfix/transport ''; systemd.services.mlmmj-maintd = { diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb b/infra/libkookie/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb deleted file mode 100644 index 0b58c59c7a5..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/misc/etesync-dav.nix b/infra/libkookie/nixpkgs/nixos/modules/services/misc/etesync-dav.nix new file mode 100644 index 00000000000..9d7cfda371b --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/modules/services/misc/etesync-dav.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.etesync-dav; +in + { + options.services.etesync-dav = { + enable = mkEnableOption "etesync-dav"; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "The server host address."; + }; + + port = mkOption { + type = types.port; + default = 37358; + description = "The server host port."; + }; + + apiUrl = mkOption { + type = types.str; + default = "https://api.etesync.com/"; + description = "The url to the etesync API."; + }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; + + sslCertificate = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/etesync.crt"; + description = '' + Path to server SSL certificate. It will be copied into + etesync-dav's data directory. + ''; + }; + + sslCertificateKey = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/etesync.key"; + description = '' + Path to server SSL certificate key. It will be copied into + etesync-dav's data directory. + ''; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.etesync-dav = { + description = "etesync-dav - A CalDAV and CardDAV adapter for EteSync"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.etesync-dav ]; + environment = { + ETESYNC_LISTEN_ADDRESS = cfg.host; + ETESYNC_LISTEN_PORT = toString cfg.port; + ETESYNC_URL = cfg.apiUrl; + ETESYNC_DATA_DIR = "/var/lib/etesync-dav"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = "etesync-dav"; + ExecStart = "${pkgs.etesync-dav}/bin/etesync-dav"; + ExecStartPre = mkIf (cfg.sslCertificate != null || cfg.sslCertificateKey != null) ( + pkgs.writers.writeBash "etesync-dav-copy-keys" '' + ${optionalString (cfg.sslCertificate != null) '' + cp ${toString cfg.sslCertificate} $STATE_DIRECTORY/etesync.crt + ''} + ${optionalString (cfg.sslCertificateKey != null) '' + cp ${toString cfg.sslCertificateKey} $STATE_DIRECTORY/etesync.key + ''} + '' + ); + Restart = "on-failure"; + RestartSec = "30min 1s"; + }; + }; + }; + } diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/misc/gitlab.nix b/infra/libkookie/nixpkgs/nixos/modules/services/misc/gitlab.nix index de4d1bf1987..1d45af36349 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/infra/libkookie/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."; }; @@ -454,7 +454,7 @@ in { authentication = mkOption { type = with types; nullOr str; default = null; - description = "Authentitcation type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + description = "Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; }; enableStartTLSAuto = mkOption { @@ -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/infra/libkookie/nixpkgs/nixos/modules/services/misc/gollum.nix b/infra/libkookie/nixpkgs/nixos/modules/services/misc/gollum.nix index 0c9c7548305..4053afa69be 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/misc/gollum.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/misc/gollum.nix @@ -115,4 +115,6 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; } diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/misc/lifecycled.nix b/infra/libkookie/nixpkgs/nixos/modules/services/misc/lifecycled.nix new file mode 100644 index 00000000000..1c8942998d6 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/misc/nix-gc.nix b/infra/libkookie/nixpkgs/nixos/modules/services/misc/nix-gc.nix index 12bed05757a..a7a6a3b5964 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/misc/nix-gc.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/misc/nix-gc.nix @@ -21,13 +21,45 @@ in }; dates = mkOption { + type = types.str; default = "03:15"; + example = "weekly"; + description = '' + 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. + ''; + }; + + randomizedDelaySec = mkOption { + default = "0"; type = types.str; + example = "45min"; description = '' - Specification (in the format described by + 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) of the time at - which the garbage collector will run. + 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/infra/libkookie/nixpkgs/nixos/modules/services/misc/plikd.nix b/infra/libkookie/nixpkgs/nixos/modules/services/misc/plikd.nix new file mode 100644 index 00000000000..a62dbef1d2a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/infra/libkookie/nixpkgs/nixos/modules/services/monitoring/grafana.nix index c8515c4b898..88727e70ee3 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/infra/libkookie/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 9103a6f932d..bd74e1a9cdb 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix b/infra/libkookie/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix index 632c3fb1059..d833062c473 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/infra/libkookie/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index d10bffd9147..31e4b6ad298 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -191,9 +191,8 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - wants = [ "network.target" "systemd-udev-settle.service" ]; + wants = [ "network.target" ]; before = [ "network-online.target" ]; - after = [ "systemd-udev-settle.service" ]; restartTriggers = [ exitHook ]; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/infra/libkookie/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index afc2a6d1c75..72965c267a8 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -113,7 +113,6 @@ in "~@memlock" "~@resources" "~@setuid" - "~@sync" "~@timer" ]; }; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/networking/kresd.nix b/infra/libkookie/nixpkgs/nixos/modules/services/networking/kresd.nix index 4131ff8be5d..d7208354d4a 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/printing/cupsd.nix b/infra/libkookie/nixpkgs/nixos/modules/services/printing/cupsd.nix index e67badfcd29..b19cd073252 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -270,7 +270,7 @@ in drivers = mkOption { type = types.listOf types.path; default = []; - example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]"; + example = literalExample "with pkgs; [ gutenprint hplip splix ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. If this list contains diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/security/clamav.nix b/infra/libkookie/nixpkgs/nixos/modules/services/security/clamav.nix index aaf6fb0479b..340cbbf02fb 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/security/clamav.nix +++ b/infra/libkookie/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 - - ${cfg.daemon.extraConfig} - ''; - - freshclamConfigFile = pkgs.writeText "freshclam.conf" '' - DatabaseDirectory ${stateDir} - Foreground yes - Checks ${toString cfg.updater.frequency} - - ${cfg.updater.extraConfig} - - DatabaseMirror database.clamav.net - ''; + toKeyValue = generators.toKeyValue { + mkKeyValue = generators.mkKeyValueDefault {} " "; + listsAsDuplicateKeys = true; + }; + + 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/infra/libkookie/nixpkgs/nixos/modules/services/ttys/kmscon.nix b/infra/libkookie/nixpkgs/nixos/modules/services/ttys/kmscon.nix index dc37f9bee4b..4fe720bf044 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/ttys/kmscon.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/ttys/kmscon.nix @@ -82,11 +82,8 @@ in { X-RestartIfChanged=false ''; - systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { preferLocalBuild = true; } - '' - mkdir -p $out - ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service - ''; + systemd.suppressedSystemUnits = [ "autovt@.service" ]; + systemd.units."kmsconvt@.service".aliases = [ "autovt@.service" ]; systemd.services.systemd-vconsole-setup.enable = false; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index 9567223ebc7..1ce584c6a46 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index 92b1be963bf..ea7aebc3b12 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -25,10 +25,28 @@ let ES_ENABLED = if (cfg.elasticsearch.host != null) then "true" else "false"; ES_HOST = cfg.elasticsearch.host; ES_PORT = toString(cfg.elasticsearch.port); + + TRUSTED_PROXY_IP = cfg.trustedProxy; } // (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {}) // cfg.extraConfig; + cfgService = { + # User and group + User = cfg.user; + Group = cfg.group; + # State directory and mode + StateDirectory = "mastodon"; + StateDirectoryMode = "0750"; + # Logs directory and mode + LogsDirectory = "mastodon"; + LogsDirectoryMode = "0750"; + # Access write directories + UMask = "0027"; + # Sandboxing + PrivateTmp = true; + }; + envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") ( (lib.concatLists (lib.mapAttrsToList (name: value: if value != null then [ @@ -93,7 +111,6 @@ in { group = lib.mkOption { description = '' Group under which mastodon runs. - If it is set to "mastodon", a group will be created. ''; type = lib.types.str; default = "mastodon"; @@ -179,6 +196,26 @@ in { type = lib.types.str; }; + trustedProxy = lib.mkOption { + description = '' + You need to set it to the IP from which your reverse proxy sends requests to Mastodon's web process, + otherwise Mastodon will record the reverse proxy's own IP as the IP of all requests, which would be + bad because IP addresses are used for important rate limits and security functions. + ''; + type = lib.types.str; + default = "127.0.0.1"; + }; + + enableUnixSocket = lib.mkOption { + description = '' + Instead of binding to an IP address like 127.0.0.1, you may bind to a Unix socket. This variable + is process-specific, e.g. you need different values for every process, and it works for both web (Puma) + processes and streaming API (Node.js) processes. + ''; + type = lib.types.bool; + default = true; + }; + redis = { createLocally = lib.mkOption { description = "Configure local Redis server for Mastodon."; @@ -370,19 +407,16 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - User = cfg.user; - Group = cfg.group; WorkingDirectory = cfg.package; - LogsDirectory = "mastodon"; - StateDirectory = "mastodon"; - }; + } // cfgService; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; }; systemd.services.mastodon-init-db = lib.mkIf cfg.automaticMigrations { script = '' - if [ `psql mastodon -c \ + if [ `psql ${cfg.database.name} -c \ "select count(*) from pg_class c \ join pg_namespace s on s.oid = c.relnamespace \ where s.nspname not in ('pg_catalog', 'pg_toast', 'information_schema') \ @@ -397,14 +431,9 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - User = cfg.user; - Group = cfg.group; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; - PrivateTmp = true; - LogsDirectory = "mastodon"; - StateDirectory = "mastodon"; WorkingDirectory = cfg.package; - }; + } // cfgService; after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []); wantedBy = [ "multi-user.target" ]; }; @@ -415,21 +444,20 @@ in { ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); description = "Mastodon streaming"; wantedBy = [ "multi-user.target" ]; - environment = env // { - PORT = toString(cfg.streamingPort); - }; + environment = env // (if cfg.enableUnixSocket + then { SOCKET = "/run/mastodon-streaming/streaming.socket"; } + else { PORT = toString(cfg.streamingPort); } + ); serviceConfig = { - ExecStart = "${pkgs.nodejs-slim}/bin/node streaming"; + ExecStart = "${cfg.package}/run-streaming.sh"; Restart = "always"; RestartSec = 20; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = cfg.package; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; - PrivateTmp = true; - LogsDirectory = "mastodon"; - StateDirectory = "mastodon"; - }; + WorkingDirectory = cfg.package; + # Runtime directory and mode + RuntimeDirectory = "mastodon-streaming"; + RuntimeDirectoryMode = "0750"; + } // cfgService; }; systemd.services.mastodon-web = { @@ -438,21 +466,20 @@ in { ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); description = "Mastodon web"; wantedBy = [ "multi-user.target" ]; - environment = env // { - PORT = toString(cfg.webPort); - }; + environment = env // (if cfg.enableUnixSocket + then { SOCKET = "/run/mastodon-web/web.socket"; } + else { PORT = toString(cfg.webPort); } + ); serviceConfig = { ExecStart = "${cfg.package}/bin/puma -C config/puma.rb"; Restart = "always"; RestartSec = 20; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = cfg.package; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; - PrivateTmp = true; - LogsDirectory = "mastodon"; - StateDirectory = "mastodon"; - }; + WorkingDirectory = cfg.package; + # Runtime directory and mode + RuntimeDirectory = "mastodon-web"; + RuntimeDirectoryMode = "0750"; + } // cfgService; path = with pkgs; [ file imagemagick ffmpeg ]; }; @@ -469,14 +496,9 @@ in { ExecStart = "${cfg.package}/bin/sidekiq -c 25 -r ${cfg.package}"; Restart = "always"; RestartSec = 20; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = cfg.package; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; - PrivateTmp = true; - LogsDirectory = "mastodon"; - StateDirectory = "mastodon"; - }; + WorkingDirectory = cfg.package; + } // cfgService; path = with pkgs; [ file imagemagick ffmpeg ]; }; @@ -495,12 +517,12 @@ in { }; locations."@proxy" = { - proxyPass = "http://127.0.0.1:${toString(cfg.webPort)}"; + proxyPass = (if cfg.enableUnixSocket then "http://unix:/run/mastodon-web/web.socket" else "http://127.0.0.1:${toString(cfg.webPort)}"); proxyWebsockets = true; }; locations."/api/v1/streaming/" = { - proxyPass = "http://127.0.0.1:${toString(cfg.streamingPort)}/"; + proxyPass = (if cfg.enableUnixSocket then "http://unix:/run/mastodon-streaming/streaming.socket" else "http://127.0.0.1:${toString(cfg.streamingPort)}/"); proxyWebsockets = true; }; }; @@ -534,7 +556,7 @@ in { (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv ]) ]; - users.groups.mastodon = lib.mkIf (cfg.group == "mastodon") { }; + users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user; }; meta.maintainers = with lib.maintainers; [ happy-river erictapen ]; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 304712d0efc..62906d5e6a0 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -44,7 +44,7 @@ in ''; description = '' Configuration for Miniflux, refer to - + for documentation on the supported values. ''; }; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix index 3a876f75f4a..7a54255a46e 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix @@ -211,7 +211,7 @@ in environment = let penv = python.buildEnv.override { # setuptools: https://github.com/benoitc/gunicorn/issues/1716 - extraLibs = [ python.pkgs.gevent python.pkgs.setuptools pkg ]; + extraLibs = [ python.pkgs.eventlet python.pkgs.setuptools pkg ]; }; in { PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}"; @@ -233,7 +233,7 @@ in ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \ --name gunicorn-${wikiIdent} \ --workers ${toString cfg.gunicorn.workers} \ - --worker-class gevent \ + --worker-class eventlet \ --bind unix:/run/moin/${wikiIdent}/gunicorn.sock ''; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 18cd7b3f5ba..de202e964c8 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/infra/libkookie/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} @@ -91,7 +94,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 { @@ -285,6 +288,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 = { @@ -350,10 +371,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. @@ -371,9 +395,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 ( @@ -383,14 +407,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 ); } @@ -448,6 +471,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 @@ -596,6 +620,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;"; @@ -607,11 +639,15 @@ in { "^~ /.well-known" = { priority = 210; extraConfig = '' + absolute_redirect off; location = /.well-known/carddav { - return 301 $scheme://$host/remote.php/dav; + return 301 /remote.php/dav; } location = /.well-known/caldav { - return 301 $scheme://$host/remote.php/dav; + return 301 /remote.php/dav; + } + location ~ ^/\.well-known/(?!acme-challenge|pki-validation) { + return 301 /index.php$request_uri; } try_files $uri $uri/ =404; ''; @@ -619,7 +655,7 @@ in { "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = '' return 404; ''; - "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' + "~ ^/(?:\\.(?!well-known)|autotest|occ|issue|indie|db_|console)".extraConfig = '' return 404; ''; "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = { diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml b/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml index 6cbfda118c4..83a6f68edcb 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index 7f50b8fd8d4..b2bb5055cd4 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/infra/libkookie/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index fa8614e8ec1..f3175793ebe 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index 671301246a8..99e6edfba26 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -197,12 +197,11 @@ in config = mkMerge [ (mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # Enable the GNOME 3 Desktop Environment. - services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome3.enable = true; - ''; + '']; services.gnome3.core-os-services.enable = true; services.gnome3.core-shell.enable = true; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index d6cf86d3a2e..44ee079b817 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -184,12 +184,11 @@ in config = mkMerge [ (mkIf cfg.enable { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # Enable the Plasma 5 Desktop Environment. - services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - ''; + '']; services.xserver.desktopManager.session = singleton { name = "plasma5"; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 9fdbe753dad..e04fcdaf414 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index e3c5adb9737..f79eb64b5a6 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -183,14 +183,20 @@ in "systemd-udev-settle.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty${gdm.initialVT}.service" - # TODO: Add "plymouth-quit.service" so GDM can control when plymouth quits. - # Currently this breaks switching configurations while using plymouth. + "getty@tty${gdm.initialVT}.service" + "plymouth-quit.service" ]; systemd.services.display-manager.onFailure = [ "plymouth-quit.service" ]; + # Prevent nixos-rebuild switch from bringing down the graphical + # session. (If multi-user.target wants plymouth-quit.service which + # conflicts display-manager.service, then when nixos-rebuild + # switch starts multi-user.target, display-manager.service is + # stopped so plymouth-quit.service can be started.) + systemd.services.plymouth-quit.wantedBy = lib.mkForce []; + systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 854684b87fa..5ffffb95edb 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -109,7 +109,7 @@ addEntry() { exit 1 fi fi - echo " APPEND systemConfig=$path init=$path/init $extraParams" + echo " APPEND init=$path/init $extraParams" } tmpFile="$target/extlinux/extlinux.conf.tmp.$$" diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl index 59f5638044f..e0167654748 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -102,10 +102,10 @@ if (stat($bootPath)->dev != stat("/nix/store")->dev) { # Discover information about the location of the bootPath struct(Fs => { - device => '$', - type => '$', - mount => '$', -}); + device => '$', + type => '$', + mount => '$', + }); sub PathInMount { my ($path, $mount) = @_; my @splitMount = split /\//, $mount; @@ -154,16 +154,16 @@ sub GetFs { return $bestFs; } struct (Grub => { - path => '$', - search => '$', -}); + path => '$', + search => '$', + }); my $driveid = 1; sub GrubFs { my ($dir) = @_; my $fs = GetFs($dir); my $path = substr($dir, length($fs->mount)); if (substr($path, 0, 1) ne "/") { - $path = "/$path"; + $path = "/$path"; } my $search = ""; @@ -251,8 +251,8 @@ my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; if ($grubVersion == 1) { $conf .= " - default $defaultEntry - timeout $timeout + default $defaultEntry + timeout $timeout "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n"; @@ -302,51 +302,51 @@ else { if ($copyKernels == 0) { $conf .= " - " . $grubStore->search; + " . $grubStore->search; } # FIXME: should use grub-mkconfig. $conf .= " - " . $grubBoot->search . " - if [ -s \$prefix/grubenv ]; then - load_env - fi - - # ‘grub-reboot’ sets a one-time saved entry, which we process here and - # then delete. - if [ \"\${next_entry}\" ]; then - set default=\"\${next_entry}\" - set next_entry= - save_env next_entry - set timeout=1 - else - set default=$defaultEntry - set timeout=$timeout - fi - - # Setup the graphics stack for bios and efi systems - if [ \"\${grub_platform}\" = \"efi\" ]; then - insmod efi_gop - insmod efi_uga - else - insmod vbe - fi + " . $grubBoot->search . " + if [ -s \$prefix/grubenv ]; then + load_env + fi + + # ‘grub-reboot’ sets a one-time saved entry, which we process here and + # then delete. + if [ \"\${next_entry}\" ]; then + set default=\"\${next_entry}\" + set next_entry= + save_env next_entry + set timeout=1 + else + set default=$defaultEntry + set timeout=$timeout + fi + + # Setup the graphics stack for bios and efi systems + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi "; if ($font) { copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; $conf .= " - insmod font - if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=$gfxpayloadEfi - else - set gfxmode=$gfxmodeBios - set gfxpayload=$gfxpayloadBios - fi - terminal_output gfxterm - fi + insmod font + if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=$gfxpayloadEfi + else + set gfxmode=$gfxmodeBios + set gfxpayload=$gfxpayloadBios + fi + terminal_output gfxterm + fi "; } if ($splashImage) { @@ -356,21 +356,21 @@ else { if ($suffix eq ".jpg") { $suffix = ".jpeg"; } - if ($backgroundColor) { - $conf .= " - background_color '$backgroundColor' - "; - } + if ($backgroundColor) { + $conf .= " + background_color '$backgroundColor' + "; + } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " - insmod " . substr($suffix, 1) . " - if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi + insmod " . substr($suffix, 1) . " + if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then + set color_normal=white/black + set color_highlight=black/white + else + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi "; } @@ -380,21 +380,21 @@ else { # Copy theme rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; $conf .= " - # Sets theme. - set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt - export theme - # Load theme fonts, if any - "; - - find( { wanted => sub { - if ($_ =~ /\.pf2$/i) { - $font = File::Spec->abs2rel($File::Find::name, $theme); - $conf .= " - loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font - "; - } - }, no_chdir => 1 }, $theme ); - } + # Sets theme. + set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt + export theme + # Load theme fonts, if any + "; + + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); + $conf .= " + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font + "; + } + }, no_chdir => 1 }, $theme ); + } } $conf .= "$extraConfig\n"; @@ -433,25 +433,25 @@ sub addEntry { # Include second initrd with secrets if (-e -x "$path/append-initrd-secrets") { - my $initrdName = basename($initrd); - my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; - - mkpath(dirname($initrdSecretsPath), 0, 0755); - my $oldUmask = umask; - # Make sure initrd is not world readable (won't work if /boot is FAT) - umask 0137; - my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; - # Check whether any secrets were actually added - if (-e $initrdSecretsPathTemp && ! -z _) { - rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; - $copied{$initrdSecretsPath} = 1; - $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; - } else { - unlink $initrdSecretsPathTemp; - rmdir dirname($initrdSecretsPathTemp); - } - umask $oldUmask; + my $initrdName = basename($initrd); + my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + + mkpath(dirname($initrdSecretsPath), 0, 0755); + my $oldUmask = umask; + # Make sure initrd is not world readable (won't work if /boot is FAT) + umask 0137; + my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; + # Check whether any secrets were actually added + if (-e $initrdSecretsPathTemp && ! -z _) { + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; + $copied{$initrdSecretsPath} = 1; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + } else { + unlink $initrdSecretsPathTemp; + rmdir dirname($initrdSecretsPathTemp); + } + umask $oldUmask; } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; @@ -459,9 +459,8 @@ sub addEntry { # FIXME: $confName my $kernelParams = - "systemConfig=" . Cwd::abs_path($path) . " " . - "init=" . Cwd::abs_path("$path/init") . " " . - readFile("$path/kernel-params"); + "init=" . Cwd::abs_path("$path/init") . " " . + readFile("$path/kernel-params"); my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : ""; if ($grubVersion == 1) { @@ -503,9 +502,9 @@ foreach my $link (@links) { my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); if ($cfgName) { $entryName = $cfgName; @@ -530,8 +529,8 @@ sub addProfile { sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; } my @links = sort - { nrFromGen($b) <=> nrFromGen($a) } - (glob "$profile-*-link"); + { nrFromGen($b) <=> nrFromGen($a) } + (glob "$profile-*-link"); my $curEntry = 0; foreach my $link (@links) { @@ -542,9 +541,9 @@ sub addProfile { } my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link); } @@ -566,7 +565,7 @@ $extraPrepareConfig =~ s/\@bootPath\@/$bootPath/g; # Run extraPrepareConfig in sh if ($extraPrepareConfig ne "") { - system((get("shell"), "-c", $extraPrepareConfig)); + system((get("shell"), "-c", $extraPrepareConfig)); } # write the GRUB config. @@ -627,13 +626,13 @@ foreach my $fn (glob "$bootPath/kernels/*") { # struct(GrubState => { - name => '$', - version => '$', - efi => '$', - devices => '$', - efiMountPoint => '$', - extraGrubInstallArgs => '@', -}); + name => '$', + version => '$', + efi => '$', + devices => '$', + efiMountPoint => '$', + extraGrubInstallArgs => '@', + }); # If you add something to the state file, only add it to the end # because it is read line-by-line. sub readGrubState { diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index 2a1ec479fea..bd3fc64999d 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -49,7 +49,6 @@ addEntry() { echo "#!/bin/sh" echo "# $name" echo "# created by init-script-builder.sh" - echo "export systemConfig=$(readlink -f $path)" echo "exec $stage2" )" diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 97e824fe629..6bee900c683 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/infra/libkookie/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -101,7 +101,7 @@ def write_entry(profile, generation, machine_id): entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) generation_dir = os.readlink(system_dir(profile, generation)) tmp_path = "%s.tmp" % (entry_file) - kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) + kernel_params = "init=%s/init " % generation_dir with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/luksroot.nix b/infra/libkookie/nixpkgs/nixos/modules/system/boot/luksroot.nix index 8dd2ea20519..fa14d86e253 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -56,7 +56,7 @@ let ykinfo -v 1>/dev/null 2>&1 if [ $? != 0 ]; then - echo -n "Waiting $secs seconds for Yubikey to appear..." + echo -n "Waiting $secs seconds for YubiKey to appear..." local success=false for try in $(seq $secs); do echo -n . @@ -118,7 +118,7 @@ let # Cryptsetup locking directory mkdir -p /run/cryptsetup - # For Yubikey salt storage + # For YubiKey salt storage mkdir -p /crypt-storage ${optionalString luks.gpgSupport '' @@ -218,7 +218,7 @@ let } ${optionalString (luks.yubikeySupport && (yubikey != null)) '' - # Yubikey + # YubiKey rbtohex() { ( od -An -vtx1 | tr -d ' \n' ) } @@ -244,7 +244,7 @@ let local new_k_luks mount -t ${yubikey.storage.fsType} ${yubikey.storage.device} /crypt-storage || \ - die "Failed to mount Yubikey salt storage device" + die "Failed to mount YubiKey salt storage device" salt="$(cat /crypt-storage${yubikey.storage.path} | sed -n 1p | tr -d '\n')" iterations="$(cat /crypt-storage${yubikey.storage.path} | sed -n 2p | tr -d '\n')" @@ -254,8 +254,27 @@ let for try in $(seq 3); do ${optionalString yubikey.twoFactor '' echo -n "Enter two-factor passphrase: " - read -r k_user - echo + k_user= + while true; do + if [ -e /crypt-ramfs/passphrase ]; then + echo "reused" + k_user=$(cat /crypt-ramfs/passphrase) + break + else + # Try reading it from /dev/console with a timeout + IFS= read -t 1 -r k_user + if [ -n "$k_user" ]; then + ${if luks.reusePassphrases then '' + # Remember it for the next device + echo -n "$k_user" > /crypt-ramfs/passphrase + '' else '' + # Don't save it to ramfs. We are very paranoid + ''} + echo + break + fi + fi + done ''} if [ ! -z "$k_user" ]; then @@ -268,6 +287,11 @@ let if [ $? == 0 ]; then opened=true + ${if luks.reusePassphrases then '' + # We don't rm here because we might reuse it for the next device + '' else '' + rm -f /crypt-ramfs/passphrase + ''} break else opened=false @@ -317,7 +341,7 @@ let if wait_yubikey ${toString yubikey.gracePeriod}; then do_open_yubikey else - echo "No yubikey found, falling back to non-yubikey open procedure" + echo "No YubiKey found, falling back to non-YubiKey open procedure" open_normally fi } @@ -665,8 +689,8 @@ in yubikey = mkOption { default = null; description = '' - The options to use for this LUKS device in Yubikey-PBA. - If null (the default), Yubikey-PBA will be disabled for this device. + The options to use for this LUKS device in YubiKey-PBA. + If null (the default), YubiKey-PBA will be disabled for this device. ''; type = with types; nullOr (submodule { @@ -674,13 +698,13 @@ in twoFactor = mkOption { default = true; type = types.bool; - description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)."; + description = "Whether to use a passphrase and a YubiKey (true), or only a YubiKey (false)."; }; slot = mkOption { default = 2; type = types.int; - description = "Which slot on the Yubikey to challenge."; + description = "Which slot on the YubiKey to challenge."; }; saltLength = mkOption { @@ -704,7 +728,7 @@ in gracePeriod = mkOption { default = 10; type = types.int; - description = "Time in seconds to wait for the Yubikey."; + description = "Time in seconds to wait for the YubiKey."; }; /* TODO: Add to the documentation of the current module: @@ -779,9 +803,9 @@ in default = false; type = types.bool; description = '' - Enables support for authenticating with a Yubikey on LUKS devices. + Enables support for authenticating with a YubiKey on LUKS devices. See the NixOS wiki for information on how to properly setup a LUKS device - and a Yubikey to work with this feature. + and a YubiKey to work with this feature. ''; }; @@ -799,7 +823,7 @@ in assertions = [ { assertion = !(luks.gpgSupport && luks.yubikeySupport); - message = "Yubikey and GPG Card may not be used at the same time."; + message = "YubiKey and GPG Card may not be used at the same time."; } { assertion = !(luks.gpgSupport && luks.fido2Support); @@ -807,7 +831,7 @@ in } { assertion = !(luks.fido2Support && luks.yubikeySupport); - message = "FIDO2 and Yubikey may not be used at the same time."; + message = "FIDO2 and YubiKey may not be used at the same time."; } ]; diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/networkd.nix b/infra/libkookie/nixpkgs/nixos/modules/system/boot/networkd.nix index 3b01bc00baf..bbdd5a40706 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/infra/libkookie/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 { @@ -1553,9 +1638,6 @@ in wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.network1.service" ]; restartTriggers = map (x: x.source) (attrValues unitFiles); - # prevent race condition with interface renaming (#39069) - requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" ]; }; systemd.services.systemd-networkd-wait-online = { diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/plymouth.nix b/infra/libkookie/nixpkgs/nixos/modules/system/boot/plymouth.nix index 662576888fc..2a545e55251 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/plymouth.nix +++ b/infra/libkookie/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} ''; @@ -38,8 +60,16 @@ in enable = mkEnableOption "Plymouth boot splash screen"; + font = mkOption { + default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; + type = types.path; + description = '' + Font file made available for displaying text on the splash screen. + ''; + }; + themePackages = mkOption { - default = [ nixosBreezePlymouth ]; + default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth; type = types.listOf types.package; description = '' Extra theme packages for plymouth. @@ -47,7 +77,7 @@ in }; theme = mkOption { - default = "breeze"; + default = "bgrt"; type = types.str; description = '' Splash screen theme. @@ -56,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"; @@ -102,37 +133,62 @@ 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)" mkdir -p $out/lib/plymouth/renderers # module might come from a theme - cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth + cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers 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 + cat > $out/etc/fonts/fonts.conf < + + + $out/share/fonts + + EOF ''; boot.initrd.extraUtilsCommandsTest = '' @@ -154,6 +210,7 @@ in ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins + ln -s $extraUtils/etc/fonts /etc/fonts plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session plymouth show-splash diff --git a/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index 5b39f34200c..ddaf985878e 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1.nix b/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1.nix index 44287f3cf09..4074f2e0235 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -205,13 +205,22 @@ let ''; # */ + # Networkd link files are used early by udev to set up interfaces early. + # This must be done in stage 1 to avoid race conditions between udev and + # network daemons. linkUnits = pkgs.runCommand "link-units" { allowedReferences = [ extraUtils ]; preferLocalBuild = true; - } '' + } ('' mkdir -p $out cp -v ${udev}/lib/systemd/network/*.link $out/ - ''; + '' + ( + let + links = filterAttrs (n: v: hasSuffix ".link" n) config.systemd.network.units; + files = mapAttrsToList (n: v: "${v.unit}/${n}") links; + in + concatMapStringsSep "\n" (file: "cp -v ${file} $out/") files + )); udevRules = pkgs.runCommand "udev-rules" { allowedReferences = [ extraUtils ]; diff --git a/infra/libkookie/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/infra/libkookie/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index 088bffd7c50..23e1e611a71 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/virtualisation/anbox.nix b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/anbox.nix index da5df358073..7b096bd1a9f 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/virtualisation/anbox.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash new file mode 100644 index 00000000000..4a860196111 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -euo pipefail + +WGET() { + wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google' "$@" +} + +# When dealing with cryptographic keys, we want to keep things private. +umask 077 +mkdir -p /root/.ssh + +echo "Fetching authorized keys..." +WGET -O /tmp/auth_keys http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys + +# Read keys one by one, split in case Google decided +# to append metadata (it does sometimes) and add to +# authorized_keys if not already present. +touch /root/.ssh/authorized_keys +while IFS='' read -r line || [[ -n "$line" ]]; do + keyLine=$(echo -n "$line" | cut -d ':' -f2) + IFS=' ' read -r -a array <<<"$keyLine" + if [[ ${#array[@]} -ge 3 ]]; then + echo "${array[@]:0:3}" >>/tmp/new_keys + echo "Added ${array[*]:2} to authorized_keys" + fi +done 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/infra/libkookie/nixpkgs/nixos/modules/virtualisation/podman.nix b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/podman.nix index 98da5a096d9..0223c0df1f2 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/virtualisation/podman.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/podman.nix @@ -105,6 +105,16 @@ in })); }; + systemd.packages = [ cfg.package ]; + + systemd.services.podman.serviceConfig = { + ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; + }; + + systemd.sockets.podman.wantedBy = [ "sockets.target" ]; + + systemd.tmpfiles.packages = [ cfg.package ]; + assertions = [ { assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; diff --git a/infra/libkookie/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index bf3615f2fe7..d9935bcafb7 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -7,7 +7,7 @@ # the VM in the host. On the other hand, the root filesystem is a # read/writable disk image persistent across VM reboots. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, options, ... }: with lib; with import ../../lib/qemu-flags.nix { inherit pkgs; }; @@ -266,6 +266,8 @@ in options = { + virtualisation.fileSystems = options.fileSystems; + virtualisation.memorySize = mkOption { default = 384; @@ -275,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; @@ -659,11 +673,12 @@ in # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). fileSystems = mkVMOverride ( + cfg.fileSystems // { "/".device = cfg.bootDevice; ${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 @@ -676,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/infra/libkookie/nixpkgs/nixos/release.nix b/infra/libkookie/nixpkgs/nixos/release.nix index 109747945f7..327a259de7f 100644 --- a/infra/libkookie/nixpkgs/nixos/release.nix +++ b/infra/libkookie/nixpkgs/nixos/release.nix @@ -171,23 +171,23 @@ in rec { sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { module = { - armv6l-linux = ./modules/installer/cd-dvd/sd-image-raspberrypi.nix; - armv7l-linux = ./modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix; - aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix; + armv7l-linux = ./modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix; + aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-installer.nix; }.${system}; inherit system; }); sd_image_new_kernel = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { module = { - aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix; + aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix; }.${system}; type = "minimal-new-kernel"; inherit system; }); sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { - module = ./modules/installer/cd-dvd/sd-image-raspberrypi4.nix; + module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix; inherit system; }); diff --git a/infra/libkookie/nixpkgs/nixos/tests/all-tests.nix b/infra/libkookie/nixpkgs/nixos/tests/all-tests.nix index 444580bc0be..fe60b0b83f5 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/all-tests.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/all-tests.nix @@ -55,6 +55,7 @@ in cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; + ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; @@ -72,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 {}; @@ -81,6 +83,7 @@ in corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; + custom-ca = handleTest ./custom-ca.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; @@ -181,10 +184,10 @@ in jenkins = handleTest ./jenkins.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; - jq = handleTest ./jq.nix {}; k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; keepalived = handleTest ./keepalived.nix {}; + keepassxc = handleTest ./keepassxc.nix {}; kerberos = handleTest ./kerberos/default.nix {}; kernel-latest = handleTest ./kernel-latest.nix {}; kernel-lts = handleTest ./kernel-lts.nix {}; @@ -194,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 {}; @@ -236,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 {}; @@ -302,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 {}; @@ -332,7 +341,6 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; - ripgrep = handleTest ./ripgrep.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; @@ -343,8 +351,6 @@ in samba = handleTest ./samba.nix {}; samba-wsdd = handleTest ./samba-wsdd.nix {}; sanoid = handleTest ./sanoid.nix {}; - sbt = handleTest ./sbt.nix {}; - sbt-extras = handleTest ./sbt-extras.nix {}; sddm = handleTest ./sddm.nix {}; searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; diff --git a/infra/libkookie/nixpkgs/nixos/tests/bees.nix b/infra/libkookie/nixpkgs/nixos/tests/bees.nix index 6e6a9c3446b..58a9c295135 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/bees.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/bees.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc ''; virtualisation.emptyDiskImages = [ 4096 4096 ]; - fileSystems = lib.mkVMOverride { + virtualisation.fileSystems = { "/aux1" = { # filesystem configured to be deduplicated device = "/dev/disk/by-label/aux1"; fsType = "btrfs"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/bind.nix b/infra/libkookie/nixpkgs/nixos/tests/bind.nix index 09917b15a8e..7234f56a1c3 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/bind.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/bind.nix @@ -6,6 +6,7 @@ import ./make-test-python.nix { services.bind.extraOptions = "empty-zones-enable no;"; services.bind.zones = lib.singleton { name = "."; + master = true; file = pkgs.writeText "root.zone" '' $TTL 3600 . IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d ) diff --git a/infra/libkookie/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix b/infra/libkookie/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix new file mode 100644 index 00000000000..cc873e8aee5 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix @@ -0,0 +1,196 @@ +import ./make-test-python.nix ({pkgs, lib, ...}: + +let + cfg = { + clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monA = { + name = "a"; + ip = "192.168.1.1"; + }; + osd0 = { + name = "0"; + key = "AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg=="; + uuid = "55ba2294-3e24-478f-bee0-9dca4c231dd9"; + }; + osd1 = { + name = "1"; + key = "AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ=="; + uuid = "5e97a838-85b6-43b0-8950-cb56d554d1e5"; + }; + osd2 = { + name = "2"; + key = "AQAdyhZeIaUlARAAGRoidDAmS6Vkp546UFEf5w=="; + uuid = "ea999274-13d0-4dd5-9af9-ad25a324f72f"; + }; + }; + generateCephConfig = { daemonConfig }: { + enable = true; + global = { + fsid = cfg.clusterId; + monHost = cfg.monA.ip; + monInitialMembers = cfg.monA.name; + }; + } // daemonConfig; + + generateHost = { pkgs, cephConfig, networkConfig, ... }: { + virtualisation = { + memorySize = 512; + emptyDiskImages = [ 20480 20480 20480 ]; + vlans = [ 1 ]; + }; + + networking = networkConfig; + + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + xfsprogs + ]; + + boot.kernelModules = [ "xfs" ]; + + services.ceph = cephConfig; + }; + + networkMonA = { + dhcpcd.enable = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = cfg.monA.ip; prefixLength = 24; } + ]; + }; + cephConfigMonA = generateCephConfig { daemonConfig = { + mon = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + mgr = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + osd = { + enable = true; + daemons = [ cfg.osd0.name cfg.osd1.name cfg.osd2.name ]; + }; + }; }; + + # Following deployment is based on the manual deployment described here: + # https://docs.ceph.com/docs/master/install/manual-deployment/ + # For other ways to deploy a ceph cluster, look at the documentation at + # https://docs.ceph.com/docs/master/ + testscript = { ... }: '' + start_all() + + monA.wait_for_unit("network.target") + + # Bootstrap ceph-mon daemon + monA.succeed( + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done", + "systemctl start ceph-mon-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mon-${cfg.monA.name}") + monA.succeed("ceph mon enable-msgr2") + + # Can't check ceph status until a mon is up + monA.succeed("ceph -s | grep 'mon: 1 daemons'") + + # Start the ceph-mgr daemon, after copying in the keyring + monA.succeed( + "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/", + "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring", + "systemctl start ceph-mgr-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mgr-a") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + + # Bootstrap OSDs + monA.succeed( + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd0.name}/type", + "ln -sf /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}/block", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd1.name}/type", + "ln -sf /dev/vdc /var/lib/ceph/osd/ceph-${cfg.osd1.name}/block", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd2.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd2.name}/type", + "ln -sf /dev/vdd /var/lib/ceph/osd/ceph-${cfg.osd2.name}/block", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd2.name}/keyring --name osd.${cfg.osd2.name} --add-key ${cfg.osd2.key}", + 'echo \'{"cephx_secret": "${cfg.osd0.key}"}\' | ceph osd new ${cfg.osd0.uuid} -i -', + 'echo \'{"cephx_secret": "${cfg.osd1.key}"}\' | ceph osd new ${cfg.osd1.uuid} -i -', + 'echo \'{"cephx_secret": "${cfg.osd2.key}"}\' | ceph osd new ${cfg.osd2.uuid} -i -', + ) + + # Initialize the OSDs with regular filestore + monA.succeed( + "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}", + "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}", + "ceph-osd -i ${cfg.osd2.name} --mkfs --osd-uuid ${cfg.osd2.uuid}", + "chown -R ceph:ceph /var/lib/ceph/osd", + "systemctl start ceph-osd-${cfg.osd0.name}", + "systemctl start ceph-osd-${cfg.osd1.name}", + "systemctl start ceph-osd-${cfg.osd2.name}", + ) + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + monA.succeed( + "ceph osd pool create single-node-test 32 32", + "ceph osd pool ls | grep 'single-node-test'", + "ceph osd pool rename single-node-test single-node-other-test", + "ceph osd pool ls | grep 'single-node-other-test'", + ) + monA.wait_until_succeeds("ceph -s | grep '2 pools, 33 pgs'") + monA.succeed( + "ceph osd getcrushmap -o crush", + "crushtool -d crush -o decrushed", + "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush", + "crushtool -c modcrush -o recrushed", + "ceph osd setcrushmap -i recrushed", + "ceph osd pool set single-node-other-test size 2", + ) + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + monA.wait_until_succeeds("ceph -s | grep '33 active+clean'") + monA.fail( + "ceph osd pool ls | grep 'multi-node-test'", + "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it", + ) + + # Shut down ceph by stopping ceph.target. + monA.succeed("systemctl stop ceph.target") + + # Start it up + monA.succeed("systemctl start ceph.target") + monA.wait_for_unit("ceph-mon-${cfg.monA.name}") + monA.wait_for_unit("ceph-mgr-${cfg.monA.name}") + monA.wait_for_unit("ceph-osd-${cfg.osd0.name}") + monA.wait_for_unit("ceph-osd-${cfg.osd1.name}") + monA.wait_for_unit("ceph-osd-${cfg.osd2.name}") + + # Ensure the cluster comes back up again + monA.succeed("ceph -s | grep 'mon: 1 daemons'") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + ''; +in { + name = "basic-single-node-ceph-cluster-bluestore"; + meta = with pkgs.lib.maintainers; { + maintainers = [ lukegb ]; + }; + + nodes = { + monA = generateHost { pkgs = pkgs; cephConfig = cephConfigMonA; networkConfig = networkMonA; }; + }; + + testScript = testscript; +}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/containers-bridge.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-bridge.nix index 1208aa8fced..12fa67c8b01 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-bridge.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-custom-pkgs.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-custom-pkgs.nix index 1412c32bfb5..c050e49bc29 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-custom-pkgs.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-ephemeral.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-ephemeral.nix index 692554ac0ba..fabf0593f23 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-ephemeral.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-extra_veth.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-extra_veth.nix index 212f3d0f46c..cbbb2525832 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-extra_veth.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-hosts.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-hosts.nix index 65a983c42a7..1f24ed1f3c2 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-hosts.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-imperative.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-imperative.nix index 393b4a5135d..0ff0d3f9545 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-imperative.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-ip.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-ip.nix index 0265ed92d41..5abea2dbad9 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-ip.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-macvlans.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-macvlans.nix index 9425252cb88..d0f41be8c12 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-macvlans.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-names.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-names.nix new file mode 100644 index 00000000000..9ad2bfb748a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-physical_interfaces.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-physical_interfaces.nix index 0b55c3418ed..57bd0eedcc3 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-physical_interfaces.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-portforward.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-portforward.nix index d0be3c7d43e..221a6f50efd 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-portforward.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-reloadable.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-reloadable.nix index 87724691767..876e62c1da9 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-reloadable.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-restart_networking.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-restart_networking.nix index b35552b5b19..e1ad8157b28 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-restart_networking.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/containers-tmpfs.nix b/infra/libkookie/nixpkgs/nixos/tests/containers-tmpfs.nix index 7ebf0d02a24..fd9f9a252ca 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/containers-tmpfs.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/custom-ca.nix b/infra/libkookie/nixpkgs/nixos/tests/custom-ca.nix new file mode 100644 index 00000000000..67f7b3ff1f1 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/tests/custom-ca.nix @@ -0,0 +1,161 @@ +# Checks that `security.pki` options are working in curl and the main browser +# engines: Gecko (via Firefox), Chromium, QtWebEngine (Falkon) and WebKitGTK +# (via Midori). The test checks that certificates issued by a custom trusted +# CA are accepted but those from an unknown CA are rejected. + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + makeCert = { caName, domain }: pkgs.runCommand "example-cert" + { buildInputs = [ pkgs.gnutls ]; } + '' + mkdir $out + + # CA cert template + cat >ca.template <server.template < Tuple[int, str]: + """ + Run a shell command as a specific user. + """ + return machine.execute(f"sudo -u {user} {cmd}") + + + def wait_for_window_as(user: str, cls: str) -> None: + """ + Wait until a X11 window of a given user appears. + """ + + def window_is_visible(last_try: bool) -> bool: + ret, stdout = execute_as(user, f"xdotool search --onlyvisible --class {cls}") + if last_try: + machine.log(f"Last chance to match {cls} on the window list") + return ret == 0 + + with machine.nested("Waiting for a window to appear"): + retry(window_is_visible) + + + machine.start() + + with subtest("Good certificate is trusted in curl"): + machine.wait_for_unit("nginx") + machine.wait_for_open_port(443) + machine.succeed("curl -fv https://good.example.com") + + with subtest("Unknown CA is untrusted in curl"): + machine.fail("curl -fv https://bad.example.com") + + browsers = ["firefox", "chromium", "falkon", "midori"] + errors = ["Security Risk", "not private", "Certificate Error", "Security"] + + machine.wait_for_x() + for browser, error in zip(browsers, errors): + with subtest("Good certificate is trusted in " + browser): + execute_as( + "alice", f"env P11_KIT_DEBUG=trust {browser} https://good.example.com & >&2" + ) + wait_for_window_as("alice", browser) + machine.wait_for_text("It works!") + machine.screenshot("good" + browser) + execute_as("alice", "xdotool key ctrl+w") # close tab + + with subtest("Unknown CA is untrusted in " + browser): + execute_as("alice", f"{browser} https://bad.example.com & >&2") + machine.wait_for_text(error) + machine.screenshot("bad" + browser) + machine.succeed("pkill " + browser) + ''; +}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/fsck.nix b/infra/libkookie/nixpkgs/nixos/tests/fsck.nix index e522419fde2..5453f3bc48b 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/fsck.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/fsck.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix { machine = { lib, ... }: { virtualisation.emptyDiskImages = [ 1 ]; - fileSystems = lib.mkVMOverride { + virtualisation.fileSystems = { "/mnt" = { device = "/dev/vdb"; fsType = "ext4"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/geth.nix b/infra/libkookie/nixpkgs/nixos/tests/geth.nix new file mode 100644 index 00000000000..10cbd6d9038 --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/tests/geth.nix @@ -0,0 +1,41 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "geth"; + meta = with pkgs.lib; { + maintainers = with maintainers; [bachp ]; + }; + + machine = { ... }: { + services.geth."mainnet" = { + enable = true; + http = { + enable = true; + }; + }; + services.geth."testnet" = { + enable = true; + port = 30304; + network = "goerli"; + http = { + enable = true; + port = 18545; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("geth-mainnet.service") + machine.wait_for_unit("geth-testnet.service") + machine.wait_for_open_port(8545) + machine.wait_for_open_port(18545) + + machine.succeed( + 'geth attach --exec "eth.chainId()" http://localhost:8545 | grep \'"0x0"\' ' + ) + + machine.succeed( + 'geth attach --exec "eth.chainId()" http://localhost:18545 | grep \'"0x5"\' ' + ) + ''; +}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/gitlab.nix b/infra/libkookie/nixpkgs/nixos/tests/gitlab.nix index ba085338944..baad675229c 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/gitlab.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/glusterfs.nix b/infra/libkookie/nixpkgs/nixos/tests/glusterfs.nix index cb07bc09511..ef09264a021 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/glusterfs.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/glusterfs.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({pkgs, lib, ...}: let client = { pkgs, ... } : { environment.systemPackages = [ pkgs.glusterfs ]; - fileSystems = pkgs.lib.mkVMOverride + virtualisation.fileSystems = { "/gluster" = { device = "server1:/gv0"; fsType = "glusterfs"; @@ -22,7 +22,7 @@ let virtualisation.emptyDiskImages = [ 1024 ]; - fileSystems = pkgs.lib.mkVMOverride + virtualisation.fileSystems = { "/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/hardened.nix b/infra/libkookie/nixpkgs/nixos/tests/hardened.nix index d3f1f317296..485efc0fb78 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/hardened.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/hardened.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { boot.initrd.postDeviceCommands = '' ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb ''; - fileSystems = lib.mkVMOverride { + virtualisation.fileSystems = { "/efi" = { device = "/dev/disk/by-label/EFISYS"; fsType = "vfat"; @@ -65,17 +65,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { machine.succeed("grep -Fq wireguard /proc/modules") - # Test hidepid - with subtest("hidepid=2 option is applied and works"): - # Linux >= 5.8 shows "invisible" - machine.succeed( - "grep -Fq hidepid=2 /proc/mounts || grep -Fq hidepid=invisible /proc/mounts" - ) - # cannot use pgrep -u here, it segfaults when access to process info is denied - machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]") - machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]") - - # Test kernel module hardening with subtest("No more kernel modules can be loaded"): # note: this better a be module we normally wouldn't load ... diff --git a/infra/libkookie/nixpkgs/nixos/tests/installer.nix b/infra/libkookie/nixpkgs/nixos/tests/installer.nix index 789add331b7..904ec17229e 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/installer.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/installer.nix @@ -325,10 +325,13 @@ let curl ] ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub - ++ optionals (bootLoader == "grub" && grubVersion == 2) [ - (pkgs.grub2.override { zfsSupport = true; }) - (pkgs.grub2_efi.override { zfsSupport = true; }) - ]; + ++ optionals (bootLoader == "grub" && grubVersion == 2) (let + zfsSupport = lib.any (x: x == "zfs") + (extraInstallerConfig.boot.supportedFilesystems or []); + in [ + (pkgs.grub2.override { inherit zfsSupport; }) + (pkgs.grub2_efi.override { inherit zfsSupport; }) + ]); nix.binaryCaches = mkForce [ ]; nix.extraOptions = '' @@ -398,9 +401,9 @@ let createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" - + " mkpart ESP fat32 1M 50MiB" # /boot + + " mkpart ESP fat32 1M 100MiB" # /boot + " set 1 boot on" - + " mkpart primary linux-swap 50MiB 1024MiB" + + " mkpart primary linux-swap 100MiB 1024MiB" + " mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", diff --git a/infra/libkookie/nixpkgs/nixos/tests/jq.nix b/infra/libkookie/nixpkgs/nixos/tests/jq.nix deleted file mode 100644 index 075e6c43c09..00000000000 --- a/infra/libkookie/nixpkgs/nixos/tests/jq.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "jq"; - meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; - - nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; }; - - testScript = '' - assert "world" in jq.succeed('echo \'{"values":["hello","world"]}\'| jq \'.values[1]\''') - ''; -}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/keepassxc.nix b/infra/libkookie/nixpkgs/nixos/tests/keepassxc.nix new file mode 100644 index 00000000000..98902187f6a --- /dev/null +++ b/infra/libkookie/nixpkgs/nixos/tests/keepassxc.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "keepassxc"; + meta = with pkgs.lib.maintainers; { + maintainers = [ turion ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + test-support.displayManager.auto.user = "alice"; + environment.systemPackages = [ pkgs.keepassxc ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_x() + + # start KeePassXC window + machine.execute("su - alice -c keepassxc &") + + machine.wait_for_text("KeePassXC ${pkgs.keepassxc.version}") + machine.screenshot("KeePassXC") + ''; +}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/ksm.nix b/infra/libkookie/nixpkgs/nixos/tests/ksm.nix new file mode 100644 index 00000000000..8f84b32020a --- /dev/null +++ b/infra/libkookie/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/davfs2-secrets chmod 600 /tmp/davfs2-secrets ''; - fileSystems = pkgs.lib.mkVMOverride { + virtualisation.fileSystems = { "/mnt/dav" = { device = "http://nextcloud/remote.php/webdav/"; fsType = "davfs"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/nfs/kerberos.nix b/infra/libkookie/nixpkgs/nixos/tests/nfs/kerberos.nix index 078f0b7814c..75d1210496b 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/nfs/kerberos.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/nfs/kerberos.nix @@ -40,7 +40,7 @@ in networking.domain = "nfs.test"; networking.hostName = "client"; - fileSystems = lib.mkVMOverride + virtualisation.fileSystems = { "/data" = { device = "server.nfs.test:/"; fsType = "nfs"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/nfs/simple.nix b/infra/libkookie/nixpkgs/nixos/tests/nfs/simple.nix index 630c68a5b05..6a01089c082 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/nfs/simple.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/nfs/simple.nix @@ -4,7 +4,7 @@ let client = { pkgs, ... }: - { fileSystems = pkgs.lib.mkVMOverride + { virtualisation.fileSystems = { "/data" = { # nfs4 exports the export with fsid=0 as a virtual root directory device = if (version == 4) then "server:/" else "server:/data"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/nixos-generate-config.nix b/infra/libkookie/nixpkgs/nixos/tests/nixos-generate-config.nix index 5daa55a8abb..7bf8d4da7b6 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/nixos-generate-config.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/nixos-generate-config.nix @@ -11,12 +11,11 @@ import ./make-test-python.nix ({ lib, ... } : { } ''; - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # DESKTOP - # services.xserver.enable = true; - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome3.enable = true; - ''; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome3.enable = true; + '']; }; testScript = '' start_all() diff --git a/infra/libkookie/nixpkgs/nixos/tests/openldap.nix b/infra/libkookie/nixpkgs/nixos/tests/openldap.nix index 392fae24346..f1a39ad7dde 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/openldap.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/openldap.nix @@ -1,4 +1,9 @@ -{ pkgs, system ? builtins.currentSystem, ... }: let +{ pkgs ? (import ../.. { inherit system; config = { }; }) +, system ? builtins.currentSystem +, ... +}: + +let dbContents = '' dn: dc=example objectClass: domain @@ -16,7 +21,7 @@ ''; in { # New-style configuration - current = import ./make-test-python.nix { + current = import ./make-test-python.nix ({ pkgs, ... }: { inherit testScript; name = "openldap"; @@ -53,10 +58,10 @@ in { declarativeContents."dc=example" = dbContents; }; }; - }; + }) { inherit pkgs system; }; # Old-style configuration - oldOptions = import ./make-test-python.nix { + oldOptions = import ./make-test-python.nix ({ pkgs, ... }: { inherit testScript; name = "openldap"; @@ -72,10 +77,10 @@ in { declarativeContents."dc=example" = dbContents; }; }; - }; + }) { inherit system pkgs; }; # Manually managed configDir, for example if dynamic config is essential - manualConfigDir = import ./make-test-python.nix { + manualConfigDir = import ./make-test-python.nix ({ pkgs, ... }: { name = "openldap"; machine = { pkgs, ... }: { @@ -121,5 +126,5 @@ in { "systemctl restart openldap", ) '' + testScript; - }; + }) { inherit system pkgs; }; } diff --git a/infra/libkookie/nixpkgs/nixos/tests/orangefs.nix b/infra/libkookie/nixpkgs/nixos/tests/orangefs.nix index 24b7737058c..fe9f9cc37ea 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/orangefs.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/orangefs.nix @@ -9,7 +9,7 @@ let virtualisation.emptyDiskImages = [ 4096 ]; - fileSystems = pkgs.lib.mkVMOverride + virtualisation.fileSystems = { "/data" = { device = "/dev/disk/by-label/data"; fsType = "ext4"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/php/default.nix b/infra/libkookie/nixpkgs/nixos/tests/php/default.nix index ee7a3b56a3e..cf78c9db53b 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/php/default.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/php/default.nix @@ -1,8 +1,15 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../../.. { inherit system config; } -}: { - fpm = import ./fpm.nix { inherit system pkgs; }; - httpd = import ./httpd.nix { inherit system pkgs; }; - pcre = import ./pcre.nix { inherit system pkgs; }; +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../../.. { inherit system config; } +, php ? pkgs.php +}: + +let + php' = php.buildEnv { + extensions = { enabled, all }: with all; enabled ++ [ apcu ]; + }; +in { + fpm = import ./fpm.nix { inherit system pkgs; php = php'; }; + httpd = import ./httpd.nix { inherit system pkgs; php = php'; }; + pcre = import ./pcre.nix { inherit system pkgs; php = php'; }; } diff --git a/infra/libkookie/nixpkgs/nixos/tests/php/fpm.nix b/infra/libkookie/nixpkgs/nixos/tests/php/fpm.nix index 9ad515ebdde..b11f85d39cb 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/php/fpm.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/php/fpm.nix @@ -1,8 +1,10 @@ -import ../make-test-python.nix ({pkgs, lib, ...}: { - name = "php-fpm-nginx-test"; +import ../make-test-python.nix ({pkgs, lib, php, ...}: { + name = "php-${php.version}-fpm-nginx-test"; meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { + environment.systemPackages = [ php ]; + services.nginx = { enable = true; @@ -10,7 +12,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { testdir = pkgs.writeTextDir "web/index.php" " /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/infra/libkookie/nixpkgs/nixos/tests/ripgrep.nix b/infra/libkookie/nixpkgs/nixos/tests/ripgrep.nix deleted file mode 100644 index 3ff3bf4be15..00000000000 --- a/infra/libkookie/nixpkgs/nixos/tests/ripgrep.nix +++ /dev/null @@ -1,13 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "ripgrep"; - meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; - - nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; }; - - testScript = '' - ripgrep.succeed('echo "abc\nbcd\ncde" > /tmp/foo') - assert "bcd" in ripgrep.succeed("rg -N 'bcd' /tmp/foo") - assert "bcd\ncde" in ripgrep.succeed("rg -N 'cd' /tmp/foo") - assert "ripgrep ${pkgs.ripgrep.version}" in ripgrep.succeed("rg --version | head -1") - ''; -}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/samba.nix b/infra/libkookie/nixpkgs/nixos/tests/samba.nix index 142269752b3..d1d50caabfa 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/samba.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/samba.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes = { client = { pkgs, ... }: - { fileSystems = pkgs.lib.mkVMOverride + { virtualisation.fileSystems = { "/public" = { fsType = "cifs"; device = "//server/public"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/sbt-extras.nix b/infra/libkookie/nixpkgs/nixos/tests/sbt-extras.nix deleted file mode 100644 index f1672bf2066..00000000000 --- a/infra/libkookie/nixpkgs/nixos/tests/sbt-extras.nix +++ /dev/null @@ -1,16 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "sbt-extras"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - machine = { pkgs, ... }: - { - environment.systemPackages = [ pkgs.sbt-extras ]; - }; - - testScript = - '' - machine.succeed("(sbt -h)") - ''; -}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/sbt.nix b/infra/libkookie/nixpkgs/nixos/tests/sbt.nix deleted file mode 100644 index 22541232ba6..00000000000 --- a/infra/libkookie/nixpkgs/nixos/tests/sbt.nix +++ /dev/null @@ -1,18 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "sbt"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - machine = { pkgs, ... }: - { - environment.systemPackages = [ pkgs.sbt ]; - }; - - testScript = - '' - machine.succeed( - "(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'" - ) - ''; -}) diff --git a/infra/libkookie/nixpkgs/nixos/tests/snapper.nix b/infra/libkookie/nixpkgs/nixos/tests/snapper.nix index 018102d7f64..098d8d9d72f 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/snapper.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/snapper.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ ... }: virtualisation.emptyDiskImages = [ 4096 ]; - fileSystems = lib.mkVMOverride { + virtualisation.fileSystems = { "/home" = { device = "/dev/disk/by-label/aux"; fsType = "btrfs"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/infra/libkookie/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index bce78f09fdc..5831c8692f6 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/systemd.nix b/infra/libkookie/nixpkgs/nixos/tests/systemd.nix index f7c13a587c5..e0685f53a94 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/systemd.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/systemd.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { environment.systemPackages = [ pkgs.cryptsetup ]; - fileSystems = lib.mkVMOverride { + virtualisation.fileSystems = { "/test-x-initrd-mount" = { device = "/dev/vdb"; fsType = "ext2"; diff --git a/infra/libkookie/nixpkgs/nixos/tests/traefik.nix b/infra/libkookie/nixpkgs/nixos/tests/traefik.nix index 4eeae29acad..f27f6e1e6d6 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/traefik.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/traefik.nix @@ -11,8 +11,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { environment.systemPackages = [ pkgs.curl ]; }; traefik = { config, pkgs, ... }: { - docker-containers.nginx = { - extraDockerOptions = [ + virtualisation.oci-containers.containers.nginx = { + extraOptions = [ "-l" "traefik.enable=true" "-l" "traefik.http.routers.nginx.entrypoints=web" "-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)" diff --git a/infra/libkookie/nixpkgs/nixos/tests/unbound.nix b/infra/libkookie/nixpkgs/nixos/tests/unbound.nix index c8823163622..d4b8bb15ced 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/unbound.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/nixos/tests/zfs.nix b/infra/libkookie/nixpkgs/nixos/tests/zfs.nix index 03aa5e5399c..ba5eb7cd528 100644 --- a/infra/libkookie/nixpkgs/nixos/tests/zfs.nix +++ b/infra/libkookie/nixpkgs/nixos/tests/zfs.nix @@ -29,7 +29,7 @@ let # Setup regular fileSystems machinery to ensure forceImportAll can be # tested via the regular service units. - fileSystems = lib.mkVMOverride { + virtualisation.fileSystems = { "/forcepool" = { device = "forcepool"; fsType = "zfs"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/MMA/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/MMA/default.nix index ade595732c3..25cb9696509 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/MMA/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ashuffle/default.nix index cf3321e241f..e445132ee3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ashuffle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.4.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; + sha256 = "103jhajqwryiaf52qqgshajcnsxsz4l8gn3sz6bxs7k0yq5x1knr"; fetchSubmodules = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 5d89813216d..ac405cde644 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,7 +1,7 @@ { mkDerivation , lib -, stdenv , fetchFromGitHub +, fetchpatch , qmake , pkg-config , qttools @@ -21,10 +21,15 @@ mkDerivation rec { sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace BambooTracker/BambooTracker.pro \ - --replace '# Temporary known-error downgrades here' 'CPP_WARNING_FLAGS += -Wno-missing-braces' - ''; + # TODO Remove when updating past 0.4.6 + # Fixes build failure on darwin + patches = [ + (fetchpatch { + name = "bambootracker-Add_braces_in_initialization_of_std-array.patch"; + url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch"; + sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn"; + }) + ]; nativeBuildInputs = [ qmake qttools pkg-config ]; @@ -40,6 +45,5 @@ mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; - broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/baudline/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/baudline/default.nix index 29c5130f575..7d6d51011cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/baudline/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix index db8f8ad793a..aafad7f82e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bchoppr/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 9644182861d..87638ebbe6c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-R1e+eTheS9KqPIHw1QoMJgpSB1ss0gwTUGAojdJM0Zw="; + sha256 = "sha256-NDkGHJDr6TCHEhgSKK7jLYk5RjGEj8+lDYZ4ywvG20g="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix index d307307fd1d..2a4e717e1bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSlizr"; - version = "1.2.8"; + version = "1.2.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; + sha256 = "sha256-tEGJrVg8dN9Torybx02qIpXsGOuCgn/Wb+jemfCjiK4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/caudec/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/caudec/default.nix index 0360922c819..15ebb85136b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/caudec/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/clementine/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/clementine/default.nix index be0f2f72529..e665edabd07 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix index 0724632a63e..a2e71b955ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/clerk/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix index ba9df9039f6..953a919d0c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { "SHARE_DIR=${placeholder "out"}/share" ]; + dontWrapQtApps = true; + meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix index cd45ef5926b..66108deab1e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/ebumeter/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ebumeter/default.nix new file mode 100644 index 00000000000..9ebcbec001d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ebumeter/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl +, libX11, libXft, libclthreads, libclxclient, libjack2, libpng, libsndfile, zita-resampler +}: + +stdenv.mkDerivation rec { + pname = "ebumeter"; + version = "0.4.2"; + + src = fetchurl { + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; + sha256 = "1wm9j1phmpicrp7jdsvdbc3mghdd92l61yl9qbps0brq2ljjyd5s"; + }; + + buildInputs = [ + libX11 libXft libclthreads libclxclient libjack2 libpng libsndfile zita-resampler + ]; + + preConfigure = '' + cd source + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Level metering according to the EBU R-128 recommendation"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index 50d7af6d116..44d5a0aa15a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config -, ronn +, ronn, substituteAll +, mbrolaSupport ? true, mbrola , pcaudiolibSupport ? true, pcaudiolib , sonicSupport ? true, sonic }: @@ -14,13 +15,26 @@ stdenv.mkDerivation rec { sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b"; }; + patches = lib.optionals mbrolaSupport [ + # Hardcode correct mbrola paths. + (substituteAll { + src = ./mbrola.patch; + inherit mbrola; + }) + ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ]; - buildInputs = lib.optional pcaudiolibSupport pcaudiolib + buildInputs = lib.optional mbrolaSupport mbrola + ++ lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic; preConfigure = "./autogen.sh"; + configureFlags = [ + "--with-mbrola=${if mbrolaSupport then "yes" else "no"}" + ]; + postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; @@ -29,7 +43,7 @@ stdenv.mkDerivation rec { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; homepage = "https://github.com/espeak-ng/espeak-ng"; changelog = "https://github.com/espeak-ng/espeak-ng/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; platforms = platforms.all; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/mbrola.patch b/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/mbrola.patch new file mode 100644 index 00000000000..2f6c61cca4e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/espeak-ng/mbrola.patch @@ -0,0 +1,22 @@ +--- a/src/libespeak-ng/mbrowrap.c ++++ b/src/libespeak-ng/mbrowrap.c +@@ -205,7 +205,7 @@ + signal(SIGTERM, SIG_IGN); + + snprintf(charbuf, sizeof(charbuf), "%g", mbr_volume); +- execlp("mbrola", "mbrola", "-e", "-v", charbuf, ++ execlp("@mbrola@/bin/mbrola", "mbrola", "-e", "-v", charbuf, + voice_path, "-", "-.wav", (char *)NULL); + /* if execution reaches this point then the exec() failed */ + snprintf(mbr_errorbuf, sizeof(mbr_errorbuf), +--- a/src/libespeak-ng/synth_mbrola.c ++++ b/src/libespeak-ng/synth_mbrola.c +@@ -85,7 +85,7 @@ + if (!load_MBR()) + return ENS_MBROLA_NOT_FOUND; + +- sprintf(path, "%s/mbrola/%s", path_home, mbrola_voice); ++ sprintf(path, "@mbrola@/share/mbrola/voices/%s/%s", mbrola_voice, mbrola_voice); + #ifdef PLATFORM_POSIX + // if not found, then also look in + // usr/share/mbrola/xx, /usr/share/mbrola/xx/xx, /usr/share/mbrola/voices/xx diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix index 6d7d2e2c2ba..81ce11b9ea1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust1.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 990d073528e..051caf120fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index d9d2570d0a8..2ebff030b4e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index 1733aef4177..fbd94ebd3d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitLab -, fetchpatch , meson , ninja , gettext diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 0be1cc45717..f86eed1d34d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { }; dontBuild = true; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ dpkg makeWrapper ]; unpackPhase = '' dpkg -x $src . diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/jamin/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/jamin/default.nix index f111c4e99d7..325d115b581 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/jamin/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/keyfinder/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/keyfinder/default.nix index 80cd8f4d9a0..c3667ee57a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/keyfinder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/keyfinder/default.nix @@ -20,6 +20,8 @@ mkDerivation rec { --replace "\$\$[QT_INSTALL_PREFIX]" "$out" ''; + dontWrapQtApps = true; + meta = with lib; { description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/kmetronome/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/kmetronome/default.nix index ca8df45e459..02353fcf4f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/kmetronome/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/kmetronome/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://kmetronome.sourceforge.io/"; description = "ALSA MIDI metronome with Qt interface"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/lash/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/lash/default.nix index eb355a43409..74bbeb9b7bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/lash/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/linuxband/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/linuxband/default.nix index 118b54ad858..ec034ae238d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/linuxband/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix index c85645565ee..6c218738f0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.5"; + version = "1.4.16"; 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 = "1i5qcpp3fpkda08g6nkiiff8lsjmv5xsvpa0512kigq5z0lsagrx"; + sha256 = "sha256-4txJ+lYx2BROjZznFwWMc+tTVpYQpPtPySfCl+Hfy+0="; }; nativeBuildInputs = [ @@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec { description = "A modern music player for GNOME"; homepage = "https://wiki.gnome.org/Apps/Lollypop"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ worldofpeace lovesegfault ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index d7f0a7fb20e..400f268d439 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 7a917d79c57..0b80aef170a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 5ac71172325..56534309733 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 277b186fd4a..4b1157de0b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index de7e573cbee..f951486e3fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 80c5bb89eee..fff4292cd76 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 9bd4076f130..6bc8cff2261 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index a90492f4235..7ea5fa753c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 414e350caa0..fd807dd4245 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 7dcdf985c82..07d4402578c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mbrola/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mbrola/default.nix new file mode 100644 index 00000000000..01a9fdd636b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mbrola/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub }: + +let + voices = fetchFromGitHub { + owner = "numediart"; + repo = "MBROLA-voices"; + rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit + sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0"; + }; +in +stdenv.mkDerivation rec { + pname = "mbrola"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "numediart"; + repo = "MBROLA"; + rev = version; + sha256 = "1w86gv6zs2cbr0731n49z8v6xxw0g8b0hzyv2iqb9mqcfh38l8zy"; + }; + + installPhase = '' + runHook preInstall + install -D Bin/mbrola $out/bin/mbrola + + # TODO: package separately because it's very big + install -d $out/share/mbrola/voices + cp -R ${voices}/data/* $out/share/mbrola/voices/ + runHook postInstall + ''; + + meta = with lib; { + description = "Speech synthesizer based on the concatenation of diphones"; + homepage = "https://github.com/numediart/MBROLA"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ davidak ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix index 30d654ab87a..92f8506483f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mmtc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mmtc/default.nix index 0d1d2c5684f..4bd922c8fb6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mmtc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mmtc/default.nix @@ -1,17 +1,27 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ fetchFromGitHub, installShellFiles, lib, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "1chcnv8wql6v2vckpzvq6sxgpss7mnxaj008jdm8xalhw9d496s4"; + sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz"; }; - cargoSha256 = "06b0hag3s5irvi57n0hc97agfw4sw783lkkl1b26iap6mfbvrqma"; + cargoSha256 = "06xqh0mqbik00qyg8mn1ddbn15v3pdwvh1agghg22xgx53kmnxb3"; + + nativeBuildInputs = [ installShellFiles ]; + + preFixup = '' + completions=($releaseDir/build/mmtc-*/out/completions) + installShellCompletion ''${completions[0]}/mmtc.{bash,fish} + installShellCompletion --zsh ''${completions[0]}/_mmtc + ''; + + GEN_COMPLETIONS = "1"; meta = with lib; { description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix index 0637731dcb5..81c689a343d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from SomaFM"; license = licenses.mit; maintainers = [ maintainers.nickhu ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix index 47f8e5a22e6..6a5dbebeca0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/muso/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/muso/default.nix new file mode 100644 index 00000000000..436afac7df2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/muso/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, rustPlatform +, pkg-config, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "muso"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "quebin31"; + repo = pname; + rev = "68cc90869bcc0f202830a318fbfd6bb9bdb75a39"; + sha256 = "1dnfslliss173igympl7h1zc0qz0g10kf96dwrcj6aglmvvw426p"; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + preConfigure = '' + substituteInPlace lib/utils.rs \ + --replace "/usr/share/muso" "$out/share/muso" + ''; + + postInstall = '' + mkdir -p $out/share/muso + cp share/* $out/share/muso/ + ''; + + cargoSha256 = "06jgk54r3f8gq6iylv5rgsawss3hc5kmvk02y4gl8iwfnw4xrvmg"; + + meta = with lib; { + description = "An automatic music sorter (based on ID3 tags)"; + homepage = "https://github.com/quebin31/muso"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ bloomvdomino ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index a4a32be41db..e397534d126 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -18,13 +18,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ="; + sha256 = "sha256-KDSHbEZ2PJLEIlXqPvBQ2ZPWno+IoajTjkl9faAXIko="; }; buildInputs = [ glib ncurses libmpdclient boost ] diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix index 0322459685f..957c7b3c7fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsaLib openssl ]; cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l"; - verifyCargoDeps = true; meta = with lib; { homepage = "https://github.com/betta-cyber/netease-music-tui"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/default.nix index b1b60540b8c..11424c0be18 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { "-DENABLE_PULSEAUDIO=ON" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Application for practicing playing musical scores and ear training"; homepage = "https://nootka.sourceforge.io/"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/unstable.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/unstable.nix index 1fb70c195dc..aa49daaa1e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/unstable.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/nootka/unstable.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtquickcontrols2 ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse" "-DENABLE_JACK=ON" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix index c3ab0ffcebd..2fd1aeccd7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { dontUnpack = true; dontBuild = true; dontStrip = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix index 200e457c568..785c334e152 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -40,11 +40,6 @@ in pythonPackages.buildPythonApplication rec { dateutil ]; - prePatch = '' - # Pesky unicode punctuation. - substituteInPlace setup.cfg --replace "‘" "'" - ''; - # In order to spare double wrapping, we use: preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/playbar2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/playbar2/default.nix index 7545c17131f..dfbfb43e625 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/playbar2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/playbar2/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { kwindowsystem ]; + dontWrapQtApps = true; + meta = with lib; { description = "Mpris2 Client for Plasma5"; homepage = "https://github.com/audoban/PlayBar2"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/pragha/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/pragha/default.nix new file mode 100644 index 00000000000..da5a64f708e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/pragha/default.nix @@ -0,0 +1,103 @@ +{ lib +, intltool +, mkDerivation +, installShellFiles +, pkg-config +, fetchFromGitHub +, dbus-glib +, desktop-file-utils +, hicolor-icon-theme +, pcre +, qtbase +, sqlite +, taglib +, zlib +, gtk3 +, libpeas +, libcddb +, libcdio +, gst_all_1, withGstPlugins ? true +, glyr, withGlyr ? true +, liblastfmSF, withLastfm ? true +, libcdio-paranoia, withCD ? true +, keybinder3, withKeybinder ? false +, libnotify, withLibnotify ? false +, libsoup, withLibsoup ? false +, libgudev, withGudev ? false # experimental +, libmtp, withMtp ? false # experimental +, xfce, withXfce4ui ? false +, totem-pl-parser, withTotemPlParser ? false +# , grilo, withGrilo ? false +# , rygel, withRygel ? true +}: + +assert withGlyr -> withLastfm; +assert withLastfm -> withCD; + +mkDerivation rec { + pname = "pragha"; + version = "1.3.99.1"; + + src = fetchFromGitHub { + owner = "pragha-music-player"; + repo = "pragha"; + rev = "v${version}"; + sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE="; + }; + + nativeBuildInputs = [ + intltool + pkg-config + xfce.xfce4-dev-tools + desktop-file-utils + installShellFiles + ]; + + buildInputs = with gst_all_1; [ + dbus-glib + gstreamer + gst-plugins-base + gtk3 + hicolor-icon-theme + libpeas + pcre + qtbase + sqlite + taglib + zlib + ] + ++ lib.optionals withGstPlugins [ gst-plugins-good gst-plugins-bad gst-plugins-ugly ] + ++ lib.optionals withCD [ libcddb libcdio libcdio-paranoia ] + ++ lib.optional withGudev libgudev + ++ lib.optional withKeybinder keybinder3 + ++ lib.optional withLibnotify libnotify + ++ lib.optional withLastfm liblastfmSF + ++ lib.optional withGlyr glyr + ++ lib.optional withLibsoup libsoup + ++ lib.optional withMtp libmtp + ++ lib.optional withXfce4ui xfce.libxfce4ui + ++ lib.optional withTotemPlParser totem-pl-parser + # ++ lib.optional withGrilo grilo + # ++ lib.optional withRygel rygel + ; + + CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ]; + + NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + + install -m 444 data/${pname}.desktop $out/share/applications + install -d $out/share/pixmaps + installManPage data/${pname}.1 + ''; + + meta = with lib; { + description = "A lightweight GTK+ music manager - fork of Consonance Music Manager"; + homepage = "https://pragha-music-player.github.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mbaeten ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix index 8f4cfb499f2..d207d26972f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/projectm/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { description = "Cross-platform Milkdrop-compatible music visualizer"; license = lib.licenses.lgpl21; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ajs124 ]; + maintainers = with lib.maintainers; [ ]; longDescription = '' The open-source project that reimplements the esteemed Winamp Milkdrop by Geiss in a more modern, cross-platform reusable library. Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations. diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix index 80968e2700b..3444ef9acbd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix index 3fb476b65cc..8bc2553f521 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/reaper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/reaper/default.nix index 212b4c716ff..8e70bff2b97 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.21"; + version = "6.23"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "11nvfjfrri9y0k7n7psz3yk1l7mxp9f6yi69pq7hvn9d4n26p5vd"; + sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + XDG_DATA_HOME="$out/share" ./install-reaper.sh \ --install $out/opt \ --integrate-user-desktop @@ -57,6 +59,8 @@ stdenv.mkDerivation rec { mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ ln -s $out/opt/REAPER/reamote-server $out/bin/ + + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/renoise/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/renoise/default.nix index 8d495b93629..45f4e76bf5e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/rubyripper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/rubyripper/default.nix index b7abfa40b86..e8a275db98d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/rubyripper/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/seq66/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/seq66/default.nix index 93f9e9503b9..71d70c2dd58 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/seq66/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/seq66/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix index a503d3b344c..96433221e93 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/shortwave/default.nix @@ -14,7 +14,6 @@ , openssl , pkg-config , python3 -, rust , rustc , rustPlatform , sqlite diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/spectmorph/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/spectmorph/default.nix index a368d62ce7d..6292d771a51 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/spectmorph/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/spectmorph/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; + dontWrapQtApps = true; + meta = with lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; homepage = "http://spectmorph.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix index 43ecb67d64a..655a047a3a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix index 776c9576bb4..f9f1383662e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/spotifyd/default.nix @@ -9,16 +9,16 @@ 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/infra/libkookie/nixpkgs/pkgs/applications/audio/tuijam/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/tuijam/default.nix index 8a08b64508d..4a215528b7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/tuijam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/tuijam/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , lib , python3Packages -, youtube-dl }: buildPythonApplication rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/vkeybd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/vkeybd/default.nix index 3409d8a4907..943bd0d8032 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/vkeybd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/backup/vorta/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/backup/vorta/default.nix index a1b5944a51e..c37bf0f20f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; + sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix index bd1c9611d56..f578313323c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/bitcoin-classic.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "Peer-to-peer electronic cash system (Classic client)"; longDescription= '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 3958a44cdaf..52914c1128a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.5.9"; + version = "1.0.6.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; + sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 5ee5e261211..9065ff49cf8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -1,8 +1,13 @@ { fetchNuGet }: [ + (fetchNuGet { + name = "AngleSharp.Css"; + version = "0.14.2"; + sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd"; + }) (fetchNuGet { name = "AngleSharp"; - version = "0.9.11"; - sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; + version = "0.14.0"; + sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { name = "AWSSDK.Core"; @@ -136,8 +141,18 @@ }) (fetchNuGet { name = "HtmlSanitizer"; - version = "4.0.217"; - sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; + version = "5.0.372"; + sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; + }) + (fetchNuGet { + name = "McMaster.NETCore.Plugins.Mvc"; + version = "1.3.1"; + sha256 = "1dh58ijwn6q6id0jpzr4hpfl0y4ak43zq4m8rsi5j2qv8vasq1mi"; + }) + (fetchNuGet { + name = "McMaster.NETCore.Plugins"; + version = "1.3.1"; + sha256 = "0jrp7sshnvg7jcb52gfhwmg1jy31k9dxdf4061yggwcgpfskyg7n"; }) (fetchNuGet { name = "Microsoft.AspNet.SignalR.Client"; @@ -209,11 +224,6 @@ version = "3.1.1"; sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; @@ -296,24 +306,19 @@ }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; - version = "3.1.4"; - sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; + version = "3.1.0"; + sha256 = "1fg1zggza45pa8zlcf8llqh6v47fqi44azsia68kmsg2q9r1r4mq"; }) (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "3.1.0"; - sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd"; + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.4"; + sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "3.1.4"; sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "3.1.0"; - sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; version = "3.1.4"; @@ -344,31 +349,16 @@ version = "3.1.4"; sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; - version = "3.1.0"; - sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "3.1.4"; sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Abstractions"; - version = "3.1.0"; - sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0"; - }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "3.1.4"; sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Memory"; - version = "3.1.0"; - sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1"; - }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "3.1.4"; @@ -389,11 +379,6 @@ version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.0"; - sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.4"; @@ -404,11 +389,6 @@ version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.0"; - sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.4"; @@ -439,11 +419,6 @@ version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.0"; - sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.4"; @@ -459,11 +434,6 @@ version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.0"; - sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.4"; @@ -474,11 +444,6 @@ version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.0"; - sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.1.4"; @@ -489,6 +454,11 @@ version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.0"; + sha256 = "12nrdw3q9wl5zry8gb3sw003a0iyk2gvps2ij813l7lim38wy1mi"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; @@ -559,11 +529,6 @@ version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.0"; - sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.4"; @@ -579,11 +544,6 @@ version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "3.1.0"; - sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.1.4"; @@ -599,11 +559,6 @@ version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.0"; - sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; - }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.1.4"; @@ -629,11 +584,6 @@ version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.0"; - sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; - }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.4"; @@ -669,6 +619,11 @@ version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; @@ -699,6 +654,11 @@ version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { + name = "Microsoft.Win32.SystemEvents"; + version = "4.7.0"; + sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; + }) (fetchNuGet { name = "MySqlConnector"; version = "0.61.0"; @@ -729,6 +689,11 @@ version = "5.0.60"; sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.68"; + sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd"; + }) (fetchNuGet { name = "NBitpayClient"; version = "1.0.0.39"; @@ -849,6 +814,11 @@ version = "1.8.1.3"; sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; }) + (fetchNuGet { + name = "QRCoder"; + version = "1.4.1"; + sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch"; + }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -869,11 +839,6 @@ version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; @@ -949,10 +914,15 @@ version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { + name = "Selenium.Support"; + version = "3.141.0"; + sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib"; + }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "85.0.4183.8700"; - sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; + version = "87.0.4280.8800"; + sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr"; }) (fetchNuGet { name = "Selenium.WebDriver"; @@ -1064,11 +1034,6 @@ version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.7.0"; - sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; - }) (fetchNuGet { name = "System.Collections.Immutable"; version = "1.7.1"; @@ -1134,21 +1099,11 @@ version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.7.0"; - sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; @@ -1179,6 +1134,11 @@ version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { + name = "System.Drawing.Common"; + version = "4.7.0"; + sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; + }) (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; @@ -1189,21 +1149,11 @@ version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; @@ -1299,11 +1249,6 @@ version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; @@ -1329,11 +1274,6 @@ version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Net.Requests"; - version = "4.0.11"; - sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; - }) (fetchNuGet { name = "System.Net.Security"; version = "4.3.0"; @@ -1349,11 +1289,6 @@ version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { - name = "System.Net.WebHeaderCollection"; - version = "4.0.1"; - sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; - }) (fetchNuGet { name = "System.Net.WebHeaderCollection"; version = "4.3.0"; @@ -1594,21 +1529,11 @@ version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; @@ -1624,11 +1549,6 @@ version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -1649,11 +1569,6 @@ version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; @@ -1689,6 +1604,11 @@ version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.0"; + sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; + }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.1"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 3c5bc5ea5ce..7c03d06da59 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.6"; + version = "4.0.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1zi559ixjxxsrpvvjbxa1d0g96px3h9amjvy149sfhp7b8w5hhk3"; + sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 776253ac9cd..4dab912cf15 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -1,21 +1,34 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: -buildGoModule rec { +let + # A list of binaries to put into separate outputs + bins = [ + "geth" + ]; + +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; + outputs = [ "out" ] ++ bins; + + # Move binaries to separate outputs and symlink them back to $out + postInstall = lib.concatStringsSep "\n" ( + builtins.map (bin: "mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/") bins + ); + subPackages = [ "cmd/abidump" "cmd/abigen" @@ -40,7 +53,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; - license = with licenses; [ lgpl3 gpl3 ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d130b3d0454..3d72a91551f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix index b884f044efe..17e884c5794 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 45143a797e5..ffa061edc72 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.46"; + version = "2.1.49"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "1aph7yiwmch7s7x1qkzqv1shs3v6kg8i2s7266la0yp9ksf3w35p"; + sha256 = "0xg5gbq6rbzgsbgwf94qcy2b0m5kdspi6hc5a64smaj9i7i0136l"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index 85d395089de..b0bf85f623f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,18 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.21"; - sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; + version = "2.0.28"; + sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.12"; - sha256 = "1d6lmymc9x3p74c8hc2x3m61ncnkqqgrddw9cw2m0zkvilkncsns"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.58"; - sha256 = "0qim9xbbj380254iyi1jsh2gnr90ddwd2593jw9a8bjwnlk7qr2c"; + version = "2.0.21"; + sha256 = "1k26fkss6d7x2yqlid31z5i04b5dmlbbbwijg9c8i3d996i1z7sq"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.60"; - sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; + version = "5.0.73"; + sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -221,8 +216,8 @@ }) (fetchNuGet { name = "Newtonsoft.Json"; - version = "11.0.1"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { name = "Newtonsoft.Json"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix index 8ad7c8fdd6c..5dc35e996be 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix @@ -37,8 +37,14 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features final" ]; - # test result: FAILED. 88 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out - doCheck = false; + # Fix tests by preventing them from writing to /homeless-shelter. + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Exclude some tests that don't work in the sandbox + # - Nat test requires network access + checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts"; meta = with lib; { description = "Fast, light, robust Ethereum implementation"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index d85e7dcfebf..e24531c373a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.12.3"; + version = "1.1.12.4"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "1x4gqmiwdp5bjq7c5hjch3srsvf73d92lswnp355l7l7cxh2hcsx"; + sha256 = "sha256-1yg0C1lJrLxQEs2GA+XEBUx/JAyc+aW0UWjLhSEy0RI="; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index d1cd2e7d3e4..0005fdb6339 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index 6a96f560ddc..be9ba0f7561 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { }) ]; + dontWrapQtApps = true; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 1c3c4aade5f..6be6defd198 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 1dc8b9ca7ff..fa4f7a40d96 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/apostrophe/default.nix index 4265e0ef104..dd8757d0c17 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/atom/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/atom/default.nix index e7a9a26f066..875f8612fde 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/atom/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/bluej/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/bluej/default.nix index c0ca16a284a..9b28de9440f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/code-browser/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/code-browser/default.nix index a4ae4a811bf..ea4398cc4a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/code-browser/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/code-browser/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ "UI=qt" ] ++ lib.optionals withGtk [ "UI=gtk" ]; + + dontWrapQtApps = true; + meta = with lib; { description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; homepage = "https://tibleiz.net/code-browser/"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix index cff482e887d..2c067250309 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 000129f74df..2f97e361322 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -413,6 +413,22 @@ rec { }; }; + freemarker = buildEclipseUpdateSite rec { + name = "freemarker-${version}"; + version = "1.5.305"; + + src = fetchzip { + url = "https://github.com/ddekany/jbosstools-freemarker/releases/download/v${version}/freemarker.site-${version}.zip"; + sha256 = "1qrhi300vk07gi14r445wvy0bvghbjd6c4k7q09pqpaxv6raiczn"; + stripRoot = false; + }; + + meta = with lib; { + homepage = "https://github.com/ddekany/jbosstools-freemarker"; + description = "Plugin that provides an editor for Apache FreeMarker files"; + }; + }; + gnuarmeclipse = buildEclipseUpdateSite rec { name = "gnuarmeclipse-${version}"; version = "3.1.1-201606210758"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b841c0df959..1cc47d5ca85 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.3"; + version = "13.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.3.tar"; - sha256 = "1ljpkr0z15fyh907jbgky238dvci5vqi3xhvslyhblhp8sg9cbsi"; + url = "https://elpa.gnu.org/packages/auctex-13.0.4.tar"; + sha256 = "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -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; @@ -955,10 +955,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.21"; + version = "0.6.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.21.tar"; - sha256 = "0pp190wr6z98kggmw9ls486f9vxfimdjdbqsp263qiyi21ws98if"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.22.tar"; + sha256 = "0dljl21n6508c7ash7l6zgxhpn2wdfzga0va63d4k9nwnqmkvsgz"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -985,10 +985,10 @@ elpaBuild { pname = "ebdb-i18n-chn"; ename = "ebdb-i18n-chn"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el"; - sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl"; + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar"; + sha256 = "06ii9xi2y157vfbhx75mn80ash22d1xgcyp9kzz1s0lkxwlv74zj"; }; packageRequires = [ ebdb pyim ]; meta = { @@ -1205,10 +1205,10 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar"; - sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j"; + url = "https://elpa.gnu.org/packages/excorporate-0.9.3.tar"; + sha256 = "1ybj0ww7x7l7ymykk6hs720whabavmwnrwq7x8dkn41wma181zzy"; }; packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; meta = { @@ -1588,6 +1588,21 @@ license = lib.licenses.free; }; }) {}; + hiddenquote = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "hiddenquote"; + ename = "hiddenquote"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hiddenquote-1.1.tar"; + sha256 = "1j692ka84z6k9c3bhcn28irym5fga4d1wvhmvzvixdbfwn58ivw5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hiddenquote.html"; + license = lib.licenses.free; + }; + }) {}; highlight-escape-sequences = callPackage ({ elpaBuild , fetchurl , lib }: @@ -2358,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 = { @@ -2598,10 +2613,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.65"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.65.tar"; - sha256 = "18pqxwfmciz9d2w808mvspkcifrja85y2qjwmb6pbdnkj9dr6yad"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.1.tar"; + sha256 = "11d1gsvvj26h9d7a28v87b022vbi3syzngn1x9v1d2g55iv01x38"; }; packageRequires = [ emacs ]; meta = { @@ -2643,10 +2658,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.8.4.tar"; - sha256 = "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp"; + url = "https://elpa.gnu.org/packages/posframe-0.8.5.tar"; + sha256 = "0rls0rsj9clx4wd0gbdi5jzwyslparlf7phib649637gq6gs90ds"; }; packageRequires = [ emacs ]; meta = { @@ -2699,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"; @@ -2778,10 +2808,10 @@ elpaBuild { pname = "rcirc-color"; ename = "rcirc-color"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-color-0.4.1.el"; - sha256 = "1zs3i3xr8zbjr8hzr1r1qx7mqb2wckpn25qh9444c9as2dnh9sn9"; + url = "https://elpa.gnu.org/packages/rcirc-color-0.4.2.tar"; + sha256 = "0pa9p018kwsy44cmkli7x6cz1abxkyi26ac7w3vh99qp7x97dia3"; }; packageRequires = [ emacs ]; meta = { @@ -2994,6 +3024,21 @@ license = lib.licenses.free; }; }) {}; + repology = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "repology"; + ename = "repology"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/repology-1.1.0.tar"; + sha256 = "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/repology.html"; + license = lib.licenses.free; + }; + }) {}; rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "rich-minority"; @@ -3028,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 = { @@ -3533,10 +3578,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0"; + version = "2.5.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.tar"; - sha256 = "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.2.tar"; + sha256 = "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93"; }; packageRequires = [ emacs ]; meta = { @@ -3574,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"; @@ -3677,10 +3737,10 @@ elpaBuild { pname = "valign"; ename = "valign"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/valign-3.0.0.el"; - sha256 = "16f889x6yc1af2bmbly2lww4sy1s864ll75xdxp28i5m57gj25w8"; + url = "https://elpa.gnu.org/packages/valign-3.1.0.tar"; + sha256 = "0zx6p2nlvd4nkffj0myqv4hry8kgnhq45fcivfjzbfn62j2kp293"; }; packageRequires = [ emacs ]; meta = { @@ -4032,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/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 8b9ad33fce7..98c265894ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -20,7 +20,7 @@ instantenous and formats commits for you. */ -{ lib, stdenv, texinfo }: +{ lib, stdenv, texinfo, writeText }: self: let @@ -31,7 +31,7 @@ self: let }; elpaBuild = import ../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo; + inherit lib stdenv texinfo writeText; inherit (self) emacs; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index 5f7d602264f..ef67cdbf61a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -1,4 +1,4 @@ -{ lib, external, pkgs }: self: with self; with lib.licenses; { +{ lib, pkgs }: self: with self; with lib.licenses; { elisp-ffi = melpaBuild rec { pname = "elisp-ffi"; @@ -9,7 +9,7 @@ rev = version; sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; }; - buildInputs = [ external.libffi ]; + buildInputs = [ pkgs.libffi ]; preBuild = "make"; recipe = pkgs.writeText "recipe" '' (elisp-ffi @@ -29,15 +29,15 @@ }; }; - agda2-mode = with external; trivialBuild { + agda2-mode = trivialBuild { pname = "agda-mode"; - version = Agda.version; + version = pkgs.haskellPackages.Agda.version; phases = [ "buildPhase" "installPhase" ]; # already byte-compiled by Agda builder buildPhase = '' - agda=`${Agda}/bin/agda-mode locate` + agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate` cp `dirname $agda`/*.el* . ''; @@ -47,21 +47,21 @@ Wrapper packages that liberates init.el from `agda-mode locate` magic. Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el. ''; - homepage = Agda.meta.homepage; - license = Agda.meta.license; + homepage = pkgs.haskellPackages.Agda.meta.homepage; + license = pkgs.haskellPackages.Agda.meta.license; }; }; agda-input = self.trivialBuild { pname = "agda-input"; - inherit (external.Agda) src version; + inherit (pkgs.haskellPackages.Agda) src version; postUnpack = "mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot"; meta = { description = "Standalone package providing the agda-input method without building Agda."; - inherit (external.Agda.meta) homepage license; + inherit (pkgs.haskellPackages.Agda.meta) homepage license; }; }; @@ -74,10 +74,10 @@ ghc-mod = melpaBuild { pname = "ghc"; - version = external.ghc-mod.version; - src = external.ghc-mod.src; + version = pkgs.haskellPackages.ghc-mod.version; + src = pkgs.haskellPackages.ghc-mod.src; packageRequires = [ haskell-mode ]; - propagatedUserEnvPkgs = [ external.ghc-mod ]; + propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ]; recipe = pkgs.writeText "recipe" '' (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) ''; @@ -113,19 +113,83 @@ jam-mode = callPackage ./jam-mode { }; + llvm-mode = trivialBuild { + pname = "llvm-mode"; + inherit (pkgs.llvmPackages.llvm) src version; + + dontConfigure = true; + buildPhase = '' + cp utils/emacs/*.el . + ''; + + meta = { + inherit (pkgs.llvmPackages.llvm.meta) homepage license; + description = "Major mode for the LLVM assembler language."; + }; + }; + + 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 { }; ott-mode = self.trivialBuild { pname = "ott-mod"; - inherit (external.ott) src version; + inherit (pkgs.ott) src version; postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot"; meta = { description = "Standalone package providing ott-mode without building ott and with compiled bytecode."; - inherit (external.Agda.meta) homepage license; + inherit (pkgs.haskellPackages.Agda.meta) homepage license; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 62979b4226d..e5e2bac964f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -22,7 +22,7 @@ instantenous and formats commits for you. */ -{ lib, external, pkgs }: variant: self: +{ lib, pkgs }: variant: self: let dontConfigure = pkg: if pkg != null then pkg.override (args: { @@ -47,8 +47,13 @@ let }); }) else null; + buildWithGit = pkg: pkg.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; + }); + fix-rtags = pkg: - if pkg != null then dontConfigure (externalSrc pkg external.rtags) + if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags) else null; generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json @@ -74,9 +79,9 @@ let }; auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ]; - CFLAGS = "-I${external.llvmPackages.clang}/include"; - LDFLAGS = "-L${external.llvmPackages.clang}/lib"; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; + CFLAGS = "-I${pkgs.llvmPackages.clang}/include"; + LDFLAGS = "-L${pkgs.llvmPackages.clang}/lib"; }); # part of a larger package @@ -120,33 +125,35 @@ let packageRequires = with self; [ evil ]; }); - evil-magit = super.evil-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - eopengrok = super.eopengrok.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { - nativeBuildInputs = [ external.pkg-config ]; - buildInputs = with external; 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 @@ -155,7 +162,7 @@ let }); # Build same version as Haskell package - hindent = (externalSrc super.hindent external.hindent).overrideAttrs (attrs: { + hindent = (externalSrc super.hindent pkgs.haskellPackages.hindent).overrideAttrs (attrs: { packageRequires = [ self.haskell-mode ]; }); @@ -181,7 +188,7 @@ let dontUseCmakeBuildDir = true; doCheck = true; packageRequires = [ self.emacs ]; - nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ]; + nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.clang ]; }); # tries to write a log file to $HOME @@ -211,113 +218,81 @@ let ''; }); - magit = super.magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + evil-magit = buildWithGit super.evil-magit; - magit-find-file = super.magit-find-file.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + eopengrok = buildWithGit super.eopengrok; - magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + forge = buildWithGit super.forge; - magit-imerge = super.magit-imerge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit = buildWithGit super.magit; - magit-lfs = super.magit-lfs.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-find-file = buildWithGit super.magit-find-file; - magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-gh-pulls = buildWithGit super.magit-gh-pulls; - magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-imerge = buildWithGit super.magit-imerge; - magit-topgit = super.magit-topgit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-lfs = buildWithGit super.magit-lfs; - magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-org-todos = buildWithGit super.magit-org-todos; - magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-tbdiff = buildWithGit super.magit-tbdiff; - magit-annex = super.magit-annex.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-topgit = buildWithGit super.magit-topgit; - magit-todos = super.magit-todos.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-vcsh = buildWithGit super.magit-vcsh; - magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-gerrit = buildWithGit super.magit-gerrit; - magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-annex = buildWithGit super.magit-annex; - magithub = super.magithub.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-todos = buildWithGit super.magit-todos; - magit-svn = super.magit-svn.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-filenotify = buildWithGit super.magit-filenotify; - kubernetes = super.kubernetes.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-gitflow = buildWithGit super.magit-gitflow; - kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magithub = buildWithGit super.magithub; + + magit-svn = buildWithGit super.magit-svn; + + kubernetes = buildWithGit super.kubernetes; + + kubernetes-evil = buildWithGit super.kubernetes-evil; + + egg = buildWithGit super.egg; + + kapacitor = buildWithGit super.kapacitor; + + gerrit = buildWithGit super.gerrit; + + gerrit-download = buildWithGit super.gerrit-download; + + github-pullrequest = buildWithGit super.github-pullrequest; + + jist = buildWithGit super.jist; + + mandoku = buildWithGit super.mandoku; + + mandoku-tls = buildWithGit super.mandoku-tls; + + magit-p4 = buildWithGit super.magit-p4; + + magit-rbr = buildWithGit super.magit-rbr; + + magit-diff-flycheck = buildWithGit super.magit-diff-flycheck; + + magit-reviewboard = buildWithGit super.magit-reviewboard; + + magit-patch-changelog = buildWithGit super.magit-patch-changelog; + + magit-circleci = buildWithGit super.magit-circleci; + + magit-delta = buildWithGit super.magit-delta; + + orgit = buildWithGit super.orgit; + + orgit-forge = buildWithGit super.orgit-forge; # upstream issue: missing file header mhc = super.mhc.override { @@ -330,18 +305,36 @@ let # part of a larger package notmuch = dontConfigure super.notmuch; - rtags = dontConfigure (externalSrc super.rtags external.rtags); + rtags = dontConfigure (externalSrc super.rtags pkgs.rtags); rtags-xref = dontConfigure super.rtags; shm = super.shm.overrideAttrs (attrs: { - propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; + propagatedUserEnvPkgs = [ pkgs.haskellPackages.structured-haskell-mode ]; }); # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; - nativeBuildInputs = [ external.pkg-config ]; + 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 @@ -358,12 +351,12 @@ let treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); zmq = super.zmq.overrideAttrs (old: { @@ -372,11 +365,11 @@ let make ''; nativeBuildInputs = [ - external.autoconf - external.automake - external.pkg-config - external.libtool - (external.zeromq.override { enableDrafts = true; }) + pkgs.autoconf + pkgs.automake + pkgs.pkg-config + pkgs.libtool + (pkgs.zeromq.override { enableDrafts = true; }) ]; postInstall = '' mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-* @@ -459,13 +452,7 @@ let window-numbering = markBroken super.window-numbering; editorconfig = super.editorconfig.overrideAttrs (attrs: { - propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; - }); - - egg = super.egg.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + propagatedUserEnvPkgs = [ pkgs.editorconfig-core-c ]; }); # missing dependencies @@ -473,95 +460,8 @@ let packageRequires = with self; [ evil highlight ]; }); - kapacitor = super.kapacitor.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - gerrit = super.gerrit.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - gerrit-download = super.gerrit-download.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - helm-rtags = fix-rtags super.helm-rtags; - jist = super.jist.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - mandoku = super.mandoku.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - magit-p4 = super.magit-p4.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - magit-rbr = super.magit-rbr.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - magit-circleci = super.magit-circleci.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - - orgit = - (super.orgit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - })); - - orgit-forge = super.orgit-forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); - # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { HOME = "/tmp"; @@ -570,7 +470,7 @@ let racer = super.racer.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' substituteInPlace racer.el \ - --replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc} + --replace /usr/local/src/rust/src ${pkgs.rustPlatform.rustcSrc} ''; }); @@ -599,7 +499,7 @@ let w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = - let w3m = "${lib.getBin external.w3m}/bin/w3m"; in + let w3m = "${lib.getBin pkgs.w3m}/bin/w3m"; in '' substituteInPlace w3m.el \ --replace 'defcustom w3m-command nil' \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix index 7adb58c8bd7..0308f8d976b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210111"; + version = "20210301"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210111.tar"; - sha256 = "1hn3i583h3idmiv1plbp0p6qi3myl317vl43qyxjks2nvqfj5313"; + 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 = "20210111"; + version = "20210301"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210111.tar"; - sha256 = "1qw44y4v4vg0vhz1i55x4fjiaxfaqcch0mqm98sc5f31fw3r4zga"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210301.tar"; + sha256 = "11mwar5x848iwc1cdssr3vyx0amji840x6f0dmjpigngpcnj02m8"; }; packageRequires = []; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 5dcb01dcefa..a5707370ce0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/infra/libkookie/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", @@ -241,11 +264,11 @@ "repo": "afroisalreadyinu/abl-mode", "unstable": { "version": [ - 20190403, - 904 + 20210122, + 1508 ], - "commit": "44b7d946bc3a693f5a931c4a62c0a67d42e8d4dc", - "sha256": "070c408bq5pliq0xbd1861l6db4sbfpnj3r6aknbqh2vb7l4yimb" + "commit": "fdd83e732b2c870f4ddc0f62b5b261e03bfb212a", + "sha256": "1ny3386n5h3s3lg9235vj17vwsx6n1y99kln6vgqy6kk37q0ig42" } }, { @@ -1006,22 +1029,22 @@ "auto-complete", "yasnippet" ], - "commit": "7d97ecc07e6b4ac772670e26583f11e77fdc69fd", - "sha256": "00jdn4dw975bb6fgf7wyxjbmvs31p8bav376d017kk56q9w6mv1f" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" }, "stable": { "version": [ 2, - 3, - 1 + 4, + 0 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "1477a463e7b2fadf2542d9563b28424481d19bf3", - "sha256": "04163qnz5kq3cwmkm5yfvahq8d8ybmchlimzdp15p1izhfpvxnfn" + "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", + "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" } }, { @@ -1032,8 +1055,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20201015, - 903 + 20210218, + 559 ], "deps": [ "dash", @@ -1043,14 +1066,14 @@ "s", "xcscope" ], - "commit": "7d97ecc07e6b4ac772670e26583f11e77fdc69fd", - "sha256": "00jdn4dw975bb6fgf7wyxjbmvs31p8bav376d017kk56q9w6mv1f" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" }, "stable": { "version": [ 2, - 3, - 1 + 4, + 0 ], "deps": [ "dash", @@ -1060,8 +1083,8 @@ "s", "xcscope" ], - "commit": "1477a463e7b2fadf2542d9563b28424481d19bf3", - "sha256": "04163qnz5kq3cwmkm5yfvahq8d8ybmchlimzdp15p1izhfpvxnfn" + "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", + "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" } }, { @@ -1110,8 +1133,8 @@ "auto-complete", "rtags" ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -1401,14 +1424,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200518, - 957 + 20210121, + 923 ], "deps": [ "avy" ], - "commit": "298f02f7dd117f9ec01f6aa2a2ddfecae0efb7f4", - "sha256": "1i243wfwrbxn00sh96248lpqfb7cvxqqwlc78nf8kim4ymylpp41" + "commit": "e1b1c91b280d85fce2194fea861a9ae29e8b03dd", + "sha256": "190m4ikm9580gmd0yf9k7a7q9l7087zdm9gm1hv12wg8g8g6pzca" }, "stable": { "version": [ @@ -1755,6 +1778,30 @@ "sha256": "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6" } }, + { + "ename": "ado-mode", + "commit": "337f21eb8f4af233b4c0bc658cd82e8479b49aaa", + "sha256": "1gybsnj7s21vm1iakz4hy5d6skzcfi6455wnikv9dpwy1069rw32", + "fetcher": "github", + "repo": "louabill/ado-mode", + "unstable": { + "version": [ + 20210219, + 1548 + ], + "commit": "438e2b9ca1ce9fd1043998359dfe5a32a0ddb6d0", + "sha256": "1fpk7lc5z9v8an9x8j1v3l2pkbg93368qv23jzsqs84r3ndw5b7k" + }, + "stable": { + "version": [ + 16, + 1, + 4 + ], + "commit": "29d56532c7ab6f680c596add31fd80cd79186e89", + "sha256": "1hvxxjwbxw8ivj5399f745l3gcrgf2j0qpbli50pxz0h91pcvi5p" + } + }, { "ename": "adoc-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -1864,25 +1911,25 @@ "repo": "agda/agda", "unstable": { "version": [ - 20200922, - 1231 + 20210220, + 2039 ], "deps": [ "annotation", "eri" ], - "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", - "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" + "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", + "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" }, "stable": { "version": [ 2, 6, 1, - 1 + 3 ], - "commit": "fce01db8f9d2ceb9c3a4aa179330ea4aa7587a71", - "sha256": "0fzq9pfkvsdin04vzcz2vyjq3gx0lfhbpwpz0zyfa3b84dgffxq7" + "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", + "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" } }, { @@ -2331,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210114, - 1520 + 20210228, + 1440 ], - "commit": "ed978fa64fdefc817e8b1b826c87e8928a26f2ce", - "sha256": "0l5jc0f5q5p4i2c5s6vrryxkc0fapxffz8x1yvk32j151rz932rc" + "commit": "e685f7bc0808e23717637536ccffd79a40f0512d", + "sha256": "1gbpl6yxb08jlawy4a98bl6ap888f5lx451fvd80z19gjabiad7f" }, "stable": { "version": [ @@ -2352,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" } }, { @@ -2395,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": [ @@ -2457,15 +2504,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20201215, - 1647 + 20210126, + 1227 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "6eb63a158cd5e1b47635704ebdd3e010e7b914f8", - "sha256": "1xvcgylx2h9mrpm56icqsflyxvy88mprgxrs6byhkvkm3p7jzin2" + "commit": "f2b48400b2da0bbf64e9c749fa4a5d332ab7c91f", + "sha256": "1pdxz8arkhjc3sgg13s07fxlxxgq5y6amapg6daxafl1yvh99jrb" }, "stable": { "version": [ @@ -2492,8 +2539,8 @@ 20200211, 2126 ], - "commit": "2f5935a1a9d042751c7135cac79875886edb2556", - "sha256": "1q1ry37rcpzwwl2bwf3j8nmhap7v72fg0hdzxlls89gm3jl3nb97" + "commit": "0b804c3ce21b9045d9b3093ef066d8269ac93990", + "sha256": "0bp38fwrgw5hr8vyn9shy1am2d224nbyjymdar6i2gh191y43rpm" } }, { @@ -2737,14 +2784,14 @@ }, { "ename": "anaconda-mode", - "commit": "c756ccbae044bc23131060355532261aa9a12409", - "sha256": "1cr4qyk2brm1kvm7i9cmvihid8799df7yhmmdizv3sj5l6qnsyfr", + "commit": "83b7dcc75e35d9527bce39c5dca3ade0b68ddeb7", + "sha256": "1p1bik1fh50hf6ylbhlszzwdah7gp3ay93j4a0xz49cksd1a4ksq", "fetcher": "github", "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20210101, - 833 + 20210210, + 852 ], "deps": [ "dash", @@ -2752,8 +2799,8 @@ "pythonic", "s" ], - "commit": "80afec20f91f13614647b192522fff460505db6f", - "sha256": "04f6kw4rd8k6waiyfbk7x8qdrqm411mdsdzjh2w9rvmv7y36ckh8" + "commit": "081f9d8f92f5b85b4f4ac01af7ee72582e689ce1", + "sha256": "01z4npw03rkpjl0gmxgryvpkndwn43bgmda398dyzfv00pl5cdar" }, "stable": { "version": [ @@ -2779,15 +2826,11 @@ "repo": "didibus/anakondo", "unstable": { "version": [ - 20200503, - 123 - ], - "deps": [ - "clojure-mode", - "projectile" + 20210221, + 1727 ], - "commit": "ba6b56c18f2b0ae035b448813b27114d19fb821c", - "sha256": "0dbhkinfn6ahvi9pi7kghlc0fccil15lx0pd1rpgv4d7n3bnsdna" + "commit": "c48518560815c49d8d78fb9069906d17e883385e", + "sha256": "1fzsqd150gpmrj8kz3zy9cd78x9vank7ra720mljhyf04z0h1mj6" }, "stable": { "version": [ @@ -3061,11 +3104,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210108, - 1828 + 20210211, + 1931 ], - "commit": "d4eff870d9c1575731890acfdde89511d0322ec1", - "sha256": "11k5j7xgnxq4s5ar56f3qmbr8vnrhi231zv0iiv2p0nqryaaj354" + "commit": "3e0d5f39b24eeded849c1c4903f9a75976732d2b", + "sha256": "1l1xmb12qfs0rvgvqqnbjn0njdgxiprxx6fd0vzinlpfdfk1f39j" }, "stable": { "version": [ @@ -3103,18 +3146,18 @@ 20200914, 644 ], - "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", - "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" + "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", + "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" }, "stable": { "version": [ 2, 6, 1, - 1 + 3 ], - "commit": "fce01db8f9d2ceb9c3a4aa179330ea4aa7587a71", - "sha256": "0fzq9pfkvsdin04vzcz2vyjq3gx0lfhbpwpz0zyfa3b84dgffxq7" + "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", + "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" } }, { @@ -3555,11 +3598,19 @@ "repo": "emacsorphanage/applescript-mode", "unstable": { "version": [ - 20090321, - 632 + 20210223, + 1539 + ], + "commit": "a45c426b7e4a450faea004ef5b842fd37e17a7c6", + "sha256": "1f7bvcv4qqqa5bsfrcs69yc1phgnyrh5mbnb2hhgq72z8ymmrn7q" + }, + "stable": { + "version": [ + 0, + 1 ], - "commit": "8f888cd80af1e0902b5609143facd3051bc94892", - "sha256": "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg" + "commit": "42b3db3838821f240e05752de4337359d25d8c04", + "sha256": "1z0z0pxy5f5lsw4pskk77dfql5s89iqb6zzkm4pr5r5pcqbhla1s" } }, { @@ -3639,8 +3690,8 @@ "let-alist", "request" ], - "commit": "5fe8b035b2b6bc165728444bb8e9792d14b7409d", - "sha256": "1wbpjz5jgpph6c6wk29dxz8r368ai6jx9cb4y2mdcpngig8kmazm" + "commit": "c107a2e21cd1ac6008d8baaeeedb3fab26583d45", + "sha256": "19xrm4nwwsf86ysqnqx7jfl78gbg66jj4yfw3h99y3nd82j2rdws" } }, { @@ -3724,11 +3775,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20201001, - 1357 + 20210119, + 1200 ], - "commit": "00893089344cfeef387e6da1844fa49d14ff4fa9", - "sha256": "1p37c18ax1nki5175xz2c75pjbsg5wsd3m6qaln9x0mj5hdgz860" + "commit": "10d5cfa1563f314e5b24b151f63b9579992a7ba5", + "sha256": "0czbp56jg40y33p05l1wvrinjiz795zjk4gyxyvjbra11a8byf84" } }, { @@ -3739,14 +3790,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20201231, - 214 + 20210216, + 926 ], "deps": [ "spinner" ], - "commit": "10af99792c8e4b97ea542c55bfed246781fdd1ba", - "sha256": "1gz4hmmijlilqqh7scyidh5kbbmyvq12dhnjgnn9h6y9q5qabibq" + "commit": "969b49ef6c954a067b3cbca43a4cdc1c04b1a62a", + "sha256": "0cjygkddlla2ygiyn506mwqjfn52lqpwfbv1fbwcqljvfspc65am" } }, { @@ -3980,11 +4031,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20200809, - 501 + 20210117, + 718 ], - "commit": "14f48de586b0977e3470f053b810d77b07ea427a", - "sha256": "16m67s2mpr2ak7vyc3dxzln3v5136b85dsirjkd2fm2n934q9h0r" + "commit": "d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da", + "sha256": "11r6jzqyywgzxmpq2z97j3ni5b1sv6z5lrjmkqip396bxmw9zxm1" }, "stable": { "version": [ @@ -4130,11 +4181,11 @@ "repo": "jonathanchu/atom-one-dark-theme", "unstable": { "version": [ - 20200831, - 342 + 20210128, + 1640 ], - "commit": "321739d50b8a3b9152972134e83e69a67e12ee81", - "sha256": "0a6lx2pav0a0k6lfq8ar03z33dis29diq1gvxfdqwa3sayn6fbab" + "commit": "b34b62e85593812b55ee552a1cb0eecfb04767bb", + "sha256": "1n98fxspx1qmm5p5s591jy2baviqy8b5hjn9hsrvqbmixc7arrhv" }, "stable": { "version": [ @@ -4154,15 +4205,15 @@ "repo": "alpha22jp/atomic-chrome", "unstable": { "version": [ - 20180617, - 724 + 20210221, + 59 ], "deps": [ "let-alist", "websocket" ], - "commit": "a505f638866f9e7b913784be0dc84f338e9ad449", - "sha256": "081465ahis2rvlklzn2vakbwn5dgr43ks4csp3arnlj11b43f3ai" + "commit": "d0414210c8eea8b80d293e79f2c8991948ab38cb", + "sha256": "1h4zf81gizi5qf86zxdsm9v0l2rvbsmw6fbr92ggw2r55cnqqrib" }, "stable": { "version": [ @@ -4186,8 +4237,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20200908, - 1252 + 20210219, + 1001 ], "deps": [ "dash", @@ -4195,8 +4246,8 @@ "flycheck", "s" ], - "commit": "9c881548debcf59b8aadda0ef4abca3c9a68dd80", - "sha256": "01x2nwqzrnngvmw6zynh6xhfg3jx7l22mv3gndi5xzxqngqh137s" + "commit": "778382eba8e1a449862b1573e90c1e79cf5caeb1", + "sha256": "0a2n1p2nasd2ikv86p3sm5sn4qb3avj2sni9gja3yn6kdqn8s8jp" }, "stable": { "version": [ @@ -4221,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" } }, { @@ -4370,11 +4421,11 @@ "repo": "DamienCassou/auth-source-pass", "unstable": { "version": [ - 20201108, - 1043 + 20210210, + 1908 ], - "commit": "aa7f17116ec3f760eb414d655ba20016b11a4a0e", - "sha256": "08q1dicdj4fgmn47mslinrl7wfnpix98xdwvhz78cvqhclb1662s" + "commit": "468bba286fc20d739ed7724ec884357907ac8bda", + "sha256": "1pazl19rd4fvnfi9i2ssaygby5pw2a821aysy8jswsij57lw40dy" }, "stable": { "version": [ @@ -4457,8 +4508,8 @@ "deps": [ "packed" ], - "commit": "f8619d1616b523918323914ec77bfbee2c559781", - "sha256": "1qcszjjqkq811p8pafjx0knm4giv7dls4x1xamhzbndjz0d022kz" + "commit": "4952a1a1cadf1bdf7018610a71f8c3acb67962c2", + "sha256": "17p7jmr8qd3hgx79iiljsi2kpy24g8v2ynxiz023wanasxr6bdc6" }, "stable": { "version": [ @@ -4488,8 +4539,8 @@ "cl-lib", "popup" ], - "commit": "6bbb6c7ab8e5aa2d389807fce65bbc5ce7065900", - "sha256": "0cxs9is3ifn9grqaw50dvpsjkkmwh398a6lqc93fny7p6d1hd9ja" + "commit": "aafd3f566a8002a1e9b3e197721a2660c0a835ff", + "sha256": "0ipa5kaprisrmyyqlgzi5giq0449hjflfm81i9a5vy82ikz5lsxg" }, "stable": { "version": [ @@ -4795,11 +4846,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20200801, - 2029 + 20210210, + 1744 ], - "commit": "cad370fb6c9fc7186c2af221932e097af5900a2d", - "sha256": "0hjxadi8245zwwsp0kdz0c6i1j25drbky5cvksdnc8xw2l91kpbs" + "commit": "62c936d502f35d168b9e59a66c994d74a62ad2cf", + "sha256": "07ilprnidpg8wn28h8ra9ml6pxaixg734ybya0gj1ac6sc3ky52s" } }, { @@ -4894,14 +4945,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20200826, - 2227 + 20210211, + 2036 ], "deps": [ "dash" ], - "commit": "c0df65ac9845ba2c7c9f53bbdbe013f1024f96f9", - "sha256": "0fy45psfsfsfrailiqv86bxsb3vxb36wyf7farb0zaxlrqay8qvd" + "commit": "22130fb17d00d79497253c94f3e88382cb40c3ac", + "sha256": "1z0yfhg44zsra1c29w05fa6gkqidmwjaszxvjhkx4n3mzy3vhqf2" }, "stable": { "version": [ @@ -5259,8 +5310,8 @@ 20190331, 2230 ], - "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", - "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" + "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", + "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" } }, { @@ -5396,15 +5447,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210112, - 2334 + 20210125, + 2115 ], "deps": [ "avy", "embark" ], - "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", - "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" + "commit": "0c7323953e628c8797270a37c0f639fe23092175", + "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" + }, + "stable": { + "version": [ + 0, + 10 + ], + "deps": [ + "avy", + "embark" + ], + "commit": "47daded610b245caf01a97d74c940aff91fe14e2", + "sha256": "063hc0hganws11vjdk3ic0mxm9i0vpw6s7hzbgxvja0gjkdxjldz" } }, { @@ -5602,11 +5665,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20201212, - 1109 + 20210131, + 2053 ], - "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", - "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" + "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", + "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" } }, { @@ -5977,11 +6040,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20200929, - 2159 + 20210206, + 1822 ], - "commit": "93b1513a9994355492314e809cdbfb0d21f1e30d", - "sha256": "0sw483bzm5ax07cyvjbm6qaji5m0xw4mzcgrxi5ki81i0y79x59q" + "commit": "041e442b6ab2b85a254e17bfc776a508e1b66abf", + "sha256": "1rcw4jsla3fhrb6b5margiwk2i2m0rrf3vp8lxk8vdg9bsy5ikmc" }, "stable": { "version": [ @@ -6129,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" } }, { @@ -6157,8 +6219,8 @@ 20200627, 1625 ], - "commit": "2cf143b616df3de4b199538341d674c58386719e", - "sha256": "1p9pxxdx39jmf8sav660ps6mqwbsgcl4v1i9xb8xsd5qdxmwjqli" + "commit": "43026c5e09dfca86fb84b9a857708ad419f2215f", + "sha256": "0bwabpx56ybk114456x0p4k8xqh0s060ig40jdsqibq89h6m1nab" }, "stable": { "version": [ @@ -6597,17 +6659,17 @@ }, { "ename": "better-defaults", - "commit": "7bb729c1ad8602a5c0c27e81c9442981a54a924a", - "sha256": "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm", - "fetcher": "github", - "repo": "technomancy/better-defaults", + "commit": "8bec8e696afde1b89502f312efc0054ca59502a6", + "sha256": "0vl6ivjjg4sy67ma18ya64r4wn64z2kqbxaa435s9ayszmbpmpa2", + "fetcher": "git", + "url": "https://git.sr.ht/~technomancy/better-defaults", "unstable": { "version": [ - 20200717, - 2012 + 20210222, + 1928 ], - "commit": "293237a22a4f24171dd9910d6517a0eccf526fdf", - "sha256": "0f3alik361d81kdwpigcgkj9rxww23prqfhjfdh97fnycp3r1nyb" + "commit": "4c5409406ee35c5ba46880c6cfe98df4b14dc631", + "sha256": "0agj1zyspm3bqj7apfjwhllnmydyj00x2iv7nvy03szpnwvm11fq" }, "stable": { "version": [ @@ -6705,14 +6767,14 @@ "repo": "zk-phi/bfbuilder", "unstable": { "version": [ - 20200816, - 519 + 20210228, + 1740 ], "deps": [ "cl-lib" ], - "commit": "00cbf1010dc3fee5a0b8e7c0e0b6041bb6251bdf", - "sha256": "1n1aq3kwsjc3hlgas73bs22pvrn69hfba1wcbqs2j28j2j9j00b2" + "commit": "689f320a9a1326cdeff43b8538e0d739f8519c4b", + "sha256": "0wrzyv38dmsdfjwsbf89pa5l2gzbbx86jmy8nflfs86im0g9qcp1" } }, { @@ -6889,8 +6951,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20210108, - 1155 + 20210223, + 840 ], "deps": [ "biblio", @@ -6900,8 +6962,8 @@ "parsebib", "s" ], - "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", - "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" + "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", + "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" }, "stable": { "version": [ @@ -7027,8 +7089,8 @@ "bind-key", "key-chord" ], - "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", - "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" + "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", + "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" }, "stable": { "version": [ @@ -7052,11 +7114,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20200805, - 1727 + 20210210, + 1609 ], - "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", - "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" + "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", + "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" }, "stable": { "version": [ @@ -7100,26 +7162,26 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20201222, - 1603 + 20210131, + 1227 ], "deps": [ "seq" ], - "commit": "8a10a66116797e132b19f57026a1976753d332e9", - "sha256": "0qjrcvmmhirzw08r81jnxl79kmgiwwhjnvif16amkf1l8r8qiawq" + "commit": "9cec78c685dbca51ab9d1014eb535a541083effc", + "sha256": "065cqvdjdb5w60b7ga7q51920ib5vpz63zq9s68q0fjwb55q3k8z" }, "stable": { "version": [ 0, 4, - 3 + 4 ], "deps": [ "seq" ], - "commit": "8d479f1ad0573008e7f60dad2f6549c7d2f96598", - "sha256": "1wfbm3z4irgh22lrfkdf05y9y3ayl1jcmf2iqgncrj12j5a5jwa7" + "commit": "3cf7c254703f5c3a90c2cd617b522d09e7913c7b", + "sha256": "01y9yd1rvi1ll3pp2i44g7ivkvz1cvc22207f8a3dbv90jw4c66m" } }, { @@ -7482,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", @@ -7675,8 +7761,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20201108, - 230 + 20210131, + 8 ], "deps": [ "cl-lib", @@ -7685,8 +7771,8 @@ "flycheck", "yasnippet" ], - "commit": "462acddf8012c896a510f539fa3d16eb3c4dc71b", - "sha256": "0lz39j1alzzchfz67xp70cj1z6ckapdyqbl2gnax8xqyw7f3816f" + "commit": "8e906c41725bada06ff6e296af65cc463b028ea9", + "sha256": "1cf94hw1b50qkzjc88gxi5qhpf3pkaj2w3glr8dldnh0l5z8vfxg" } }, { @@ -7721,16 +7807,17 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20201118, - 1521 + 20210228, + 1839 ], "deps": [ "dash", "expand-region", - "multiple-cursors" + "multiple-cursors", + "pcre2el" ], - "commit": "3dd9669d01e48860bb7ea12be8c764a4bc6808ea", - "sha256": "0j5v2mm6gd463x6jcbp5ly71g2qaiajrbc3ina2rzbmj0ccqr39l" + "commit": "58107055dadb735941537c90457753dbc1ea7005", + "sha256": "15x29jpfkfizkl3b9ghmd1wclvigcm05y6l7i9c6clclwqzzm5zw" }, "stable": { "version": [ @@ -7761,8 +7848,8 @@ "epkg", "magit" ], - "commit": "5de2a7aa0c126f5b18506e187bca66079e68f51d", - "sha256": "18d845xpfp1dklqqghxxzy6zglm8w11lyi3ww44yfmrmxgi8xsvd" + "commit": "d0283edfaead36564ba4e64dcf8785f6d65f288c", + "sha256": "076n6jh084f6pra12cbl3fp1gv3229rj5nxbpcmr9rpp50x2c790" }, "stable": { "version": [ @@ -8104,11 +8191,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20200415, - 602 + 20210226, + 1538 ], - "commit": "ee63563b7cb07aeec342722ae684426cb0465a98", - "sha256": "1wx6771iv4psvlwhng0n09g0w3yml1pw3ga5lghjz9j6hba0bc6s" + "commit": "8173b7d041cccfa3e5bb3f3f85ec8c6109fd264b", + "sha256": "1y6b9q3byvwsi6d5sjc642189c5cjbinylqis3d248qws2dp6kvq" } }, { @@ -8953,6 +9040,30 @@ "sha256": "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx" } }, + { + "ename": "ca65-mode", + "commit": "e479ed85d361e3439fb69e4b0cc0f0fd608f9c7a", + "sha256": "04s9z3brwc1zr5v2h7p1d129jg44j00x3qdd9md2cwiaxbr4c3ns", + "fetcher": "github", + "repo": "wendelscardua/ca65-mode", + "unstable": { + "version": [ + 20210218, + 106 + ], + "commit": "590d90cc0e1c1864dd7ce03df99b741ba866d52a", + "sha256": "0snmxnhi7g5qx7p1z9zzlpc2zd20iq94hfvf2vavjpxw1fz4sk46" + }, + "stable": { + "version": [ + 0, + 3, + 3 + ], + "commit": "590d90cc0e1c1864dd7ce03df99b741ba866d52a", + "sha256": "0snmxnhi7g5qx7p1z9zzlpc2zd20iq94hfvf2vavjpxw1fz4sk46" + } + }, { "ename": "cabledolphin", "commit": "0c8bd2715aec4793abc37d6899adabd568955a08", @@ -9113,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" } }, { @@ -9491,15 +9601,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210103, - 2111 + 20210217, + 904 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "9c7d885562c7d5935ec2e97585acf95813a084be", - "sha256": "0j1ls97m4rc9mkjp57k4ba1ljvzlhmpn31z7drkqhx9yff0q0fan" + "commit": "9442af81d64f73935d3590948c97594f0bc79d4a", + "sha256": "1xci8kx10vxaniyzxgzzs0zd7m7s0grd0bbrxaxhyjjdvic77mq1" }, "stable": { "version": [ @@ -9529,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", @@ -9571,8 +9696,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20201206, - 1419 + 20210214, + 1455 ], "deps": [ "ansi", @@ -9584,8 +9709,8 @@ "s", "shut-up" ], - "commit": "b0afdf94c0a2424db86b264bcac175b75c4395b3", - "sha256": "0hjc2pig7chhvb94qyccmnndy16xlyzwq37x4pm2s44yl1vra02k" + "commit": "b81a3caa3fa3696fd385aa7072f8dc3a57408c4a", + "sha256": "18w7kdr140s2km0mphznrlvx5w06q93q6z370wf4spkaflks6cjy" }, "stable": { "version": [ @@ -9967,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": [ @@ -10102,8 +10227,8 @@ 20171115, 2108 ], - "commit": "a1f30acc05097d9def5925e8b48de3df4237610b", - "sha256": "18ixkfz41wa3h4041rlj6zxg30m3afhn1vfvcf6dz2vnj1z22h2z" + "commit": "79e9fb4d4b2b630f11d09c25fa560a0aacd68e53", + "sha256": "05ysyvb318ilwamx9v82rv6wrh1xnv74i4flpm4x6db7apkh4kma" }, "stable": { "version": [ @@ -10187,30 +10312,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20210108, - 1152 + 20210217, + 1848 ], "deps": [ "dash", "posframe", "s" ], - "commit": "d4cee9074b31b283b1475bfc8fe3c63ab51dbb61", - "sha256": "122gls0zwxl3km5h0gw5ykccxxdfy8svvr7s7lm78ylmp6prpx2p" + "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298", + "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm" }, "stable": { "version": [ 1, 5, - 1 + 4 ], "deps": [ "dash", "posframe", "s" ], - "commit": "f47e9b7b96172023cbc0e3aaeb62462829d3134d", - "sha256": "1sia4dnp2jfjx2npklgg9yhdgs5vzjxvyk6nj0z1fvpqxfdkg60m" + "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298", + "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm" } }, { @@ -10236,11 +10361,11 @@ "repo": "challenger-deep-theme/emacs", "unstable": { "version": [ - 20201214, - 1705 + 20210120, + 941 ], - "commit": "b0d5f103db8ee846580617cc3a2f44f89edd5a6d", - "sha256": "03k4bvidvhcfqvk3hqni546pfz6lb8jwhxynsyacq1vcmvx1j8xw" + "commit": "2a799259406a8b96a688873093ffab6630a3ad3b", + "sha256": "1rl3rkrbms96wv51mwxih9b4zg1dzh3jcmx4ylgamg77abd03sg3" } }, { @@ -10251,14 +10376,14 @@ "repo": "magnars/change-inner.el", "unstable": { "version": [ - 20150707, - 1544 + 20210126, + 1456 ], "deps": [ "expand-region" ], - "commit": "52c543a4b9808c0d15b565fcdf646c9779de33e8", - "sha256": "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z" + "commit": "42cad58aed2caec260f8e8ff61f78a7d3db72d1b", + "sha256": "0hs5hw36yagchpihx18059gi8b85hrccm82ynh89y7dkk1pw3wy1" } }, { @@ -10518,21 +10643,6 @@ "sha256": "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd" } }, - { - "ename": "chicken-scheme", - "commit": "03f4992471185bf41720ff6fc725fd5fa1291a41", - "sha256": "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr", - "fetcher": "github", - "repo": "dleslie/chicken-scheme.el", - "unstable": { - "version": [ - 20141116, - 1939 - ], - "commit": "19b0b08b5592063e852cae094b394c7d1f923639", - "sha256": "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5" - } - }, { "ename": "chinese-conv", "commit": "a798158829f8fd84dd3e5e3ec5987d98ff54e641", @@ -10638,14 +10748,14 @@ "repo": "SavchenkoValeriy/emacs-chocolate-theme", "unstable": { "version": [ - 20191021, - 1346 + 20210128, + 1647 ], "deps": [ "autothemer" ], - "commit": "1c6cd8d2fdc939bd4d26117d61e57c11cfe26512", - "sha256": "1knnj1kzjccr7hg5zbj4qfnkgjkf221bf7wv83km9hs7zs7brj5x" + "commit": "ccc05f7ad96d3d1332727689bf6250443adc7ec0", + "sha256": "1d8a9jwv9y0sncw24k840c8yyrig30f2d6q2zqlc09f05yzq9p9p" } }, { @@ -10700,8 +10810,8 @@ "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20210106, - 2147 + 20210211, + 601 ], "deps": [ "anaphora", @@ -10710,14 +10820,14 @@ "seq", "ts" ], - "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", - "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" + "commit": "d1b42bbf0d134ee6ed6f423956a355ba0a7ac968", + "sha256": "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f" }, "stable": { "version": [ 0, 6, - 2 + 5 ], "deps": [ "anaphora", @@ -10726,8 +10836,8 @@ "seq", "ts" ], - "commit": "cef185de5ce47236c6ba70a7613f7aa51365e5ec", - "sha256": "10jc1xw3rz18h1an8psbmrp9a1y11xcf53j0hi7vvch85w75hfc6" + "commit": "d1b42bbf0d134ee6ed6f423956a355ba0a7ac968", + "sha256": "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f" } }, { @@ -10818,8 +10928,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210104, - 915 + 20210227, + 546 ], "deps": [ "clojure-mode", @@ -10830,8 +10940,8 @@ "sesman", "spinner" ], - "commit": "3fac28541e03812990c771bd774bf8ea65c228c9", - "sha256": "1216nws4mcvmrlkdvpb83slqqwkqiwdyw0fxp2b1nkm2lmrcq7bs" + "commit": "ae03e85a0adcd301d220e7a500aec4d5a26fbfc7", + "sha256": "0lv422m1ym6m894mbwcbv1145dnh6xk1fa242cngvlkg7j5xksh6" }, "stable": { "version": [ @@ -11082,14 +11192,14 @@ "repo": "sulami/circleci-api.el", "unstable": { "version": [ - 20201221, - 1036 + 20210227, + 1607 ], "deps": [ "request" ], - "commit": "870d6b550210cb1fd97a8dabad2c284e54416b4b", - "sha256": "0ph12r4lfy653qbp00hbry06n0gddfm3c7kmqp2v3c03bdsn5l9c" + "commit": "2e39c5896819bb2063f9d7795c4299f419cf5542", + "sha256": "0j184sgqxh3f34ni6bfb69mfir94glcyl0wpqmpsn9siq54s82ag" } }, { @@ -11424,14 +11534,14 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20190920, - 149 + 20210129, + 313 ], "deps": [ "ivy" ], - "commit": "3105e5c4b4d2d0338edb6effd9329426854b80b1", - "sha256": "0jbn2nczhsv9adhkc6mnrmxyjbpkbqq475gry0khhqlmzm49y618" + "commit": "3682a114e7651fc53155451afef0026f25f01f64", + "sha256": "08ih6n6xmnv179z8lfvplgss3xvl9bxppcbj1qiqbvgnf2rqfpb3" }, "stable": { "version": [ @@ -11529,8 +11639,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210101, - 1036 + 20210216, + 928 ], "deps": [ "cider", @@ -11543,14 +11653,14 @@ "seq", "yasnippet" ], - "commit": "9dcc50da7ce6f3c10276c87f09022e80c03e8bef", - "sha256": "10b83yyhkppgzjxaqk8l1c2476x8cvnpn6vf1gj2v5y23c7s2mbs" + "commit": "b24ce76acefe792975f00147c94b4dd784e65b80", + "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7" }, "stable": { "version": [ 2, 5, - 0 + 1 ], "deps": [ "cider", @@ -11563,8 +11673,8 @@ "seq", "yasnippet" ], - "commit": "92d372393a031e5fa73ef926447afe72b574cb45", - "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" + "commit": "b24ce76acefe792975f00147c94b4dd784e65b80", + "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7" } }, { @@ -11791,11 +11901,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20201126, - 1558 + 20210226, + 1336 ], - "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b", - "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m" + "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63", + "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by" }, "stable": { "version": [ @@ -11821,8 +11931,8 @@ "deps": [ "clojure-mode" ], - "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b", - "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m" + "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63", + "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by" }, "stable": { "version": [ @@ -11947,8 +12057,8 @@ "deps": [ "emacsql-sqlite" ], - "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", - "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" + "commit": "1d5e9cbb69bc2992eaafa1bc084343efbd3e0c4c", + "sha256": "1s3pb8zn3ypc2pvkp7g7wvml02m06lk9d7c29pq1yqn9f5sisrcg" }, "stable": { "version": [ @@ -12124,17 +12234,19 @@ 20210104, 1831 ], - "commit": "e6b6e457a0e8d33402bc7d64d85b20a8ca0546a0", - "sha256": "1p5vd3dmp7q0nw5px2gplrrdi6zgd3qlvmc3ql7xclgaxbp0zrs2" + "commit": "569547f0c4931c1ce163146d95375ead258c09d9", + "sha256": "02iwd0yrz9b9aw2v5vvqf43cscch85wgia386bkp4xaq2dd9h31s" }, "stable": { "version": [ 3, - 19, - 3 + 20, + 0, + -1, + 2 ], - "commit": "19ff734e76a35d59eb0f973197cadb1c271c766c", - "sha256": "0yzwnb1vikbhqzrqq6ngzqv45dcngajjc3b2f4cc002ry3bnn1mv" + "commit": "498b7da2e471fd8ef5a41433505358df4f117044", + "sha256": "1j7sray4d5zpfy6mkmhxg83scwjvkvr5q98nlaxsi01nir1ywxla" } }, { @@ -12278,6 +12390,21 @@ "sha256": "0s0zakrmbx9gr7ippnyqngc09xj9f7bsv0mv11p062a8pkilg219" } }, + { + "ename": "code-cells", + "commit": "75600cc888a717d300c6ca05b629fa7acba9390b", + "sha256": "1z8cf6bkpv21r42d10kvih5pb31k0iw4r18i8l96wfizad8bva93", + "fetcher": "github", + "repo": "astoff/code-cells.el", + "unstable": { + "version": [ + 20210111, + 744 + ], + "commit": "d03621b1033cc33054e30169517c57d020c13050", + "sha256": "0c2agyg28lqsmkkjcnhx8wdn531lh0zsy37q939wf231lpl4asvj" + } + }, { "ename": "code-library", "commit": "197bdc508c4fd9712125553a108ca6c9fedcaefc", @@ -13078,11 +13205,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210114, - 35 + 20210224, + 2244 ], - "commit": "288a7617c4c3e5f22a887a17a697ac2bfe4e567d", - "sha256": "1h5wkgv7gny7dp01mq35fj9g18v62813gx6qvw7812rypaj068yw" + "commit": "88001d794d963049339883216b6606de0a1209ea", + "sha256": "097s1zan4xg7vrkcapylcbs0a9ky1wbglxf9sz44aslwzrsgvy1p" }, "stable": { "version": [ @@ -13220,8 +13347,8 @@ "axiom-environment", "company" ], - "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", - "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" + "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", + "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" } }, { @@ -13599,62 +13726,30 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20201119, - 315 + 20210123, + 1814 ], "deps": [ "company", + "ht", "s" ], - "commit": "ae004dc234b2cd2e4a0fd8a35aa8c966a15074c7", - "sha256": "1073hf1ximvhaf5vaxmz5arfph51ywqld52fkwjna6bf2djmchrf" + "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", + "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" }, "stable": { "version": [ 1, - 0, + 2, 1 ], "deps": [ "company", + "ht", "s" ], - "commit": "ae004dc234b2cd2e4a0fd8a35aa8c966a15074c7", - "sha256": "1073hf1ximvhaf5vaxmz5arfph51ywqld52fkwjna6bf2djmchrf" - } - }, - { - "ename": "company-ghc", - "commit": "28f6a983444f796c81df7e5ee94d74c480b21298", - "sha256": "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn", - "fetcher": "github", - "repo": "iquiw/company-ghc", - "unstable": { - "version": [ - 20170918, - 833 - ], - "deps": [ - "cl-lib", - "company", - "ghc" - ], - "commit": "8b264b5c3c0e42c0d0c4e9315559896c9b0edfdc", - "sha256": "0cmyrz251ls6ygyas455mj4pnmzfdqag1sp8v5zggw74wsl5wm23" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "deps": [ - "cl-lib", - "company", - "ghc" - ], - "commit": "64e4f9d0cf9377138a8dee34c69e7d578fd71090", - "sha256": "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r" + "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", + "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" } }, { @@ -13743,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", @@ -13863,8 +13976,8 @@ "lean-mode", "s" ], - "commit": "cc1f5fadf8e9ae08aa25828985edc97df04d94a7", - "sha256": "0v03bisr0ljk1ypbicgh9izxwazz8ry5xcd7r1lqb339xqb0bzqb" + "commit": "15bee87dc4080b87c543964375b7ce162317ab6f", + "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4" } }, { @@ -14021,8 +14134,8 @@ "maxima", "seq" ], - "commit": "1600cfc059a80ed8fa0d381b88f29ba658811cc5", - "sha256": "030sg31xh46vrmsafvn04sdvyv4vzqf8rf5ghrlina1gav6kybfd" + "commit": "5e80033e6fa9089d5cd6fa93f6484b544f2ba059", + "sha256": "0qh19a3yi5cccj01wxrlyaw1zcaxvpjhxc5qk3mf4f1l8gm1sfi2" }, "stable": { "version": [ @@ -14093,8 +14206,8 @@ "cl-lib", "company" ], - "commit": "3ef9aa76c43347694d355db4c75cfd3d049cdbe1", - "sha256": "0kvxmpwf206grfirkpf8rwnkprb96lhna4bgaixf71g160dm3770" + "commit": "82bdb730ad5971c594d9c99c069f3c7bb067897d", + "sha256": "0qrlqir7fa2zf97yfsg8phj5dqgjz2rzn5zspfk9qlys3j8i483d" } }, { @@ -14163,38 +14276,6 @@ "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld" } }, - { - "ename": "company-org-roam", - "commit": "aeb95e34be27dd78a237c0bfe1da94802fa68eae", - "sha256": "0k4w9g1rl94rpcvbcdmvsy47vzs53wz4b4hy9khj4yjn023nbsj7", - "fetcher": "github", - "repo": "org-roam/company-org-roam", - "unstable": { - "version": [ - 20200711, - 355 - ], - "deps": [ - "company", - "dash", - "org-roam" - ], - "commit": "1132663bd68022aa7ea005ff53c7c7571890769d", - "sha256": "1xk53lyf5sn16cs2gv874sajs5jlsxbxpksbjx9nk8glzrq7r6r3" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "company", - "org-roam" - ], - "commit": "a4c3f60883de783b190d4eb8bcc85f5912d9393a", - "sha256": "087z699i7y0q72s5qc7ks09bzin9cl3gm3aqs4ka99lzg676lrl8" - } - }, { "ename": "company-php", "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123", @@ -14211,22 +14292,22 @@ "cl-lib", "company" ], - "commit": "7d97ecc07e6b4ac772670e26583f11e77fdc69fd", - "sha256": "00jdn4dw975bb6fgf7wyxjbmvs31p8bav376d017kk56q9w6mv1f" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" }, "stable": { "version": [ 2, - 3, - 1 + 4, + 0 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "1477a463e7b2fadf2542d9563b28424481d19bf3", - "sha256": "04163qnz5kq3cwmkm5yfvahq8d8ybmchlimzdp15p1izhfpvxnfn" + "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", + "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" } }, { @@ -14333,8 +14414,8 @@ "company", "pollen-mode" ], - "commit": "d0a33591498013886c2c4676e204cd684954e82a", - "sha256": "0lg65hzdjwbc3dav79f3jm7251yyq8ghcbccvkb32vwz281xhjnh" + "commit": "09a9dc48c468dcd385982b9629f325e70d569faf", + "sha256": "15z6sdkg9vygczr1imk3c5v6cbpqgsvnkydzkcmxnbwnqlx1agpc" } }, { @@ -14377,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" } }, { @@ -14573,8 +14654,8 @@ "company", "rtags" ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -14639,8 +14720,8 @@ "company", "solidity-mode" ], - "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", - "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" + "commit": "b4fd719715be098921b6cbfb2ff9da31f3bd0d05", + "sha256": "0gsgj5485k7415wzq73xbj3ax9hh2l1j46ma5d0xkww3md3c3kca" }, "stable": { "version": [ @@ -14701,15 +14782,15 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20200221, - 2025 + 20210130, + 1325 ], "deps": [ "company", "stan-mode" ], - "commit": "2dd330604563d143031fc8ffd516266217aa1f9b", - "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry" + "commit": "9bb858b9f1314dcf1a5df23e39f9af522098276b", + "sha256": "031418nkp9qwlxda8i3ankp3lq94sv8a8ijwrbcwb4w3ssr9j3ds" }, "stable": { "version": [ @@ -14781,8 +14862,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20210111, - 347 + 20210228, + 435 ], "deps": [ "cl-lib", @@ -14791,8 +14872,8 @@ "s", "unicode-escape" ], - "commit": "a6edb64cd1087f0453d08a72c3c0169cebcd9f4c", - "sha256": "069zzs80zwxhhnwnvybyvhd0qrwdd60r7ihffn5bmngmxf5nmi8i" + "commit": "9226f887e6b5e86599283a3b0f0b1774eb34fd7e", + "sha256": "0ljswlm745459grkp9dvdb49z5j53ki8xp2nxz7szcqa7xgpfs64" } }, { @@ -14880,6 +14961,36 @@ "sha256": "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr" } }, + { + "ename": "company-wordfreq", + "commit": "8df1cb0929505984e9fe739a01c196715f065b1e", + "sha256": "0980iay8d10xwx5i05zwyz85d8pcbj8y7kamyxfh47mxkaczip2i", + "fetcher": "github", + "repo": "johannes-mueller/company-wordfreq.el", + "unstable": { + "version": [ + 20210201, + 1839 + ], + "deps": [ + "company" + ], + "commit": "3787785af2135c42af7b22562da554628141afdb", + "sha256": "0iwhi1pw14finc9n9avlv79wnyl8628cmdka5j83hjv1bs2fnysw" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "company" + ], + "commit": "3787785af2135c42af7b22562da554628141afdb", + "sha256": "0iwhi1pw14finc9n9avlv79wnyl8628cmdka5j83hjv1bs2fnysw" + } + }, { "ename": "company-ycm", "commit": "44e168f757cb51249db2deb9f781eff99cf6fb7c", @@ -14984,6 +15095,36 @@ "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" } }, + { + "ename": "compiler-explorer", + "commit": "28f8011009f8e92c020fe7599d9ede24b532e998", + "sha256": "1kqgdld32pfbxhxyrcjshj8ip06r8kxd7znvpsba39fp9s2k0pjh", + "fetcher": "github", + "repo": "mkcms/compiler-explorer.el", + "unstable": { + "version": [ + 20210212, + 2218 + ], + "deps": [ + "request" + ], + "commit": "13dd0d44590dbf513aa0d70b518a3d2b1644179c", + "sha256": "0qwsajgwl28r4kpfxr5vzqwzspcjg0bb0n7cln8fp55bbq8wprq7" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "request" + ], + "commit": "0195db82b767e9defa36a2e298e6ac4aa4b47e69", + "sha256": "1ky63d2szw4sfgjd8xyfxswg2x7b8vnqnly6h1yisxc17994vl4v" + } + }, { "ename": "completions-frame", "commit": "dcbb088900f76c05b04ffe25d32e43a477a0556f", @@ -15297,11 +15438,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210115, - 618 + 20210228, + 133 + ], + "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b", + "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9" + }, + "stable": { + "version": [ + 0, + 5 ], - "commit": "6e7fd01c217b2ee6cc5e02dd74d7e687c2ccf267", - "sha256": "0vzbv51q6ax824kcrr7hv4l93s91ii583lsx2wc0nvi0vklbq50i" + "commit": "947fa7067cb9a171251972f74b608d58df88faf5", + "sha256": "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2" } }, { @@ -15312,15 +15461,78 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210112, - 1845 + 20210226, + 1214 + ], + "deps": [ + "consult", + "flycheck" + ], + "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b", + "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9" + }, + "stable": { + "version": [ + 0, + 5 ], "deps": [ "consult", "flycheck" ], - "commit": "6e7fd01c217b2ee6cc5e02dd74d7e687c2ccf267", - "sha256": "0vzbv51q6ax824kcrr7hv4l93s91ii583lsx2wc0nvi0vklbq50i" + "commit": "947fa7067cb9a171251972f74b608d58df88faf5", + "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" } }, { @@ -15636,26 +15848,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210109, - 1641 + 20210226, + 1256 ], "deps": [ + "ivy", "swiper" ], - "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", - "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], "deps": [ + "ivy", "swiper" ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -15666,15 +15880,15 @@ "repo": "gexplorer/counsel-ag-popup", "unstable": { "version": [ - 20210114, - 1548 + 20210121, + 805 ], "deps": [ "counsel", "transient" ], - "commit": "cf0ee4f5bdb43a576f5cde00d52744ddb49177d5", - "sha256": "1k9d0581imp65d6w9vmc8bx6phyx0pvl7mas56p06hgnwg1i9cyk" + "commit": "41d85fe36edd72da68f5009ad9cf9013cd19960d", + "sha256": "1gfppiwx0cilg97bfb2cpdk7j10rdm473kklrkvb6wlwwg3j9w3q" } }, { @@ -15794,6 +16008,40 @@ "sha256": "1ma67lc4y9y3byrz8v6635w8q2scp6f2cqagq09k723k5nnwisfj" } }, + { + "ename": "counsel-edit-mode", + "commit": "73f84ab4a5b2cc5625968961601bad2a50ecc1f1", + "sha256": "0hlg10a7vg8lk08l439z0ldfidccgk6ngsjs1p384s24nqzrds9b", + "fetcher": "github", + "repo": "tyler-dodge/counsel-edit-mode", + "unstable": { + "version": [ + 20210103, + 1508 + ], + "deps": [ + "counsel", + "ht", + "s" + ], + "commit": "82234306562f47ec50db212888dbcf21ef0b70f8", + "sha256": "0jfl33npvw6rqk734ml87bfvnjrsgzim0z397j1bg7klva60j7q6" + }, + "stable": { + "version": [ + 0, + 6, + 1 + ], + "deps": [ + "counsel", + "ht", + "s" + ], + "commit": "75563c48135a4f52230d08e818e35d72fd55c2a4", + "sha256": "05ryph35ynzq7r5wp8m1q9vhnjv60x24sphzvbp8is0dp0fgwr0d" + } + }, { "ename": "counsel-etags", "commit": "87528349a3ab305bfe98f30c5404913272817a38", @@ -15802,14 +16050,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20201228, - 741 + 20210226, + 1218 ], "deps": [ "counsel" ], - "commit": "c10951946d6dd935e4ab5d18db5da228e1c22806", - "sha256": "09n0mpp0pchb85f7qkizd686rpkfagmr7sd0sxsh81xhzdavam47" + "commit": "e41a39cd07c594b5fa1c6757e9464be56a3dadea", + "sha256": "1dcph2ak1r5yrw0hfygrb6d80y3jkx1fsj1rrp7sg3p37rnfhq94" }, "stable": { "version": [ @@ -15869,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": [ @@ -15975,8 +16223,8 @@ "dash", "ivy" ], - "commit": "c5f781f241f8b16b7c3b6fb3e56e2938ba1dd87a", - "sha256": "10img15z5lfn8ml8d6v5mjf1nr73i8mjn9xy23ydp16n2idshh3d" + "commit": "6ba0f2ac7e4e5b8c1baec90296d9f24407d8d632", + "sha256": "1kp83cql4gn9g3d8g5mw3mrmpfj407kzpsi5wmwl1jr1pmw3v3jc" } }, { @@ -16186,8 +16434,8 @@ "f", "s" ], - "commit": "5efa13e7d3e06f206b29879d8f66afd6b0d26f52", - "sha256": "01d7kgsdv09lllmhi2dvywb61n2aj3j665xcxqjidwfl03vsw16g" + "commit": "2f25d645448d64f2516f8f1181429c35cd214639", + "sha256": "0prhapqan96hha92sjfkhx3dv7zgxbrc7fcm8kk63z38psnx92zx" } }, { @@ -16575,6 +16823,29 @@ "sha256": "01s32ivn1fdqq99ms3s6a73hrqdc2r5khrg4jv3sniviql2k3i31" } }, + { + "ename": "crossword", + "commit": "d74c680a2eada669fa092d05fa5c16ac81b9ad13", + "sha256": "11kpsdzpr4cv49xvzh49qfn77if397y6p2bxh7ql772mbhhb2h1m", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-crossword", + "unstable": { + "version": [ + 20210216, + 1703 + ], + "commit": "fa80bfef81168509ddbd840d95c6671efe91c253", + "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "fa80bfef81168509ddbd840d95c6671efe91c253", + "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db" + } + }, { "ename": "crux", "commit": "575e3442a925500a5806e0b900208c1e6bfd11ae", @@ -16583,14 +16854,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20201129, - 1921 + 20210224, + 910 ], "deps": [ "seq" ], - "commit": "ba4a1f38eee0ae7597f67a1424bbf5c0c09473bf", - "sha256": "0swykynbxsvxwxqjf41aqydkfrwy6f5ngl4pp8py5r5vh78a91ih" + "commit": "a471cbed343dc5ff3a7150214726fe4ea0d3cf9e", + "sha256": "152c7x1zj4rwq9bj9d8xw4znspfik2g7aigazq9smv12fkmzvzrr" }, "stable": { "version": [ @@ -16694,11 +16965,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210114, - 2018 + 20210128, + 841 + ], + "deps": [ + "tree-sitter", + "tree-sitter-indent", + "tree-sitter-langs" ], - "commit": "1d02a54f71b0c6ae0b5be9f764271ac31b1b0167", - "sha256": "02mbxqf4y04ancz89jkb8dmpmx3pmzxnxm5vc4fc6d828nzv56fx" + "commit": "09b4d57d020a97e1696e89baa6d9855ff5c86014", + "sha256": "1k8qz7fivwr8jli5xid156m0cb00mszfxskblylh2rs2fswpg3la" }, "stable": { "version": [ @@ -16843,6 +17119,25 @@ "sha256": "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa" } }, + { + "ename": "ct", + "commit": "a216297f766f14428c689a184bf1ba0a03f02a29", + "sha256": "01p6jz0kdsr3h033nwg7xbyp55w3pszdg6bkkhdygiyhsaqlw4y1", + "fetcher": "github", + "repo": "neeasade/ct.el", + "unstable": { + "version": [ + 20210219, + 1344 + ], + "deps": [ + "dash", + "hsluv" + ], + "commit": "c302ee94feee0c5efc511e8f9fd8cb2f6dfe3490", + "sha256": "0230h5qvg5jbpyry4xxmh41c0wpinmm04k5hc1qsc2mvqhv3n9n5" + } + }, { "ename": "ctable", "commit": "8bc29a8d518ce7a584277089bd4654f52ac0f358", @@ -16851,11 +17146,14 @@ "repo": "kiwanami/emacs-ctable", "unstable": { "version": [ - 20171006, - 11 + 20210128, + 629 + ], + "deps": [ + "cl-lib" ], - "commit": "b8830d1ca95abb100a81bc32011bd17d5ecba000", - "sha256": "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h" + "commit": "48b73742757a3ae5736d825fe49e00034cc453b5", + "sha256": "16yrx1z44xs24z2a0gwzf1xhhks1wrzafc5ihf6lbw843rq2jar0" }, "stable": { "version": [ @@ -16913,19 +17211,19 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20201020, - 1353 + 20210227, + 552 ], - "commit": "5acefdc9a6f8e35febf6f71b6a34a0d4fc499269", - "sha256": "0h707npbc4n9zx3pzla8cwaij48f80gg8fyjrdha4wb4y8ld6llq" + "commit": "4fd7d9dffbbf91dfcaccccb54c571f53c279e94f", + "sha256": "076xjd8aia8q96hakcw861a4hmkfdx0aafhnkwww4fk7vv50b7qx" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "d398a9bfbd959489fd6515b62dbf818a61d0e4d6", - "sha256": "1f0k3432brc96am6az6xr1nks1vacqzixhdgwfn2xklb8if9a5xi" + "commit": "d7fad32584c3e569046691bf7f27b21e294c0a2a", + "sha256": "06wq6scqy2ax0h6aahy2r7hn3bbmkzl4w99bkrc3cqd4ij78sc8g" } }, { @@ -16951,11 +17249,11 @@ "repo": "maurooaranda/ctune", "unstable": { "version": [ - 20190914, - 1305 + 20210205, + 1428 ], - "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee", - "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4" + "commit": "3f7abc6e74d4e5954b476ba9a1dc652f96b10c05", + "sha256": "1lcgkh0hhgx4rvc84kgbg3sczqp53gz6859c30hq1agn1zhbwrvy" }, "stable": { "version": [ @@ -17306,17 +17604,17 @@ 20190111, 2150 ], - "commit": "30fc474830b4a5beb88cdc53a31797ed794cddb8", - "sha256": "08wb26skxw4gh1gzpbxxgi63x44zbb50xd6mi5nbsg538fqb9arj" + "commit": "9a761a637fce6a7b70735ae2248963d63e569e14", + "sha256": "1f7zk28ywx47ig5fa6plq4415lbvd4972j4jjgb05qrg853zpca5" }, "stable": { "version": [ 0, 29, - 21 + 22 ], - "commit": "976f5483c6df8570f34076ef25af7e7512dd9347", - "sha256": "1951kwfnngy2k7m3adqi17rb7f17yrr5n9zpvvmw7vxpfmca66ka" + "commit": "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea", + "sha256": "1fbi0ladg9c37hw3js72i72nza8hfjzm5c8w95c6bmzsl22lszwi" } }, { @@ -17342,11 +17640,11 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20201201, - 1136 + 20210119, + 1853 ], - "commit": "1931ec9ee7af6767883452a822914ad3fd98ddad", - "sha256": "0sf7bn11hfcmmlx3vrp0aix2g1nvng7wfwbkbvj682prr9zld3c3" + "commit": "80fad305784b21a818683010bc27d48302ec7110", + "sha256": "0xz29ac8mpqkzgzdvhdv98aa4mrd6br4sr5fxwpb3kpidmqpa9h8" }, "stable": { "version": [ @@ -17473,8 +17771,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20210101, - 907 + 20210221, + 1947 ], "deps": [ "company", @@ -17485,8 +17783,8 @@ "lcr", "s" ], - "commit": "7b32bf21d5b9f7232c4b5c3760abf306e9ed9a0c", - "sha256": "1if4p6ikj7dry2c0xyli4m02f6xabriddm25xp4nksm8mj9cjgby" + "commit": "7b1ab644214e03b86dcf7436fd22a65cce2fa858", + "sha256": "177d9gk2fayx1nmd1gs6cf3mi35jakxn2di785qlhk7h5alai9hc" }, "stable": { "version": [ @@ -17514,21 +17812,21 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20201118, - 1304 + 20210222, + 419 ], "deps": [ "bui", "dash", - "dash-functional", "f", + "ht", "lsp-mode", "lsp-treemacs", "posframe", "s" ], - "commit": "612388d0b85e77972a9c28391bac6224a63408c7", - "sha256": "1z1vimfwjb5bfqdijh38cii222sw07l2mgbw4bwhwp93kasczw9a" + "commit": "aa15b9c49b7e09bb23f9a4ff7855122f0eb19976", + "sha256": "02gws113c95567qp2zvxzqdhzapkcx9qnf00k2l0j52f7i0kz49b" }, "stable": { "version": [ @@ -17781,20 +18079,20 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210114, - 2017 + 20210228, + 2221 ], - "commit": "6f5888c77523c2373c5252ef2113612beac7e78f", - "sha256": "1kg6c0jv44wlc0pidphg0cpmxfkn72r9391x0jgl1w22bhsvy4cz" + "commit": "6a086fccc95e96db2a819346d1eaf504654d9713", + "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p" }, "stable": { "version": [ 2, - 17, - 0 + 18, + 1 ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5", + "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva" } }, { @@ -17854,26 +18152,26 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210103, - 1524 + 20210210, + 1449 ], "deps": [ "dash" ], - "commit": "6f5888c77523c2373c5252ef2113612beac7e78f", - "sha256": "1kg6c0jv44wlc0pidphg0cpmxfkn72r9391x0jgl1w22bhsvy4cz" + "commit": "6a086fccc95e96db2a819346d1eaf504654d9713", + "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p" }, "stable": { "version": [ 2, - 17, - 0 + 18, + 1 ], "deps": [ "dash" ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5", + "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva" } }, { @@ -17884,14 +18182,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210113, - 922 + 20210218, + 1550 ], "deps": [ "page-break-lines" ], - "commit": "fb5e47576a1c91374b008221277f0a45b2491085", - "sha256": "0c4rj8lm7dikjbnr2ynzhmzchg7mjirawp0hqxd5jgdv0lbn267n" + "commit": "411ff9ff9368f03d09097ad1d395d632fd4d9f40", + "sha256": "0db8h1004ndn1b9cvh27fj5w5r6p83nmskcy983cw5qris02vrkx" }, "stable": { "version": [ @@ -18274,16 +18572,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210113, - 829 + 20210219, + 748 ], "deps": [ "dash", "s", "spinner" ], - "commit": "bb374c625939ac2dd9e2408c2cc180b1c9f4aa20", - "sha256": "0galdbka4dmlrryn5pbyd7frc676hb91y0zf6di8p9j2v3r7gzqv" + "commit": "ca16c37ffa5caa5f698bc049012489a2e3071bcc", + "sha256": "055yxchqbqp4pbw9w9phibnp0a2qw1jsb1a5xbfc558phi2vbxdd" }, "stable": { "version": [ @@ -18459,8 +18757,8 @@ 20201227, 2319 ], - "commit": "dd143e7e6cf5384d203a76e50fe677a77f1cd615", - "sha256": "1zpf35x1w4ldijqx3a2qlykhy9xgw3mqzxhfv0r3qn37k7lg0m58" + "commit": "e5aad0510139cca42b37614d3599951ac0a28ccc", + "sha256": "0kp3ngmdwip7c4c9mvw1l04p13gjjfaigwdiaycbzd5jzlgdh6rq" } }, { @@ -18806,20 +19104,35 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20201229, - 1107 + 20210129, + 2018 ], - "commit": "9ece03e3e687ff97d79eb2a9f6cc506a932f89ca", - "sha256": "1hsjzwwlhqxqgp5ii8a23wq2fc7a8dzfnqhjyakn39wp7dm925sz" + "commit": "2c3e0750c11485931f447ea82f80bc90ae07aeba", + "sha256": "0ciha9q6j0fp0197ga0ifi4j527sp2pk6862mm70skpfv6bm8dx2" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "commit": "c7507bfb10464b0527b3e2c5287a256cf3bf7ba3", - "sha256": "0s33jncjg8c2xlr90qjk1ishwmwxm9yg0z6n3kzilawcilpxidsh" + "commit": "9da8f4bddb78668085a7fc367f9021549f9e5f70", + "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" } }, { @@ -18941,11 +19254,11 @@ "repo": "raxod502/diary-manager", "unstable": { "version": [ - 20200404, - 1549 + 20210226, + 416 ], - "commit": "4f9d3104f0d89fe3e39c878d2035e6b6d9510659", - "sha256": "094x2n9nlqwxdppkw7wsyxwp34gf0b1dfyxp97nn712mfy98g1fc" + "commit": "12f194bd411e52b72bdf555e48e9a831e5ff8357", + "sha256": "0mn90abd2ak5f9b1s3q5h3l2lfhi91mwx4j50hs8q91s0r43hixz" }, "stable": { "version": [ @@ -19074,8 +19387,8 @@ 20201006, 1436 ], - "commit": "940f967bca64a8012892040c2e2f262d8709c41a", - "sha256": "1pm4a3jx2aq1cz9s9nfs1zm0s4crqarai3hr6dyihjqyf0szwrvq" + "commit": "3fcf861f1f8b91d97000bda32345bc92df8e2d37", + "sha256": "0x0awnasdjkmmrm11dqs4spkx2j3prkiqrmf5w3lxp2v28i4m2qk" } }, { @@ -19086,14 +19399,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210113, - 1930 + 20210223, + 2303 ], "deps": [ "cl-lib" ], - "commit": "dc3e12f14f5fddff3811310cd48640e2c9e626da", - "sha256": "1ackhs5rajydwfjgm4a9mwqhc75dk1jsby4yxkqbji495kwq4rsq" + "commit": "738c5d6a6bffe46b18249c77d59ae1d9e2d4d126", + "sha256": "1dn77ysxi9h1yz7f3lpw2gv4jsbwgjqbci5b6blgk5zaqpkj8nrd" }, "stable": { "version": [ @@ -19116,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": [ @@ -19188,20 +19501,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20200827, - 9 + 20210129, + 1719 ], - "commit": "f46d58ea690c7c9ff9aca19441dff23284bab7cf", - "sha256": "0x29502mn9cpbsfiqsdaa90j2566zfai5lbv2c49w5wxxm904b7j" + "commit": "e12b128023b7696a23545f812877e8c6531d261c", + "sha256": "17ja51xcwmiy66000k08z8c7za4rivsi1w8w650s8byd4v9nkc75" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "f46d58ea690c7c9ff9aca19441dff23284bab7cf", - "sha256": "0x29502mn9cpbsfiqsdaa90j2566zfai5lbv2c49w5wxxm904b7j" + "commit": "e12b128023b7696a23545f812877e8c6531d261c", + "sha256": "17ja51xcwmiy66000k08z8c7za4rivsi1w8w650s8byd4v9nkc75" } }, { @@ -19588,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" } }, { @@ -19687,11 +20000,11 @@ "repo": "mattiasb/dired-hide-dotfiles", "unstable": { "version": [ - 20170314, - 2039 + 20210222, + 1919 ], - "commit": "b715f643ec805b3b8aca334595e6589320f04a49", - "sha256": "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i" + "commit": "6a379f23f64045f5950d229254ce6f32dbbf5364", + "sha256": "0cwsjndvnv9a62ism7ckj27jdqx362947lyizka78qvmv369avv3" }, "stable": { "version": [ @@ -20014,8 +20327,8 @@ "dash", "s" ], - "commit": "947a008387a939f466ca122bda2ea98bb17710e3", - "sha256": "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51" + "commit": "fb0f161ac3cce1b224f52547f5bc7e1dcd283191", + "sha256": "0c92cqdsllly2dqrgfa9x8nmdyia1p9gkzyaf4427m1wd08dnfra" }, "stable": { "version": [ @@ -20038,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": [ @@ -20161,6 +20474,14 @@ 20210113, 1 ], + "commit": "491308566832a38c0c49a894f7b12b8ff62e7aa6", + "sha256": "1pa9k4y74rihh8d4ij6pdnpybs0ib2vcxvjp7ldlndxqpfzxaxxd" + }, + "stable": { + "version": [ + 1, + 0 + ], "commit": "887434054c2cfc521ceb990266cc7bbc12c4a72a", "sha256": "16rwxv2mrn79m8hqg79kq7z6fz2l8amh17kny4y3qnsvakpi0hch" } @@ -20219,14 +20540,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20200529, - 1305 + 20210117, + 1213 ], "deps": [ "dash" ], - "commit": "f5484b0fc33d4e5116612626294efb362ff9ecd4", - "sha256": "0772z4v2jjinqlqhrdcsvk912gdi0dkxag7q5nm0rnkx2pyk7ynw" + "commit": "381176f301dea8414a5a395c0d6546507838f6ce", + "sha256": "0hmj5m3wiqwdmjzxbzkf4sg8gaswdv5rv6jqgqvz3h9sm17fnps7" }, "stable": { "version": [ @@ -20744,10 +21065,10 @@ }, { "ename": "django-mode", - "commit": "bdc46811612ff96cb1e09552b9f095d68528dcb3", - "sha256": "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara", + "commit": "bb974042c92a37403f855c0b3fb3cfdc8807ed19", + "sha256": "1wydqd3pbwshmd2a52hczbq3vfj2dsv9dgs7ivqkawryigdj3qfc", "fetcher": "github", - "repo": "myfreeweb/django-mode", + "repo": "unrelentingtech/django-mode", "unstable": { "version": [ 20170522, @@ -20764,10 +21085,10 @@ }, { "ename": "django-snippets", - "commit": "bdc46811612ff96cb1e09552b9f095d68528dcb3", - "sha256": "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw", + "commit": "bb974042c92a37403f855c0b3fb3cfdc8807ed19", + "sha256": "0fz9jywfxwhh9kq5w12jyizvxxhfjzybfl3gxrhg5sj0qakfpll8", "fetcher": "github", - "repo": "myfreeweb/django-mode", + "repo": "unrelentingtech/django-mode", "unstable": { "version": [ 20131229, @@ -20994,8 +21315,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200610, - 715 + 20210208, + 1500 ], "deps": [ "dash", @@ -21005,8 +21326,8 @@ "tablist", "transient" ], - "commit": "3773112eea3fc99704b5ca50c1e9a3db2cb8e4f3", - "sha256": "0gi86ggjyfmfas7pswj7wirn5n7zs6rvb5b95nchnf4xf0nzwia1" + "commit": "0ca910badf86ff2e2dbfdf3f18819dd72a3198fc", + "sha256": "0n21nv79z356wmz2sryq1r0f68ds2kwkgivi8z82lqrv9ndni2xv" }, "stable": { "version": [ @@ -21139,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 - ], - "deps": [ - "s" + 4 ], - "commit": "d31f7685ebc5832d957e25070a930aa42984327d", - "sha256": "1br73dsls42fn4rwagljkpa3l4wwj6f7jxfn3gmgl6c54z81av3v" + "commit": "ed1d04c89cd8b53963f2dcae7cb3a46967e0abbf", + "sha256": "1ypkihd9si769r6k0lfrv8jq8mjv4gyhiwyi820sayfppvma5rj0" } }, { @@ -21195,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", @@ -21203,11 +21551,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210113, - 1646 + 20210126, + 310 ], - "commit": "a795fa4eafd42e016b6c9fed93d2f370c4f5eef5", - "sha256": "1z8yzphckcbykz5nxz75vbc75zigv3f5lwwpnk35ipzb20xnm563" + "commit": "8ac08633ae413a6605b6506d2739eece7475272e", + "sha256": "09nmxq66cmwpbqc4l8p9f76pn6dmckfvpkj9fk99zsnhan4d8870" } }, { @@ -21322,16 +21670,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210107, - 1407 + 20210227, + 1747 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "4956606a5455a3968ca10cbdb8de3889e6bd1d85", - "sha256": "1agv0jdfqvyw227mr3c4wnpjby48ccggfjglbidnfl7knd9i982d" + "commit": "1d8d8f885d1e2cdde31c256e11fce95a5b1fcce3", + "sha256": "1irvb4s6y80jpi6lwr7fviwisfnv4nvay29dssbj66k2jqlwyjqz" }, "stable": { "version": [ @@ -21348,6 +21696,25 @@ "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d" } }, + { + "ename": "doom-modeline-now-playing", + "commit": "de6f7f4030bc93babc3907a96d07029dd75caec4", + "sha256": "14wl5zr5g2bwzwly27wc6vpgk11cz1asx7xwx9mqwjf8nygr7bpq", + "fetcher": "github", + "repo": "elken/doom-modeline-now-playing", + "unstable": { + "version": [ + 20210202, + 1948 + ], + "deps": [ + "async", + "doom-modeline" + ], + "commit": "bed9e4da626ede148c7d362188b2e7729e2a8a4f", + "sha256": "1rz50wyinj9nmz37wam4rsdi5igmvdfp6pwn3rmzqsrdp3j81smv" + } + }, { "ename": "doom-themes", "commit": "c5084bc2c3fe378af6ff39d65e40649c6359b7b5", @@ -21356,14 +21723,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210113, - 1858 + 20210226, + 1558 ], "deps": [ "cl-lib" ], - "commit": "18cddefb3c8b9da63086496142ad6756f0bc9167", - "sha256": "0ix7kfxhs45w763ajzi2qxr7f94rd4g4xfi6szv3c75q6y5mb3y3" + "commit": "35b86f228f76ef4f782562c9d3188769e433b17b", + "sha256": "1xyykbygb0dajbwmfl50pq7azzhzis53nqg8az9c7rw1fd9bds9f" }, "stable": { "version": [ @@ -21607,11 +21974,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20201120, - 758 + 20210220, + 1358 ], - "commit": "18e8aa5ed78d10b372414b7def917337224bf2f5", - "sha256": "0fw3qar6dwcq5ahf9ca2glshka1ddb4im21hfy069sbdaxdajj4d" + "commit": "b5e50ed1e30ee054fb6a0827e78382b038e83c46", + "sha256": "0bdlcvx95r0hwxpvdfac6xjcs59jn4mi29yny7bjz3x463czidcy" }, "stable": { "version": [ @@ -21834,8 +22201,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20201006, - 1835 + 20210227, + 2121 ], "deps": [ "cl-lib", @@ -21843,8 +22210,8 @@ "s", "seq" ], - "commit": "86d1558711cc6e843a1a5470113ff9cb1ad608d8", - "sha256": "03k96gr7hxw76dpykbzjfvrpkl2m1ifm4y0jc9skf2p448fd1ssw" + "commit": "945f014d2a3618caa5031f6a8fbc8daf1a5754ae", + "sha256": "13rdlp0j3f4kvms29akhrbr5l2y58x48jlzgaivi6qhhh2ggya8w" } }, { @@ -21870,19 +22237,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20201208, - 1925 + 20210214, + 811 ], - "commit": "854b9a1ce93d9926018a0eb18e6e552769c5407d", - "sha256": "0hw8md2qp8r89ndgz82yf4iydm5yc9cj2s3g75h6hm940mp4fgxm" + "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0", + "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "854b9a1ce93d9926018a0eb18e6e552769c5407d", - "sha256": "0hw8md2qp8r89ndgz82yf4iydm5yc9cj2s3g75h6hm940mp4fgxm" + "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0", + "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih" } }, { @@ -21952,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": [ @@ -22002,20 +22369,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20191016, - 1241 + 20210213, + 757 ], - "commit": "13642e22a405de7c4361e94dd9aaa35ad1b09847", - "sha256": "0liha8qf1f4w5x8kklxc30yrn9krcrs9wvvj7chmgrg3m4mk3172" + "commit": "a8c6ed8bb27af690955e51eabbef0382b7e2d41e", + "sha256": "1c2r9njzm4l3rvhz0854qymf70dbmawfiahm0iaf5gva480kjv3a" }, "stable": { "version": [ 2, 8, - 1 + 2 ], - "commit": "b796156167490e777131403f651e83779e954000", - "sha256": "118fc0bwqp4yn4b6sfir53y3b7acgmpd2n0d7dc2cdjcv72bv0bm" + "commit": "6c471da57bea666267a8a63034aed57962f378b0", + "sha256": "0b7mqcns4n614fq3p9kisffks3j2wzawxp4xccka7wgyn1q2pgr8" } }, { @@ -22056,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" } }, { @@ -22098,11 +22465,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20201212, - 2106 + 20210227, + 1818 ], - "commit": "6277d31e6ec896ceaa9533ed156cece26359ba17", - "sha256": "12wkm04smmd3hgx6k3waa0wma0p8r23nh1ksm484znd7gij2bcrl" + "commit": "fe965628177b0ee0bced7aa4fa42b6f5519c2d0e", + "sha256": "17q91qnxbmbmsdnq9pnhn7q8wmq4bafl2z701783ka7nwf4z3ihl" } }, { @@ -22643,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": [ @@ -22677,14 +23043,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210110, - 1450 + 20210219, + 1115 ], "deps": [ "parsebib" ], - "commit": "a0c1cd12f2a635c89f4ecad1f3ec5701a78ebd00", - "sha256": "03np9b9xkd2h7c6il2a6vvlpcm80vnaf16ryark9cv9wraa5q4d1" + "commit": "32f97677bcfca2157583473af507c17e24f88f55", + "sha256": "1wd63jiik98ya5z4bkdpnznw03c1qri9wb8nn0w9smia9888a640" }, "stable": { "version": [ @@ -22790,8 +23156,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20201010, - 1529 + 20210202, + 1241 ], "deps": [ "ansi", @@ -22801,8 +23167,8 @@ "f", "s" ], - "commit": "f13723e0d7c2abbcb7a870091201ec80103bf202", - "sha256": "187zbmk1k14y7lwnbgycsk7g42c55bmp8vmyrvwylkz2lq65n0b2" + "commit": "d173cdf487bc2c62305e2232db96290bc021950f", + "sha256": "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1" }, "stable": { "version": [ @@ -22968,6 +23334,21 @@ "sha256": "001yhxngr6h7v1sjz0wskd5dv6fiby7m1mbc8vdz1h93150wzahp" } }, + { + "ename": "edebug-inline-result", + "commit": "235b422e95ecce5671a16d44bc648379b6859bed", + "sha256": "036fpy7f748c8z7di94ya1dwz2ckri3qm6bsl809myr5wsghp2w1", + "fetcher": "github", + "repo": "stardiviner/edebug-inline-result", + "unstable": { + "version": [ + 20210213, + 25 + ], + "commit": "86a9ed9e4f58c2e9870b8918dc898ccd78d2d3f8", + "sha256": "1zf09s03xkhpbhkj99ilzp679lhkyiaaa5kmyj4lb380di1nrw2w" + } + }, { "ename": "edebug-x", "commit": "204e40cd450f4223598be1f385f08ec82b44f70c", @@ -23150,14 +23531,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210112, - 901 + 20210221, + 1617 ], "deps": [ - "cl-lib" + "cl-lib", + "nadvice" ], - "commit": "9dd9789b77521eb9d128f9ebd4cfc7ef45072d0f", - "sha256": "1fi3mn16pw7iflhwsnhvdgzyghzgmv1kxdiw4ycnc7rb4q162an5" + "commit": "048c553999c90db0b6066b3ec647a79f4af9985d", + "sha256": "0i1h0p78dm256y7gg2fzhks4x8hq89s5i5m39pipfwy4srkp3d19" }, "stable": { "version": [ @@ -23299,8 +23681,8 @@ 20201122, 25 ], - "commit": "84c49302e9d6d5f9b2b110e61a7a1774d79f111f", - "sha256": "12dqavx3d665drwsdzh2g81xzf5iaa4i76d2q37yihb1xx7ibk3q" + "commit": "507a694fb778754f3967bf95d9e1c4e446725835", + "sha256": "1hvir0bxlh9jbd3781pdx72hkrrnai6qg56mskl30vdbjv0byhhh" } }, { @@ -23487,8 +23869,8 @@ 20200107, 2333 ], - "commit": "a874f97af30b59daefaf08e1b4b6846b2214d1a5", - "sha256": "1vqllbkiwjcq3y68cbrvh7xq4r4xsm04qh628sbc95l09gwrsk2x" + "commit": "df4e47f7c8adfe90d9bf408459772a6cb4e71b70", + "sha256": "1n0dcrhwpl24whxzwhxf7qjlqlllzl5aahdq8h2zdgb6xz912k64" }, "stable": { "version": [ @@ -23508,8 +23890,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210113, - 1843 + 20210227, + 1019 ], "deps": [ "eldoc", @@ -23518,8 +23900,8 @@ "project", "xref" ], - "commit": "e5a9648beec6e83f5b4471261b07e1da6630da1d", - "sha256": "1ny2myy1yxz9xqd0cs3hciasyc6gfvr2gshgza3pry7w5z481yy3" + "commit": "92b0c5d385cc6f3593f60c2f93917fd8b2d44207", + "sha256": "1rlgindfq43622gj8jsdkx3b590lhkr2zn18djyfd7g29j26b4wm" }, "stable": { "version": [ @@ -23537,6 +23919,37 @@ "sha256": "17aamcda6h92rrg23vjllwr9qirb4fyxz9x7wcddzi1cawkhsh8k" } }, + { + "ename": "eglot-fsharp", + "commit": "e03ae15749da9aab38ce2bc615d863f47fc23341", + "sha256": "197bqbkjb128a9p14rrrwcqf64962655krl052pqswns9is4bvf3", + "fetcher": "github", + "repo": "fsharp/emacs-fsharp-mode", + "unstable": { + "version": [ + 20210126, + 454 + ], + "deps": [ + "eglot", + "fsharp-mode", + "jsonrpc" + ], + "commit": "78898a1535878394d83643c383f4320e7b5fcefd", + "sha256": "0d60jfaf8av0b7vx44lbqzb7v70dszvr2w1yjh1cxn71dnjphp4j" + }, + "stable": { + "version": [ + 1, + 10 + ], + "deps": [ + "eglot" + ], + "commit": "4a1df3342931f09edc933cb481da70cc5a5ef268", + "sha256": "0dkfd4nlc0hxikvby1271y6zppsvcc0jr12m2w1zrng1pqx666di" + } + }, { "ename": "eglot-jl", "commit": "5f04bf5d68dc12aa3f3fd66591d45cc894e59df6", @@ -23638,8 +24051,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210115, - 120 + 20210228, + 15 ], "deps": [ "anaphora", @@ -23650,8 +24063,8 @@ "websocket", "with-editor" ], - "commit": "fbf1f71f52881dc23580053a6e188badb541388c", - "sha256": "1jnwl5yvw6bvj2hw0bnlzs4mz6xsv610ll1pk1rw3kricrnbmh1b" + "commit": "dfd968c0ae92f368a1861a15b54d4e4385271469", + "sha256": "1cna661kqkw1sz1dz7pba06d9l581k6g3vjl99vrraq1f7k4afcl" }, "stable": { "version": [ @@ -23817,8 +24230,8 @@ 20200912, 1653 ], - "commit": "215ff5e56cedcc18866aba6e451b61c06a050e74", - "sha256": "0qnyzvvpvzy3cvnq07yfi1v13i91qwa6xfb4p9j9yr2r3gsgdc1g" + "commit": "84dd1837f9ac80a329ab0c2de6859777f445f8ff", + "sha256": "098x17hg9dc28s7g50mxhv6m6fgch1xp1di7rplkg7w1dfphpc5a" }, "stable": { "version": [ @@ -23931,11 +24344,11 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20200716, - 1428 + 20210226, + 411 ], - "commit": "a47067b4d63f3674d284a772bfe773021540c043", - "sha256": "17gpysk41qf40xa4vab79d3dmi7l3xay5gb27wn7fmj9nrzbm4sm" + "commit": "5e823dc9a29e3be22597d93912f06119c38030d6", + "sha256": "0i7gvjy97cbfll93h5b9zyr1p075lklx7rdahkdy46c4kw6vy5py" }, "stable": { "version": [ @@ -24197,20 +24610,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20201223, - 2049 + 20210228, + 2242 ], - "commit": "9ca9abb3edca233ab52ada40531bec4ce3a8e642", - "sha256": "1nz2y9nqyxlb7bsg9chgdjkqmsfklh39shlvqhwl15im144ww9f7" + "commit": "47228bf2e4f187dc332301c5e06768b5d36c4392", + "sha256": "0kly9lw34sl3pmcgck2j058fjnh2hkhz9hd009j6s4lj0a1fbiar" }, "stable": { "version": [ 0, - 7, - 2 + 8, + 1 ], - "commit": "a25ea7a9f6c15c18457e737ef61a0ff81970c5cc", - "sha256": "1xxcxgycn0a03irjcdq2pcb4p1bddhfjspni7lliwpv6zjqgkyhb" + "commit": "c4f9b7ff4d12c59cc80b4a67f856601ba7cff2cd", + "sha256": "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188" } }, { @@ -24302,14 +24715,14 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20200830, - 1032 + 20210130, + 1325 ], "deps": [ "stan-mode" ], - "commit": "2dd330604563d143031fc8ffd516266217aa1f9b", - "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry" + "commit": "9bb858b9f1314dcf1a5df23e39f9af522098276b", + "sha256": "031418nkp9qwlxda8i3ankp3lq94sv8a8ijwrbcwb4w3ssr9j3ds" }, "stable": { "version": [ @@ -24415,6 +24828,39 @@ "sha256": "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw" } }, + { + "ename": "elescope", + "commit": "62debdf1f79d96c98b3957a11b203cfef289ac9c", + "sha256": "120ll2fgkyxxnlk84y1s5v05i08qi8055fjj8k3v2qyyz6z7w87b", + "fetcher": "github", + "repo": "freesteph/elescope", + "unstable": { + "version": [ + 20210128, + 1509 + ], + "deps": [ + "ivy", + "request", + "seq" + ], + "commit": "cd3ce082e47c0c13cfce34e6f6957c2275f9416b", + "sha256": "1pk8avmvvcxmv2gsl5n8g66jjwi92py1r9f5h9c0wjq0nrazapy1" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "ivy", + "request", + "seq" + ], + "commit": "7711f7e34d04ea52a258f69ee0c94ef1240c5655", + "sha256": "0y2cv5af05mjcr5qba88q7ga6w04yxpymn4s28g2c4591lmbkhsj" + } + }, { "ename": "elf-mode", "commit": "368d1ff91f310e5ffe68f872ab0a91584a41a66e", @@ -24447,20 +24893,20 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20201220, - 1359 + 20210226, + 258 ], - "commit": "de4b64b3f5d9fd41d9dc72023632ae535dc912e2", - "sha256": "04x3589jc39j3q2la82cidw3zpph10p5sj57m1kfz3ajyvh7rlm0" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" }, "stable": { "version": [ 3, - 3, - 0 + 4, + 1 ], - "commit": "9b5a0ce648cdaa59f7c96414ee868038e08ea29d", - "sha256": "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" } }, { @@ -24566,26 +25012,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20201219, - 2359 + 20210226, + 106 ], "deps": [ "elfeed" ], - "commit": "5fff4152bdb2a5f38ab83f7fa6b2943647935f94", - "sha256": "18jwg4a2ssswvbw50z9b84ca76i3q6vmv0ab90p432pjywpkwh73" + "commit": "6f99f4b9338c1a4e64885a799ac01c5b9e1d3a0a", + "sha256": "1l7xmnn0j5h01416ras5fjb8x68ssq9hzkcz7p4539fgq5m0p9y0" }, "stable": { "version": [ 0, - 6, + 7, 4 ], "deps": [ "elfeed" ], - "commit": "5fff4152bdb2a5f38ab83f7fa6b2943647935f94", - "sha256": "18jwg4a2ssswvbw50z9b84ca76i3q6vmv0ab90p432pjywpkwh73" + "commit": "8c895a786be96db4caab476d4db30202c51b6c70", + "sha256": "0zkkrf7xl91c8156vq0njkqlbdx2949s8pmpy62w2xfl12f2wb98" } }, { @@ -24596,28 +25042,28 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20191123, - 1738 + 20210226, + 258 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "de4b64b3f5d9fd41d9dc72023632ae535dc912e2", - "sha256": "04x3589jc39j3q2la82cidw3zpph10p5sj57m1kfz3ajyvh7rlm0" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" }, "stable": { "version": [ 3, - 3, - 0 + 4, + 1 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "9b5a0ce648cdaa59f7c96414ee868038e08ea29d", - "sha256": "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" } }, { @@ -24628,14 +25074,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20191203, - 1227 + 20210205, + 733 ], "deps": [ "async" ], - "commit": "c475cee98bc607746901318ef9da463c96d5e04e", - "sha256": "02jfpi8bvjxw5jnjjpzq87xf1xjly745k8s74jc9lpginip3kj95" + "commit": "b627cc0f307161e580e9450ad5334687b9406a16", + "sha256": "17nbjr5dll5n0m52p3isw8gkkza5iqxlhamhv7x61vjd8w72gl3d" }, "stable": { "version": [ @@ -24673,16 +25119,16 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20201215, - 706 + 20210126, + 750 ], "deps": [ "dash", "f", "s" ], - "commit": "679fa7d2d702263b6a55f30a1b8cfbb2fd817549", - "sha256": "0xzb89zk13db34kis68xc2b0b649335hxlnvjr4q1inf3yyzmiav" + "commit": "dfca043ec0cbead67bd9c526cb009daf771d0fa2", + "sha256": "16ryl9idrfpf8whx7srd6a0b3j50qhvc8brkk7iq42p7srr79ly0" }, "stable": { "version": [ @@ -24980,8 +25426,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20210106, - 228 + 20210224, + 2314 ], "deps": [ "dash", @@ -24989,8 +25435,8 @@ "reformatter", "s" ], - "commit": "706ffb8779c7ace330d6e020bb046e331266586a", - "sha256": "1rc6qdkiv13ggjwwcgzmri16i2g5x7jwbjc7g8590rndwbg9w9lc" + "commit": "188b9c743d8ec99ff7735d2581999d07f43b5bbe", + "sha256": "0cjjx4mf4lr1rcalzfl52ps91hyc9pvmsgpnfcb6x3akshbjab6x" }, "stable": { "version": [ @@ -25279,20 +25725,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210107, - 219 + 20210217, + 2309 ], - "commit": "49088c9bcdd66316a133252cf657187c4064488a", - "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" + "commit": "ceef14444a5d668ec2eac2954db9f3fa8971521c", + "sha256": "0nngpjgc98hb3aq8cq32n3n6qr59jnmm5c81i105x0ard3025jgk" }, "stable": { "version": [ 2, 1, - 3 + 4 ], - "commit": "49088c9bcdd66316a133252cf657187c4064488a", - "sha256": "15n1gbr6h6nm856drss8d1yrc6a3x191bsikhw64zkf7bdlqnxaw" + "commit": "47f194c77830946c66bc6ffecdecadc5a3191402", + "sha256": "00c33b0k5rw66xbzv1ggz1ai1yaqa705vqb25b54sirwr0s37wly" } }, { @@ -25342,8 +25788,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20201115, - 1811 + 20210227, + 56 ], "deps": [ "company", @@ -25352,8 +25798,8 @@ "s", "yasnippet" ], - "commit": "4032c7251eb2d74ec8a301a3988b62b7a0f00932", - "sha256": "0bmfazghviwkn14vbk2iabgrnb0xk3xw8cp2cyrg68rxmbpvl527" + "commit": "c31cd91325595573c489b92ad58e492a839d2dec", + "sha256": "0myypqnb4001zf9rpn6sakq900kn6mqhyjkp8vvc5y3j6123gj07" }, "stable": { "version": [ @@ -25655,11 +26101,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20200728, - 819 + 20210228, + 2103 ], - "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", - "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" + "commit": "de9d42c86fc3e71239492f64bf4ed7325b056363", + "sha256": "0778izaq1hjcc9i7d0v3p9xb08y6bwj9brcmpyd2yj3lfajbhxdx" }, "stable": { "version": [ @@ -25671,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", @@ -25679,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" } }, { @@ -25958,19 +26422,19 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210115, - 613 + 20210228, + 10 ], - "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", - "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" + "commit": "0c7323953e628c8797270a37c0f639fe23092175", + "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" }, "stable": { "version": [ 0, - 9 + 10 ], - "commit": "8b1291dfd6187815158299d25dc32b0bbc5af71d", - "sha256": "0b1p3pmdy21bix3fh57c2kb5mp0bmrwdc5q9vfdb9pni9sxw3n6v" + "commit": "47daded610b245caf01a97d74c940aff91fe14e2", + "sha256": "063hc0hganws11vjdk3ic0mxm9i0vpw6s7hzbgxvja0gjkdxjldz" } }, { @@ -25981,15 +26445,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210113, - 1434 + 20210223, + 1919 ], "deps": [ "consult", "embark" ], - "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", - "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" + "commit": "0c7323953e628c8797270a37c0f639fe23092175", + "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" + }, + "stable": { + "version": [ + 0, + 10 + ], + "deps": [ + "consult", + "embark" + ], + "commit": "47daded610b245caf01a97d74c940aff91fe14e2", + "sha256": "063hc0hganws11vjdk3ic0mxm9i0vpw6s7hzbgxvja0gjkdxjldz" } }, { @@ -26144,15 +26620,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210113, - 2138 + 20210228, + 1251 ], "deps": [ "cl-lib", "seq" ], - "commit": "50bdbcc619e376ac2d7472b7097b3a5ba2d1f64e", - "sha256": "1mbfdvh0fs824zvlw3vcy5rdbqdrq4dcx8031yyiq9qpxziswicd" + "commit": "757043ba5c4d259df41f71fa6545a156de107ff8", + "sha256": "05y09nr3l8xh8zg301jbl37yvm213cdq99gwjgzjs1vmlg8hp0nb" }, "stable": { "version": [ @@ -26539,8 +27015,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20210110, - 1928 + 20210301, + 213 ], "deps": [ "cl-lib", @@ -26553,8 +27029,8 @@ "projectile", "s" ], - "commit": "d0540df81c1b5f9f75f69ff92331bbf4b16f2e2c", - "sha256": "1py0140pvi8vyy3digjsz3clp98md05mik8w2xnjb47mb4af39jb" + "commit": "648c2e87516fac37b84fd9bc34a6362d2a9001e2", + "sha256": "1crgj5skqckvw1l445ywkdq23bqkj6b6yf5y3pcyay1aasvjbhmb" }, "stable": { "version": [ @@ -26644,11 +27120,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20201222, - 858 + 20210120, + 201 ], - "commit": "28f30c056cfe2fd7135a71576c183d242dff3b52", - "sha256": "1jslhi3nzn6b16481fkmq1mqrg7f8p5mqi4hqdkywpprqcygrwn1" + "commit": "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453", + "sha256": "0qmklr7d6g98ijd4l4j65x7cx18aafngppvynr4jvlinzsnr263q" }, "stable": { "version": [ @@ -26658,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", @@ -26733,25 +27224,26 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20210106, - 2359 + 20210207, + 810 ], "deps": [ + "inheritenv", "seq" ], - "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", - "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" + "commit": "a7c6ca84a2b0617c94594a23a0c05246f14fa4ee", + "sha256": "1dpwb5plymb13jv44rdxkg0lrc180076rcvricac6xk33pklsmbz" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "seq" ], - "commit": "a15003d6b540b1b07847310d5ed4c39046336a7d", - "sha256": "1sspy227b733dxx6czml5lmx9g7nsxwgnazk1b9ip81q0cm0dv55" + "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", + "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" } }, { @@ -26848,14 +27340,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210105, - 1456 + 20210227, + 1459 ], "deps": [ "closql" ], - "commit": "94c8389a8b660a68ae7e5458583b06b30ba0edb9", - "sha256": "0r2lvcrs34ixk5xx81b20m0s8x795l7plmry394lgh28gwr437jj" + "commit": "245157564b9bd1575480044c8b24007b2090dacb", + "sha256": "1bdbwbrrz4brkmg50808vsj70d5yaxb1a71n014nx1a09wnw1hmj" }, "stable": { "version": [ @@ -27281,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", @@ -27489,18 +27996,18 @@ 20200914, 644 ], - "commit": "c5400349d7d9cb1e54af19bdb2046b52ecada5bc", - "sha256": "02kma8f6v6vxzbfzd2limwabp8a5hzjyg9kfabgp1j0dwvsl64pf" + "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", + "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" }, "stable": { "version": [ 2, 6, 1, - 1 + 3 ], - "commit": "fce01db8f9d2ceb9c3a4aa179330ea4aa7587a71", - "sha256": "0fzq9pfkvsdin04vzcz2vyjq3gx0lfhbpwpz0zyfa3b84dgffxq7" + "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", + "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" } }, { @@ -27511,20 +28018,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20201215, - 830 + 20210226, + 1127 ], - "commit": "ed4bc369fe6724083bd0decac961fb7b3462d202", - "sha256": "1bsf9y6rxwndafvi1lh2vgawjd9k469rhbqb42p6wjc4872lbb0q" + "commit": "cd074622c9ed4c93d4f12ded40f2a36f91a26bc0", + "sha256": "0pf06a9wgzqm49xqyivddc3r3mc2g6rf3s7zsnxnnsp5wjx4amw3" }, "stable": { "version": [ - 23, - 2, + 24, + 0, + -1, 1 ], - "commit": "2c89431fa867d5b1cc56f26a9282bcfb6fcdec58", - "sha256": "1xya7rv9j2528w7x0kivb3zl0rdzdwv82xp22yh7bw22vhfyrk4y" + "commit": "655bd1a27673720bcee187e9fd9f07d739860ad3", + "sha256": "00k0x24diq2z24582bjk65c07ky1kf5h1zihs06ndl782i5cqjfa" } }, { @@ -27830,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": [ @@ -28093,11 +28601,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20201013, - 623 + 20210223, + 936 ], - "commit": "6cc32ee59d79d965e40269c764d90aa898252f0a", - "sha256": "09yjiamz3gvpchhzf424419q4gx7wybm2bcm5j2bw688qswd9rrc" + "commit": "eeace52ebb2c730f3665fb235017cd57dc6050a2", + "sha256": "1anlan2ldvx0qzj44dhb44flcs3h0d57v79qzn21jpy4d0y0m3kq" }, "stable": { "version": [ @@ -28252,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", @@ -28361,11 +28884,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210113, - 915 + 20210227, + 2101 ], - "commit": "19de88d2b3b2436955ce0f7e6cf8544d4ffaf8ac", - "sha256": "048b0274cj6hkri6hzsmp7r8g9vkx2vxxjljx24vvzxyqfwmn445" + "commit": "4e9a04284d00232e20d44269195e2a524252ebe0", + "sha256": "07k091b04gkmk8mdbqjvr9br19v8b0blrn5ywxvimyy3vwrxb87r" }, "stable": { "version": [ @@ -28614,14 +29137,15 @@ "repo": "zcaudate/eta", "unstable": { "version": [ - 20210103, - 645 + 20210115, + 1655 ], "deps": [ + "dash", "ht" ], - "commit": "850c3aff1d7999348aea30530e722e561b672f9c", - "sha256": "1ridnn2b1sp8rp3z9x3igavaq40d66chq25lhfimb6yw84544l0b" + "commit": "c7540ac50163f368fec1918dfc334304d9b36c51", + "sha256": "02xkrcrf62z303axy4jxr9d2xy6sbxgp6x5dj917xd04hygiqwj0" } }, { @@ -28683,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": [ @@ -28757,15 +29281,15 @@ "repo": "zzkt/ethermacs", "unstable": { "version": [ - 20201017, - 2006 + 20210124, + 1110 ], "deps": [ "let-alist", "request" ], - "commit": "36956db9fa65ff88f3213a80b11f1fad0765d972", - "sha256": "1aqwnfdp3cb7zc38iy37hyvzr0qii182c6w6z7k9rq1arjg1vs2b" + "commit": "6d9c86dac6ab569d1842fcfa8bbe63ee9de8cd71", + "sha256": "0pawqmwv3cmr2fw5w0nvq36ms882k68w61nyb1d0bvzbjvrbbc03" } }, { @@ -28943,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": [ @@ -29089,10 +29613,10 @@ }, { "ename": "evil-colemak-basics", - "commit": "945417d19faf492fb678aee3ba692d14e7518d85", - "sha256": "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k", + "commit": "fcc76e080a9b16879980beca5ae71afd9d6a6486", + "sha256": "0crvmlyrvia5bfa4nq5h5y5pg0nkgds5rmjmhrga3627m0na0dyv", "fetcher": "github", - "repo": "wbolster/evil-colemak-basics", + "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ 20200630, @@ -29102,8 +29626,8 @@ "evil", "evil-snipe" ], - "commit": "2354c9fa3d396fa5b1de8608e6920420b89ee323", - "sha256": "1cb7dv8wgixrfyx0mnc82i0ydg5bz7snn2643xi261kbrwhg51yj" + "commit": "584f8f9496bf5250a439c9c9fee1d94f3b4883f0", + "sha256": "0hv8068yaiqwswzhiikrlyl53w43yqi35m9xypvq6v9dwisrqg00" }, "stable": { "version": [ @@ -29145,28 +29669,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210115, - 641 + 20210209, + 629 ], "deps": [ "annalist", "evil" ], - "commit": "a67450ff537b9681a5fed25010ce28d4128e6db2", - "sha256": "0iyp72pp5db5pg7nrw81ij7r7gkzsl11d5hcvllcm7qwpj99az8q" + "commit": "334670e29d964c5f591f75ccbf52b7b5faf4daba", + "sha256": "0drjcdclzy27ja95q9wp25p798nr2xwix2br50pp0s73rpfvv2sy" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "annalist", "evil" ], - "commit": "04df79eadc952eaa9469094426b008426d3c5bee", - "sha256": "0ydr06krlj6v1r7hq3m5iy875mhmjr9amcfjjgqglfnzhic29g18" + "commit": "a615e4a7f642e0c3acd8628111624355380aa18f", + "sha256": "0dxrwcf5dnww0a9mvwjkcgm8ry3y282v9l85jh0645zk71nz1in3" } }, { @@ -29177,26 +29701,26 @@ "repo": "linktohack/evil-commentary", "unstable": { "version": [ - 20170413, - 1451 + 20210210, + 1702 ], "deps": [ "evil" ], - "commit": "395f91014b69844b81660c155f42eb9b1b3d199d", - "sha256": "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4" + "commit": "2dab6ac34d1617971768ad219d73af48f7473fec", + "sha256": "0zgigbfn0h1snls4d5xdjcg6mksaz6si0xm4827jyh5s8r0brc6w" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 0 ], "deps": [ "evil" ], - "commit": "395f91014b69844b81660c155f42eb9b1b3d199d", - "sha256": "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4" + "commit": "ca182e27156198db533bf6d48b7e5f6f54081397", + "sha256": "1l8zi9wlg1f7ffm8gh92qwk3q7h6cdl8b8zkd9hcda53mq6klpjr" } }, { @@ -29369,8 +29893,8 @@ "cl-lib", "evil" ], - "commit": "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1", - "sha256": "0zchmnzkq7bz2c4hl95xwnz5w243ya4ryi6hgbdss7mc9rnyyarh" + "commit": "ac50f21b29b6e3a111e10a9e88ae61c907ac5ee8", + "sha256": "0yl6lw2vz2qf97rvfmd83i3v41yl8bp7srhmxgxmhwksy589s5y9" } }, { @@ -29399,14 +29923,14 @@ "repo": "Dewdrops/evil-extra-operator", "unstable": { "version": [ - 20161213, - 403 + 20210225, + 1239 ], "deps": [ "evil" ], - "commit": "e16a9b36f9901254da9af8a73871061616410fc3", - "sha256": "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4" + "commit": "fb249889acacc3e28869491195391fa6f617ae56", + "sha256": "049325xd7yk707mncz8mm8cshryh2ir1zf6ahwikr11iwsxgfajd" } }, { @@ -29673,38 +30197,6 @@ "sha256": "0izgd9zwfwykmznv6wjrq9czmjqc1hkw41szrjmrcxy5kbz1p5c0" } }, - { - "ename": "evil-magit", - "commit": "50315ec837d2951bf5b2bb75809a35dd7ffc8fe8", - "sha256": "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980", - "fetcher": "github", - "repo": "emacs-evil/evil-magit", - "unstable": { - "version": [ - 20201107, - 1529 - ], - "deps": [ - "evil", - "magit" - ], - "commit": "f4a8c8d3a5a699baea9356be7c1c5fd8867f610c", - "sha256": "1a14n8nl6470vbzw1a2y9rw5l7pw21qnnhxrw963gy063jyl9m8i" - }, - "stable": { - "version": [ - 0, - 4, - 2 - ], - "deps": [ - "evil", - "magit" - ], - "commit": "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a", - "sha256": "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3" - } - }, { "ename": "evil-mark-replace", "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", @@ -29743,14 +30235,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210110, - 1011 + 20210201, + 522 ], "deps": [ "evil" ], - "commit": "9cdaddd55d28b50d1319baee8038972796e8b178", - "sha256": "15j6li3fnj4q6l54c6r31ng3hrcb703c06c3wk5w4spc4nsgzfvc" + "commit": "cdb9b90381ac0a225b01fb99472f5b23b612eb6e", + "sha256": "0qf3583w082787hsp5ihj84w8k2d0pwpci6a9ig8qk9f4sk66v04" }, "stable": { "version": [ @@ -29773,15 +30265,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20200228, - 1535 + 20210206, + 1941 ], "deps": [ "cl-lib", "evil" ], - "commit": "7dfb2ca5ac00c249cb2f55cd6fa91fb2bfb1117e", - "sha256": "18a4xcxadchyh9vrg9pqjmby40d5d0j78y1298kpflx78m5c9rgx" + "commit": "f04fb17f35f2722f2ac93c862b4450bb8e5b739a", + "sha256": "1d7mdqw4bx6p8y3c843n40g21099pmvras3bf9il5nhg4i3b12z8" }, "stable": { "version": [ @@ -29878,20 +30370,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20201017, - 1148 + 20210208, + 530 ], - "commit": "563cdc154b1f29d181b883563dd37be7eafafdee", - "sha256": "0q3m6i2hin6sb3aqng37nfvz97bj099c3727srxcw2m4gw7z4cp2" + "commit": "2730820b9ccedf758c8a0428ee2c994c9fc415dd", + "sha256": "1y5pn3rkqj8dxp5c7dsci621vnv6hsia74w2c1hybkkrjbka851q" }, "stable": { "version": [ 3, 5, - 1 + 3 ], - "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f", - "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z" + "commit": "2730820b9ccedf758c8a0428ee2c994c9fc415dd", + "sha256": "1y5pn3rkqj8dxp5c7dsci621vnv6hsia74w2c1hybkkrjbka851q" } }, { @@ -30476,14 +30968,14 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20170401, - 842 + 20210130, + 1855 ], "deps": [ "evil" ], - "commit": "b49ca4393d2f3cc6014174950059b36a5cb22949", - "sha256": "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36" + "commit": "a88c680c631676ff8f6c5156b529f86d6b9f0841", + "sha256": "1b9y21p56a000z62mknbnr22ypkv1j58r24i8bg9836n23y8l717" } }, { @@ -30500,8 +30992,8 @@ "deps": [ "evil" ], - "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", - "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" + "commit": "a50a15f4057dd474f274464842381aa44e550b4d", + "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr" }, "stable": { "version": [ @@ -30531,8 +31023,8 @@ "auctex", "evil" ], - "commit": "ac313efb22d621c093d8d30233bd7dc8b4cc54b4", - "sha256": "1wrx8ihimn1sx3vzzfppcwv0yfh3x95jrkxqvzj0ykckipm3zk0b" + "commit": "5f0d6fb11bce66d32c27c765e93557f6ca89cc7d", + "sha256": "1856liiy75w3r6s5ss6hnzcrypymfp6fpnw0i6ybrw351fkw4k9w" }, "stable": { "version": [ @@ -31208,8 +31700,8 @@ 20200304, 1839 ], - "commit": "ea6b4cbb9985ddae532bd2faf9bb00570c9f2781", - "sha256": "1pc3nnyb6cy4x6xnm25kdhmjmfm2rar7cnxsfck2wg5nm11p0klm" + "commit": "4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0", + "sha256": "1x6sbychbz91q7mnfn882ir9blfw98mjcrzby38z1xlx3c9phwyi" }, "stable": { "version": [ @@ -31351,15 +31843,15 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20190919, - 1238 + 20210222, + 1453 ], "deps": [ "f", "s" ], - "commit": "c77b0397b80d772c98fcc34c9ab131a8350fbf40", - "sha256": "08lhsjmibgvd4cjrvyxhwn7cqrpd83bgsvh2xqppi9mnw1xwgzd5" + "commit": "5bb115f3270cfe29d36286da889f0ee5bba03cfd", + "sha256": "0xz7vnj2wjzih0rm1bsf1ynjy46wmm0aifa9g8362d8570anmkj5" } }, { @@ -31415,6 +31907,26 @@ "sha256": "12rhsy5f662maip1sma0vi364xb8swb7g59r4dmafjv3b52gxik8" } }, + { + "ename": "exwm-float", + "commit": "0da450683bfd7c2da29ebfa0ffad7d66b268aae4", + "sha256": "1w4l8z3p55zrjjawg09ih0wnxdbzvhcpvazgz5z20dxfbj3cvryr", + "fetcher": "gitlab", + "repo": "mtekman/exwm-float.el", + "unstable": { + "version": [ + 20210207, + 2035 + ], + "deps": [ + "exwm", + "popwin", + "xelb" + ], + "commit": "eb1b60b4a65e1ca5e323ef68a284ec6af72e637a", + "sha256": "1bwnw6qacdrm54lx4hc36f9lnidfw1wl399n7wasa24n9wrbr8z0" + } + }, { "ename": "exwm-mff", "commit": "78f94ec4d5f83020003cbdb7b954213dfb0f242b", @@ -31771,11 +32283,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210108, - 1527 + 20210128, + 2108 ], - "commit": "e475a0805cd9f4bb0f7397e4d37b868f42d96c00", - "sha256": "1djgrjnqapxjpnjly3mk9xna27fgl53rj257slz2dm3svhyghk2n" + "commit": "14a755f2f85e4db00978de76e1b7f404bfaa5e67", + "sha256": "0nxijsqwq3kvszv3f3r4z0vskxp9f0zjq5mx0c6gzfc4q82lvqkr" }, "stable": { "version": [ @@ -32537,28 +33049,51 @@ "sha256": "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h" } }, + { + "ename": "find-dupes-dired", + "commit": "f119ddd30a27e63e01d2be7928534a0708c8b8c6", + "sha256": "1ps1rhc1aa64gdx2dxhkkzjdricsqqljyzm1p6yzqy5a0jvicglg", + "fetcher": "github", + "repo": "ShuguangSun/find-dupes-dired", + "unstable": { + "version": [ + 20210204, + 49 + ], + "commit": "3c9783589e43717b682c9e37dd229839735402e8", + "sha256": "1wd7n08cf1mnd7czca3mcsfyh4nlkl36arhc3lnh7lzi98nyd0zv" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "f39e2afbc33e02a6bf62116f6ce71b8368068698", + "sha256": "1i86dqiw5b8wcqy4gc6nk3xk9narc3b40xl0bqyp0n6a1mckx9kh" + } + }, { "ename": "find-file-in-project", - "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", - "sha256": "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy", + "commit": "3bd8d837d8fe1712df6f62f825985d9e12d97fc6", + "sha256": "06kp64zxc9br4vsdl419fz68igqzmkzglhzzcb643vszi9dd5djq", "fetcher": "github", - "repo": "technomancy/find-file-in-project", + "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210112, - 532 + 20210227, + 546 ], - "commit": "c4c7ec595c54c3006299717b1fd83e357864b2d5", - "sha256": "0mhp70h7n6h5s4dls5pslp45xxlrg6bbs7hkpbl3p1jhxx414fwr" + "commit": "28de73305f6e83e7eebd5a3e7f7ec2f3c0f4985a", + "sha256": "1afridpi5imdxcv257872nx3g4rgzzi1ld629774da3p36jpvdwl" }, "stable": { "version": [ 6, 0, - 0 + 1 ], - "commit": "7cc9c05d05da5139e8361b72ca83ca30f44fae7d", - "sha256": "1iagywiihwv96y9p811xlx4cmbsj8h76niymprv1vm4fj6cmihr6" + "commit": "06df008d5dc9eaced2dfc216f934a79c66b5cd5e", + "sha256": "1r9x8fzc2ccyqk24q3gijssa9jmfc6lsylayjh24xz42kdbw2kx8" } }, { @@ -32569,11 +33104,11 @@ "repo": "h/find-file-in-repository", "unstable": { "version": [ - 20190404, - 828 + 20210225, + 1929 ], - "commit": "b44d78682082270dc6b59cdc911333d0d3e7edaa", - "sha256": "1icsxp2b3grvdbv6bh9hpxz1hrqa7vvjzajjwi2knvjbq41d99bn" + "commit": "047eeeb8bf1958397a048d9ea8aaa43f80bac34e", + "sha256": "1czhnf4ayiygkv3nxw3gdaimy2l6pfy308msnp2sjy0q719ygc79" }, "stable": { "version": [ @@ -32847,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" } }, { @@ -33635,14 +34170,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20200830, - 2357 + 20210213, + 1822 ], "deps": [ "flycheck" ], - "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", - "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" + "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", + "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" } }, { @@ -34240,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" } }, { @@ -34423,6 +34958,36 @@ "sha256": "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw" } }, + { + "ename": "flycheck-google-cpplint", + "commit": "d8aae034af2142a1bcec47414e00083b2afc7e4f", + "sha256": "17jm3r5mrn7hnk53cd9hahqgyqnc7jb4zh8ghg7i1zcg3k7wlbav", + "fetcher": "github", + "repo": "flycheck/flycheck-google-cpplint", + "unstable": { + "version": [ + 20210210, + 300 + ], + "deps": [ + "flycheck" + ], + "commit": "6e2bc77da6e2a8812246b4717d97b68675ed84f1", + "sha256": "02m22d9y152aj7aba736j5gxpniqr0rc2k8iyq9cgbgavfhbr3ac" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "flycheck" + ], + "commit": "95f2038831d1e04a4ea6f91f0a846a4f989606b7", + "sha256": "1nlyv81pyqmyz18dlzw5h23prhkvyzb0aasjxba8mm33avx0fvvb" + } + }, { "ename": "flycheck-gradle", "commit": "382d9afd2bbb0c137719c308a67d185b86d84331", @@ -34472,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": [ @@ -34600,6 +35165,36 @@ "sha256": "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3" } }, + { + "ename": "flycheck-hledger", + "commit": "502709e2195bf0001891e438081e274fa3824af3", + "sha256": "1sdglh0s00af8qiqvi583gksi2yl8z47r1hry2dbm9vs0p0sf1z8", + "fetcher": "github", + "repo": "DamienCassou/flycheck-hledger", + "unstable": { + "version": [ + 20210119, + 1000 + ], + "deps": [ + "flycheck" + ], + "commit": "0eeaa707b74f96761404daa2f807fbd7af904b75", + "sha256": "15xwnxvda3kj81q2rm8cz2qj17l9cwjqak4y6v02cv37nax0jmfh" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "9e45dd3f6b6cf51acf7312939aa437ae156be2e7", + "sha256": "0q6b0vyd55x71kv4k7jp8xzgy5zf9md8mgy3y6pwmpga9dmv149j" + } + }, { "ename": "flycheck-indent", "commit": "b1c1163d5acc402716c4a6cf877f13665138b74b", @@ -34676,8 +35271,8 @@ "deps": [ "flycheck" ], - "commit": "e1c3adfc148caf721691a55cae686b5f31209204", - "sha256": "0b8hs7cdywqblbf5dkgck00x18xirlxi7kqd21cqfd276wvn8wyp" + "commit": "7febbea9ed407eccc4bfd24ae0d3afd1c19394f7", + "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd" }, "stable": { "version": [ @@ -34834,8 +35429,8 @@ "flycheck", "keg" ], - "commit": "18c675aa2ff1749eb42f081f0549398b82cd4540", - "sha256": "1mz5rfzyv4varn09pza5yb851vmsbicsz4zgc0y7zni2bhlj9250" + "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", + "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" } }, { @@ -35064,8 +35659,8 @@ "deps": [ "flycheck" ], - "commit": "cf45af2a71f6e7a21e01c556613c5b5cdc983ac9", - "sha256": "1qhix0i8d9qrc0jg3r17v6fmrz07pjw5kk04fm72i8n4c16vb6r1" + "commit": "5e74a5a796e73fca7f3fd15986fefa56529b8e98", + "sha256": "11sdxlqwk4wa3pgbfyxjq100yra11iya61wnx6c01n2fxmf82iih" }, "stable": { "version": [ @@ -35292,26 +35887,26 @@ "repo": "ponylang/flycheck-pony", "unstable": { "version": [ - 20190227, - 235 + 20210118, + 1326 ], "deps": [ "flycheck" ], - "commit": "43421fb43ab4fec759061a11e9d9166bb7da013d", - "sha256": "03byayxvhrkm88s7157cfzi91ziggs872yis9ys04ndk1pdf940f" + "commit": "039a6c9d0324208d4f4b006693c16248fcf5519b", + "sha256": "1sr1n7gv5n22w018z5nxfnknjqmk2lc8h2flv4d2f23aihlss9h3" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], "deps": [ "flycheck" ], - "commit": "9356cbcd404eaf381ab0c4b0f9c47232f723fa7e", - "sha256": "1rzz3cl0pxn3hhrkxcdiy17wl4dzbn8kxm3hq90zmhag1gbfy4zz" + "commit": "22787cf8223ca9ec309e30a42c20a8e706d8bfbe", + "sha256": "1dpxhljgw0k6y7973ssqfnmc7vp4fv87ajsq1bm8g4m04vj4127q" } }, { @@ -35385,15 +35980,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20201122, - 2307 + 20210217, + 327 ], "deps": [ "flycheck", "posframe" ], - "commit": "66b73ddb93b357fe9b849d2aa14d5cc9e89e9ffd", - "sha256": "0hggigwbpcq4w5nrjhp8g7vahl9zdixwrhga8ag8zvrdfr0g1cym" + "commit": "24fd9b3d81eab8dd850c504ae46a5c5f11a46ee0", + "sha256": "0dv9bkagzk61r32i9231zpndizv6avpg8n84nrnh8yyl0w4hzldv" } }, { @@ -35590,8 +36185,8 @@ "flycheck", "rtags" ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -35649,15 +36244,15 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20200830, - 1032 + 20210130, + 1325 ], "deps": [ "flycheck", "stan-mode" ], - "commit": "2dd330604563d143031fc8ffd516266217aa1f9b", - "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry" + "commit": "9bb858b9f1314dcf1a5df23e39f9af522098276b", + "sha256": "031418nkp9qwlxda8i3ankp3lq94sv8a8ijwrbcwb4w3ssr9j3ds" }, "stable": { "version": [ @@ -35749,8 +36344,8 @@ "deps": [ "flycheck" ], - "commit": "77a000095b321ac5d2378cf03ccf2377ccc37f59", - "sha256": "1rp0v681kvdsi84lk4m1lj8bfllwqw1ivl53q3zy34ja186xviww" + "commit": "f83b2bb7086e54beb2bd2df406a498927a7b2fba", + "sha256": "04rdc8jsb8gx2bhrf7rwpyrw4pw04638j574g6614f9h1whpw9jw" }, "stable": { "version": [ @@ -36042,11 +36637,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20201212, - 1038 + 20210213, + 1822 ], - "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", - "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" + "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", + "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" } }, { @@ -36078,24 +36673,6 @@ "sha256": "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc" } }, - { - "ename": "flymake-cppcheck", - "commit": "2a83d56c6e150de5d4fdbd89f271f18e5304afd8", - "sha256": "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d", - "fetcher": "github", - "repo": "senda-akiha/flymake-cppcheck", - "unstable": { - "version": [ - 20140415, - 1257 - ], - "deps": [ - "flymake-easy" - ], - "commit": "7eac8c7b9c74ebb5e600686f1f3891767dc87bb2", - "sha256": "1xwpznllgz47f6h7mzwy601179sxdj6i8qvnfa6fn4cx4dz5z3iv" - } - }, { "ename": "flymake-css", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -36133,14 +36710,14 @@ "repo": "flymake/emacs-flymake-cursor", "unstable": { "version": [ - 20120322, - 1757 + 20210126, + 1733 ], "deps": [ "flymake" ], - "commit": "ecc539082c3fc9e91bba33d72c26989217411593", - "sha256": "0cdf5m3rfwsim505qjyyml0r5zzqx7jrlc8ayfvix70f3bmxnibs" + "commit": "afd458daf88f475cfacdd22375635e43a5017564", + "sha256": "17fzs4r22nlf27xcdfj9qs337879xkk9hgq121dgxd93xy3n0ky7" }, "stable": { "version": [ @@ -36319,24 +36896,6 @@ "sha256": "1py7ssjz4q5r28c8lzga5qi8x4gmdg3z0ga0cyskiba6krvv45ry" } }, - { - "ename": "flymake-google-cpplint", - "commit": "01f8e5c2b63e80f0411860fde38bf694df3bfc8f", - "sha256": "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3", - "fetcher": "github", - "repo": "senda-akiha/flymake-google-cpplint", - "unstable": { - "version": [ - 20140205, - 1325 - ], - "deps": [ - "flymake-easy" - ], - "commit": "426e56ae1278d7a078c368e9d495003825ada0bd", - "sha256": "1gckz68050pj9pg7yn3wwn13x2nrv6y4ggswkgcyijxi7x0sqana" - } - }, { "ename": "flymake-gradle", "commit": "7cccc8537324e0faf7fd35325e3ccd3b2e05771a", @@ -36354,20 +36913,20 @@ }, { "ename": "flymake-grammarly", - "commit": "a8a5e3f1d6b2976b0544ca23189f58486f2065f1", - "sha256": "08gqywxms7mn4xihj3sqm7kw02zjcfhxm0ldcvwaihjnkxmfrll4", + "commit": "8271fbd6a4b47d0d3aa6f50547ac502c4f2a7e4a", + "sha256": "06va2zmg8m8al7rxpa7znvln9yhsjlxhnxgs8q76flx9fhg0pm2j", "fetcher": "github", - "repo": "jcs-elpa/flymake-grammarly", + "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20201028, - 647 + 20210217, + 909 ], "deps": [ "grammarly" ], - "commit": "28efe445c91daa9a604d518f00cae6b1375179df", - "sha256": "05icajswb649g3d3qhj96dzz5zc9faf1hr93ni0039gqk312p48a" + "commit": "41d10f26a76208612fa184d1155ab40130f4cbf0", + "sha256": "1f5vflanpq0kdqnp2jz6aj5v0v4wvmr01rlgxjz3yz31bp444a0d" }, "stable": { "version": [ @@ -36650,6 +37209,24 @@ "sha256": "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn" } }, + { + "ename": "flymake-nasm", + "commit": "003b8973f810f771da88e30b4aa7457967f21364", + "sha256": "1i12dz0xzvbyajnlb64scv894zj2nbsz354mv9rjhkgvc9zw2hnl", + "fetcher": "github", + "repo": "juergenhoetzel/flymake-nasm", + "unstable": { + "version": [ + 20210107, + 524 + ], + "deps": [ + "flymake-quickdef" + ], + "commit": "92b96ca659e88d25e21e711038332a5b4c199e61", + "sha256": "1s76s5y5lwdw84bkcbx3xawc748hm9p9g2sfpn33mmz1mc227kz5" + } + }, { "ename": "flymake-perlcritic", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", @@ -36664,8 +37241,8 @@ "deps": [ "flymake" ], - "commit": "edfaa86500ddfa8a6a6f51f5581a81a821277df6", - "sha256": "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj" + "commit": "c70eb881d4fb27aeb72c0bf8de6707b9de49bd51", + "sha256": "1w7msjg4sa0h0a4ycl9382agv1bhzcr9z0i6hmhcg7333rd31ilh" }, "stable": { "version": [ @@ -36741,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, @@ -36753,8 +37330,19 @@ "deps": [ "flymake-easy" ], - "commit": "bba25dbda15955b609ceae0893cf3be74ec67230", - "sha256": "1z6m3bggd3gmxvx92j16jmqm5h9jjxnmsd7adyf12ziy5n5rqcbc" + "commit": "8e5ab5103c8f40a2ab6c86def6327e480ae93657", + "sha256": "19cggpaj14w3j3q6dgv7ybjqbr2pqbwhingz4yi7wkrr0w6s0lsa" + }, + "stable": { + "version": [ + 1, + 1 + ], + "deps": [ + "flymake-easy" + ], + "commit": "f947ba3066c1fa903d2ec69d67bf84413f51eb3f", + "sha256": "10qaw7dhklxqzimfsj87clb297y7rnd3bpn061bh04cwnayjn2hr" } }, { @@ -37121,11 +37709,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200904, - 526 + 20210124, + 1143 ], - "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10", - "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619" + "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", + "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" }, "stable": { "version": [ @@ -37145,15 +37733,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1337 + 20210124, + 1143 ], "deps": [ "avy-menu", "flyspell-correct" ], - "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10", - "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619" + "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", + "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" }, "stable": { "version": [ @@ -37177,15 +37765,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1337 + 20210124, + 1143 ], "deps": [ "flyspell-correct", "helm" ], - "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10", - "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619" + "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", + "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" }, "stable": { "version": [ @@ -37209,15 +37797,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20201202, - 636 + 20210124, + 1143 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10", - "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619" + "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", + "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" }, "stable": { "version": [ @@ -37241,15 +37829,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200828, - 629 + 20210124, + 1143 ], "deps": [ "flyspell-correct", "popup" ], - "commit": "0d5076f93b4c903a69a5f9ed19bab45d107acd10", - "sha256": "0zx45lm292mvq6q1i9288qg7nfy0xnxvvaa7qgv3yfi5zdsjq619" + "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", + "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" }, "stable": { "version": [ @@ -37559,15 +38147,15 @@ "repo": "rolandwalker/font-utils", "unstable": { "version": [ - 20150806, - 1751 + 20210124, + 43 ], "deps": [ "pcache", "persistent-soft" ], - "commit": "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3", - "sha256": "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055" + "commit": "88fb9b046e7094303e4f5b43e84b0f5d5283c508", + "sha256": "1qhrvmx8pcjb2hg3y3ra07nv3bcga3ckqxd9i89wrgay5kk7avcy" }, "stable": { "version": [ @@ -37722,8 +38310,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210112, - 1148 + 20210228, + 1555 ], "deps": [ "closql", @@ -37735,8 +38323,8 @@ "markdown-mode", "transient" ], - "commit": "47be4eebfa34f87e502aad30f59907ad09552979", - "sha256": "0fbj6css456abzslr09vxr46xikxydjh78kmd0kqfidsp1rx6xsj" + "commit": "b4df041a25811daa2536f9502461b99379dc0f11", + "sha256": "0v5i3wnlajz7yznksml1rwl8avkjlqf3rbjl0gpr3ylv05hcra9k" }, "stable": { "version": [ @@ -37791,27 +38379,28 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210107, - 1425 + 20210224, + 1954 ], "deps": [ + "inheritenv", "language-id" ], - "commit": "05bd6d0b4aa3d8b22291de5827da64b7be155590", - "sha256": "0fgc0kj9zb0f08i2mcm8ny9f8cqlk9v8185qmc6wmq1i7kaczsvr" + "commit": "8f25a5e72f81b60bcf27fdfd653b76e7c4773895", + "sha256": "0yfk59sbv8ydhc1sqwf3254h9qag7zmbs4h9f47kc9kp79a93i26" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ - "cl-lib", + "inheritenv", "language-id" ], - "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", - "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" + "commit": "caa0269ce89789a702823041ca7b309ddaffb5ce", + "sha256": "1y5a704xbnvb46rp1ra9cjjazzs795hvh3p0di2hr5jsql0a0zwa" } }, { @@ -37875,11 +38464,11 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20170527, - 1930 + 20210123, + 900 ], - "commit": "522256d98d1a909983bcfd3ae20c65226d5929b6", - "sha256": "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6" + "commit": "f44fa6481ffe2b4321d462c3fab78a858f2a8ae9", + "sha256": "08p9ddxs3ya7an2p485wrw5ywimbgnqrihriyc4aaq963zpssk2c" } }, { @@ -37935,26 +38524,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20201226, - 1636 + 20210225, + 1517 ], "deps": [ "seq" ], - "commit": "c7ac77fef71fc20c4c7bee73516ec3c0f656a91a", - "sha256": "00m4x3nylvwsaki6m7gvk1grcaap96rnx10mpsxlapkpbrydhpk0" + "commit": "98e2729b7dfc99607778b07ef03ff994a74c045d", + "sha256": "09c9rmrs8aazmmiq0v71p7yhcgk7ykr0il188xl8qc39m4rky9mz" }, "stable": { "version": [ 3, 4, - 0 + 1 ], "deps": [ "seq" ], - "commit": "3e7ef35fae455f77abb63c34e926c2d0e3070d7f", - "sha256": "161wn66gc2z7fd4f89827dpww6hjmnassbi15yis5rqbklj1h2z6" + "commit": "707b8fdc9a0e1de1a911ca312c23c0c1672f3ec3", + "sha256": "14zhbcfqyp093kd1bxl7f2hf5l5995qmgpmnxfgw9qcc781crj73" } }, { @@ -38157,15 +38746,16 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20201217, - 2150 + 20210211, + 1630 ], "deps": [ + "async", "frecency", "persist" ], - "commit": "23a41b8d06b1e345e6b99d1efd38a219f376faff", - "sha256": "1sgsi7kdk3r1lh0iilpyz241qpzj46xp4ifhbszjxs6p2gcwi5y9" + "commit": "b385061a3103890df2d4b2e46a8b3ac775aeec00", + "sha256": "09s6fkshkd3mfhf0zynl50p70cnpx67qigi55is2byvhh5950fx5" } }, { @@ -38221,20 +38811,20 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20200416, - 1605 + 20210201, + 731 ], - "commit": "968cb4580bbd7d23ee78e53152e30e0cdf0f5e41", - "sha256": "0v9yriw45rg12mz72gmhwi2mz19h6svh3dsw1fpbww4qcx4mnjvd" + "commit": "752fe042ba3153473cd149875388c8dd9b4a8a26", + "sha256": "0x4sp6n6dksa8vps465i8sqvdzacr7hrxd4jlxj9gqkcspalrjgy" }, "stable": { "version": [ 0, 2, - 1 + 2 ], - "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", - "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" + "commit": "1f252a922612e0d6ee62a683b7cdab8956460f11", + "sha256": "0bwd3hw5qdijmvbfm69iyhijjx12yqvsa8n08cawxfa26cs6hi1g" } }, { @@ -38429,6 +39019,31 @@ "sha256": "1zgzvcrybcx5vvvqhxxhridsfcjggcyb2kxzsmp6fmd4bdhd4crx" } }, + { + "ename": "frontside-javascript", + "commit": "73ac023ee296b2b890265832d68d1d1d9f59fe33", + "sha256": "1yqp9zpahd808q5c2cpb2sb7xh8z75vqbrb5jxxrng4n4dxqj3yj", + "fetcher": "github", + "repo": "thefrontside/frontmacs", + "unstable": { + "version": [ + 20210206, + 2008 + ], + "deps": [ + "add-node-modules-path", + "company", + "flycheck", + "js2-mode", + "js2-refactor", + "rjsx-mode", + "tide", + "web-mode" + ], + "commit": "2b0e27a2f5fa18079b00753b3bf9635818e11f71", + "sha256": "0cv0vrz8mv7b8hm3ac8l7zjscavsxix0wiv646n5vx03282zfgpk" + } + }, { "ename": "fsbot-data-browser", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -38454,21 +39069,20 @@ }, { "ename": "fsharp-mode", - "commit": "7a41e8a101b1b76870402eb8f60130be9e9f189d", - "sha256": "1bcgy40z5d1663rafh4vhbm8d24yxnbw23sagki4427sywinl11x", + "commit": "fb0dd36a02a45ae31a21da0fd5551843243f597b", + "sha256": "0kl8hwm7101i3pc949xj22d85mxmqhk86qbwjzbgxdh64lwp5hnc", "fetcher": "github", "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20210106, - 1632 + 20210131, + 1150 ], "deps": [ - "eglot", "s" ], - "commit": "e3dccd65a16a1675722b1eed7aca1a729a2fc8ed", - "sha256": "1wyc3lzvjl01cy18cyzq1xms4kid9iqkm31fxrv87awmzpxsvqi5" + "commit": "78898a1535878394d83643c383f4320e7b5fcefd", + "sha256": "0d60jfaf8av0b7vx44lbqzb7v70dszvr2w1yjh1cxn71dnjphp4j" }, "stable": { "version": [ @@ -38534,8 +39148,8 @@ "deps": [ "cl-lib" ], - "commit": "527567aa9f668e9fa63df7d258b82004473dd7e4", - "sha256": "1w1k193hc2ihi2wh9gbsp9wcwl2gxqia21868ad7v3xadyik0a6i" + "commit": "1488f29aa774326e5d6bf4f9c2823124606399b3", + "sha256": "1wyyxg3z7s7ga003pjik1116vrj5x9cssmk50s80b4xdxmw04viz" }, "stable": { "version": [ @@ -38592,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" } }, { @@ -38920,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" } }, { @@ -39033,11 +39647,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20210104, - 1919 + 20210131, + 1551 ], - "commit": "b53d56e467a77dfd6c26eec5b78e2241083b1408", - "sha256": "120yjlwf8pyrv5n0bdzxnr2lbppwgir4l8c128jq0cx3mbfamjlz" + "commit": "16c631cd6f2f2eeb11730442c9897008e1e10f7a", + "sha256": "1ygwvavwrhpjrgw58psawcwp01y8j0xhsvc2bywiz8a1d2pngn1q" }, "stable": { "version": [ @@ -39134,11 +39748,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20210103, - 953 + 20210221, + 2032 ], - "commit": "c7a427edf33ab1ebdca7d3df67d740f97037a950", - "sha256": "0lvgmfwlmyxgbyqlw8c79q79ramws88s746nckz0qyy5fckx0ri3" + "commit": "26dd2f4ae0f44879b5273bf87cdd42b8ec4140a1", + "sha256": "05xv5amg5pffgnrlcl0yjlx37p9m5hxllq6xn96sf8dcpgsiprfs" }, "stable": { "version": [ @@ -39205,11 +39819,20 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20201120, - 2054 + 20210226, + 1419 + ], + "commit": "0a227125a4112266c06ed7247de039090314b525", + "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "3b4bcc568ca9e537118f3b803f4218b0d57fee0b", - "sha256": "1lc2pgqjyanfwfykrg8a9d5kra4zihdvr612z9x927r16cj470ac" + "commit": "0a227125a4112266c06ed7247de039090314b525", + "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" } }, { @@ -39345,8 +39968,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20201216, - 2245 + 20210219, + 806 ], "deps": [ "dash", @@ -39354,8 +39977,8 @@ "magit", "s" ], - "commit": "00b0201cef4fd2ade108289a8444e1b354a882f6", - "sha256": "0k9bwxqd2zs3bbikqgfnshk7snycfxkzlipih4m0pcnpk1fdp6sv" + "commit": "19a8d6805541cede2523b70fa6601667b420f32f", + "sha256": "1aqcqyi4933p4cixrmjb2g1yghbdshir61q3l90igw6h6nfwbiiq" } }, { @@ -39506,37 +40129,6 @@ "sha256": "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0" } }, - { - "ename": "ghc", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5", - "fetcher": "github", - "repo": "DanielG/ghc-mod", - "unstable": { - "version": [ - 20180121, - 1218 - ], - "deps": [ - "haskell-mode" - ], - "commit": "391e187a5dfef4421aab2508fa6ff7875cc8259d", - "sha256": "1z142vgv72yfly7nyknzlcpm51sx5zqi26by3c7g68dbb4dxhq57" - }, - "stable": { - "version": [ - 5, - 8, - 0, - 0 - ], - "deps": [ - "haskell-mode" - ], - "commit": "35690941aadbe44d9401102ab44a39753e0bb2b5", - "sha256": "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q" - } - }, { "ename": "ghc-imported-from", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -39644,15 +40236,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20201211, - 1717 + 20210227, + 1925 ], "deps": [ "let-alist", "treepy" ], - "commit": "5fae5e31586a11a2025168030e0eb3876502611c", - "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" + "commit": "f26c1f7e575209da047e77c18d415f9dc11015e2", + "sha256": "1cvsslki8nkfh7j7fy0j3f21mf0qc5cz7hv0dm3hw7k25wkrbvb9" }, "stable": { "version": [ @@ -39842,6 +40434,21 @@ "sha256": "0fm62lm29wp1ljgyi6pqqkzwzps53cjjbj5j3y0c2013ry7va6c5" } }, + { + "ename": "git-assembler-mode", + "commit": "5f909805296a0959a6317ac6714784854108cfde", + "sha256": "1i894n7vhd1r86sbrkf3yr4fv6nc8y5wgqvx42csc0441988cp38", + "fetcher": "gitlab", + "repo": "wavexx/git-assembler-mode.el", + "unstable": { + "version": [ + 20210207, + 1545 + ], + "commit": "1243bdc1a9cdc79802ece05c90731ee14e4f92c9", + "sha256": "1rc8z2r8lxzx836j7nk61snps8r0szzifg0inzfv3nb2z8bsiw0b" + } + }, { "ename": "git-attr", "commit": "3417e4bc586df60b5e6239b1f7683b87953f5b7c", @@ -39995,16 +40602,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210102, - 1242 + 20210206, + 2245 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "25f432551347468ce97b8b03987e59092e91f8f0", - "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" }, "stable": { "version": [ @@ -40097,11 +40704,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210109, - 640 + 20210127, + 1100 ], - "commit": "5c2ae01562b3ff2def870ed822fd0869326977d6", - "sha256": "0bf12nfyhpvdbxajbwna2z19ii42ih8h4p8jrvgqvh0r3lhavdiw" + "commit": "cca61a1c6b0c0fd6ecb1b0366711c618581eabb6", + "sha256": "1q6qrrxa3mf3pkkqr8piaij3yrgqh48xrrn3a442wn2i427q63kc" }, "stable": { "version": [ @@ -40287,20 +40894,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20201214, - 2330 + 20210121, + 235 ], - "commit": "9a3e893751791b17db85d691444e50e346cb2bd3", - "sha256": "1jdgkjiv6pn2whim71fsyfady8lv180y56j9z6bfx3gg3pp2dcbd" + "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6", + "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75" }, "stable": { "version": [ 0, 8, - 2 + 3 ], - "commit": "9a3e893751791b17db85d691444e50e346cb2bd3", - "sha256": "1jdgkjiv6pn2whim71fsyfady8lv180y56j9z6bfx3gg3pp2dcbd" + "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6", + "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75" } }, { @@ -40491,8 +41098,8 @@ 20180318, 1956 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", + "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" }, "stable": { "version": [ @@ -40539,8 +41146,8 @@ 20180318, 1956 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", + "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" }, "stable": { "version": [ @@ -40671,21 +41278,6 @@ "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" } }, - { - "ename": "github-issues", - "commit": "f761e76236e9372d5fae6b5c5dcb1992c5d64d37", - "sha256": "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0", - "fetcher": "github", - "repo": "inkel/github-issues.el", - "unstable": { - "version": [ - 20160616, - 1841 - ], - "commit": "816f7712b0eb05bffec0add3507302862d2629c4", - "sha256": "1x6jbnx9lwgy64nl9lpp01xcj9cbx5fq435iwhiarjdsm4kvixb5" - } - }, { "ename": "github-modern-theme", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -40762,8 +41354,8 @@ "ghub", "s" ], - "commit": "db723740e02348c0760407e532ad667ef89210ec", - "sha256": "16d09z1p9ljpc6h2kj30qk6hrs5zgixxj7qrgi3i3kc5djcy2km0" + "commit": "d0c8234cf523818513f892f30153210606abb6be", + "sha256": "1d0g79mp14ngx5x0f8sc4lri40m3gh0ql6gzyqrl4c94lhq59cn7" } }, { @@ -40842,8 +41434,8 @@ 20180318, 1956 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", + "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" }, "stable": { "version": [ @@ -41190,15 +41782,29 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20201215, - 1900 + 20210225, + 1553 ], "deps": [ "async", + "ht", "project" ], - "commit": "8f46692749e05113d4d14870dd67c6efa06626c7", - "sha256": "1sjv3ydqv1gv2nqbdwywj52xc2b2ix9f8sjb14022v0bwywk3v2j" + "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26", + "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm" + }, + "stable": { + "version": [ + 0, + 7 + ], + "deps": [ + "async", + "ht", + "project" + ], + "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26", + "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm" } }, { @@ -41346,11 +41952,11 @@ "repo": "juergenhoetzel/emacs-gnome-screencast", "unstable": { "version": [ - 20200115, - 2230 + 20210125, + 2001 ], - "commit": "8c5e787230b2b8a51520ab970d5b505cbbc8f32f", - "sha256": "1zalx97b92vxjczm798arxyxhl29hla9c9j4da9ykpyspf3wry4d" + "commit": "6450ee470e84ff14a15c5c3c0489c79ff593f165", + "sha256": "0809psw8jz344hm4vzhapdr79l325dz57p88x509f8kq3fsvv44f" }, "stable": { "version": [ @@ -41510,8 +42116,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20210103, - 2050 + 20210207, + 1010 ], "deps": [ "async", @@ -41522,8 +42128,8 @@ "org", "s" ], - "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", - "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" + "commit": "1457bba34b40d5197aa14dbf0856925f83025ae1", + "sha256": "01jm2maa8q0zjpqa95c84k9b9jx5rgwvvhaqbwvw8ccz883mcdjm" }, "stable": { "version": [ @@ -41552,11 +42158,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20210107, - 1346 + 20210115, + 1107 ], - "commit": "6f13a00c5736c269ed850094cfbc9ea474e24dfe", - "sha256": "1x91da1vb48hn2qqdn144gj9n2sas252llcf5jlqqkl8w5wk6z3i" + "commit": "52f05e7431b5ce5487e8a990eb2ad01cade973bc", + "sha256": "178b8l2f5ykrq1yllg9rmn1vsyp3aqslrga1gxx1rc4grx22x31z" }, "stable": { "version": [ @@ -41972,8 +42578,8 @@ "cl-lib", "go-mode" ], - "commit": "fdf46fe0e110a8e0dddb5aac4ab20a93ee9c5d88", - "sha256": "00986s42kfyyxzvlwd2wvllxqkmiq0iajj1wahpdnsbajrrk14sc" + "commit": "49a538028e63dbe20f428c52d91f09b70b564626", + "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" }, "stable": { "version": [ @@ -42065,11 +42671,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20201204, - 1652 + 20210201, + 1458 ], - "commit": "fdf46fe0e110a8e0dddb5aac4ab20a93ee9c5d88", - "sha256": "00986s42kfyyxzvlwd2wvllxqkmiq0iajj1wahpdnsbajrrk14sc" + "commit": "49a538028e63dbe20f428c52d91f09b70b564626", + "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" }, "stable": { "version": [ @@ -42188,8 +42794,8 @@ "deps": [ "go-mode" ], - "commit": "fdf46fe0e110a8e0dddb5aac4ab20a93ee9c5d88", - "sha256": "00986s42kfyyxzvlwd2wvllxqkmiq0iajj1wahpdnsbajrrk14sc" + "commit": "49a538028e63dbe20f428c52d91f09b70b564626", + "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" }, "stable": { "version": [ @@ -42391,11 +42997,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20210113, - 1945 + 20210208, + 124 ], - "commit": "8b7d223eca9b26acb0e3eca4b58d39a3b933bf08", - "sha256": "1s0smkprlnmml4a2rqhzb81mz7dlxswnvqsn3wra4brbrs3almhi" + "commit": "b014b2414fad8bb3a9a7b6a7e765822887c28fe8", + "sha256": "1p3pagldf17mpyv0qmks5hq8y4q59bim0zh42p3b7c4y89nv7qw7" } }, { @@ -42528,11 +43134,11 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210105, - 903 + 20210123, + 159 ], - "commit": "beac144c37227d23e5ceefb8ce1f45aa484ca5c9", - "sha256": "1yv07vpgqla7nk0imn7dlzsv392jvhk3w63frvhcmijq5ciafc45" + "commit": "5d0479e5a0fe1589fe549f2fc1966f80a4718a4f", + "sha256": "046iimmkljbfcz66cj73cnizxn15hw7bzi3glls2h6vh8sxak7d7" }, "stable": { "version": [ @@ -42570,8 +43176,8 @@ 20180130, 1736 ], - "commit": "d5b510476350b9ba99a83a7ceee114012f515394", - "sha256": "169aijgk0viyyq3s6sw6fl61ajw6gan9kwv2igawwki5ljfc2rkr" + "commit": "6e239d7f906ee456b926be229f3e4ee6bad53e42", + "sha256": "04mz13p5n6az94mq0mhd1zw7jdpf26sm4mk0p2r92vfy2xqnjqnd" } }, { @@ -42752,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": [ @@ -42774,8 +43380,8 @@ "go-mode", "s" ], - "commit": "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9", - "sha256": "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7" + "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60", + "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12" } }, { @@ -42930,8 +43536,8 @@ "magit-popup", "s" ], - "commit": "c43a1c86c89e6e30e54d4a21b2d95c03c6ed0c4d", - "sha256": "0d43gkppk06w58xsawbnil83170k6h387jr5a4v48zy2amdq7rp2" + "commit": "ee5d4c3f398dbd307c06cb092361268ee4afc60c", + "sha256": "0nx4zgafgwhzddsyvb4im0rm0k6bvd0lialr9k21mvs2amxpwmq7" }, "stable": { "version": [ @@ -43151,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": [ @@ -43435,11 +44041,11 @@ "repo": "fredcamps/green-is-the-new-black-emacs", "unstable": { "version": [ - 20200529, - 242 + 20210203, + 1511 ], - "commit": "9b682c0000bc732e4c55e876ac968877eada0402", - "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj" + "commit": "09f6908064dd1854379a072d7cdd706959256299", + "sha256": "1ad676aiyj0p8jxpmkb0mhfznd6hzpdliji56ix6sbj5jdyxm8jv" }, "stable": { "version": [ @@ -43546,8 +44152,8 @@ 20200725, 725 ], - "commit": "7a37b76342ebcc30b08b1a6a7d8a043d7fede5b2", - "sha256": "0mcyj8g1d124zpif9m4x911d877fdf3hahdpp76grsvn2qpzq2az" + "commit": "1aebf9c36ecfd6523e84fe092faa6ff06ce2177d", + "sha256": "1m86b1x4rkxy1m3q3yj564jihhxcw8ysbfxc38vl75ldnsgvbmy8" }, "stable": { "version": [ @@ -43678,20 +44284,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210115, - 646 + 20210127, + 432 ], - "commit": "7a3437feb777996dcb8f484b79e898cfdb714bfe", - "sha256": "0jfz54phg3db8cgp9sj1grvj3sf10jaq359024j72l71s5cqwmlx" + "commit": "4ac2bf3877e3af7d23ace3165b9c8ed536ff4832", + "sha256": "05nw45hgbygfvbymghsp425474d4nrgl8pjii8jwd1ym155bf13k" }, "stable": { "version": [ 1, - 17, + 20, 0 ], - "commit": "6820ae3aa9203f5e23e0cd80f51b410aaf1d32f3", - "sha256": "0sf3lkdvqb55bin8bx5jd06ncqiy9lkx7mx5i8q27r8wmi58q7v6" + "commit": "e7f0fca4bfd4815e5ed794f13f89b1e28ce57d26", + "sha256": "15h1h5gg369h2dm9yp97ac6l5qajm7f9c0s2cgpymv21gyx2ikr5" } }, { @@ -43803,16 +44409,16 @@ "repo": "wbolster/emacs-gsettings", "unstable": { "version": [ - 20190513, - 1003 + 20210208, + 2042 ], "deps": [ "dash", "gvariant", "s" ], - "commit": "3009335a077636347defd08d24fb092495d16d3e", - "sha256": "0xvj0p533laxvhv9jvgdzw5pix6zlai3jp43n2bi0kwmq21clwgz" + "commit": "1bd1909a22121a8200cca678302f1533856b9008", + "sha256": "1g195dg359iff4cq5ywwd5jjxwhvwd4qj6j8631g7wkjz1rx7bxb" }, "stable": { "version": [ @@ -43908,14 +44514,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20201229, - 1021 + 20210217, + 1507 ], "deps": [ "cl-lib" ], - "commit": "afbc3456ebdfe4bb5f8754a91c8398f8b5b7636c", - "sha256": "1x0f3v98p6lxb31rgkv2a9kr5jqrmvpsa7nqr960s41rkyx4wvi6" + "commit": "e7decda098ee6819b37bacd958260c7c789962cb", + "sha256": "0d0348knda33qb9l729bz5ccig49hhw15dbjayl9y6l23nlwx7yg" } }, { @@ -43990,8 +44596,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20201222, - 907 + 20210224, + 1601 ], "deps": [ "bui", @@ -44000,8 +44606,8 @@ "geiser", "magit-popup" ], - "commit": "bb2a0539f8d68b2292b3d0f3174c139b4c304028", - "sha256": "1qf584slf4lqg4qgxj7vblmx0f0jgas03m5cc93a3wfkgkfm19w6" + "commit": "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31", + "sha256": "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k" }, "stable": { "version": [ @@ -44173,8 +44779,8 @@ "deps": [ "s" ], - "commit": "9079bc333e715a13e57ab366522b15d0307e32cd", - "sha256": "0qigmp1fwphp909vq0h4kj5m97knnwjvjw3w9d1i074gwdq54j9g" + "commit": "847fd910e9d0ac76e2cfeb87512e6923a39d7d5f", + "sha256": "1h2j1gbs47l5njny174146b2naf1wv3bgwv932abhjamj7vl06mq" }, "stable": { "version": [ @@ -44220,20 +44826,20 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20201019, - 5 + 20210226, + 1226 ], - "commit": "c793275565372f63bf9dc1229d5b893a5bd0278e", - "sha256": "1fld3q2j58ka130v7gqm24ngw5ghy9vk63141y7bkjs5zb8mahpl" + "commit": "cea521750eddb3a70ccd38789d12b09bbdc7e906", + "sha256": "0mc9v8az97kap11f8np55xkbrl4mbiy6jfg76jaagkdsfizqpx5a" }, "stable": { "version": [ 0, 6, - 0 + 1 ], - "commit": "aec997970f2c2f8e0077c1f6584e4d1996ae3864", - "sha256": "15asarr271p582xbmhvhh9q0lgka25h6k65xh82rqvig4mirhn1l" + "commit": "c9c2bb0f13f5bd64c74dbdf945d9613192c0e454", + "sha256": "17lkjcka6ydd6khhz5jbjlybfpx05153z0d8s1rxaxcwl7z2y6cf" } }, { @@ -44638,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": [ @@ -44695,8 +45301,8 @@ 20181110, 1859 ], - "commit": "f33ba22a6e5060fb14c9fd3dda728d6724f2f9dd", - "sha256": "1lmr8j2g7v3jn2q9h65c7qhzzk4asz0mlqarnl2h0g7xjk0wmi6z" + "commit": "57e8ac22bd499b632ab94657b855c7c43b166dda", + "sha256": "11792hjxfsnkfwj3q2v6d090x6klf5g257dd75casnsadrlbka2b" } }, { @@ -44949,16 +45555,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210114, - 1521 + 20210223, + 2045 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "d0073fd556e5e2296b4fea824929dfab9b1895b8", - "sha256": "0wz12f190vsp71bcwygvagksqfihm85rj80bc4a3sx96wyrdjbqm" + "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51", + "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p" }, "stable": { "version": [ @@ -45044,26 +45650,6 @@ "sha256": "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4" } }, - { - "ename": "helm-addressbook", - "commit": "4bb805b0f2d2055aa4e88bd41239d75ec34f5785", - "sha256": "1d8byi6sr5gz1rx3kglnkp47sn9dqdd83s12d84wyay06ix3cqqi", - "fetcher": "github", - "repo": "emacs-helm/helm-addressbook", - "unstable": { - "version": [ - 20170903, - 728 - ], - "deps": [ - "addressbook-bookmark", - "cl-lib", - "helm" - ], - "commit": "62497f72d46afd3a9f9f94b27d062a82fb232de4", - "sha256": "1lmq7j19qv3pabs5arapx3lv2xhf0sgn4b2hl0l0kzph52fvics7" - } - }, { "ename": "helm-ag", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -45271,8 +45857,8 @@ "cl-lib", "helm" ], - "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", - "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" + "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", + "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" }, "stable": { "version": [ @@ -45877,14 +46463,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210105, - 504 + 20210211, + 1417 ], "deps": [ "async" ], - "commit": "d0073fd556e5e2296b4fea824929dfab9b1895b8", - "sha256": "0wz12f190vsp71bcwygvagksqfihm85rj80bc4a3sx96wyrdjbqm" + "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51", + "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p" }, "stable": { "version": [ @@ -46170,26 +46756,6 @@ "sha256": "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb" } }, - { - "ename": "helm-elscreen", - "commit": "dfe42a7fe2dc051c6c49aa75bce89bfe1b5fdbbb", - "sha256": "186k66kf2ak2ihha39989cz1aarqrvbgp213y1fwh9qsn1kxclnd", - "fetcher": "github", - "repo": "emacs-helm/helm-elscreen", - "unstable": { - "version": [ - 20170709, - 914 - ], - "deps": [ - "cl-lib", - "elscreen", - "helm" - ], - "commit": "b8212866939dc4a1e1dc23ad572407b688e130e3", - "sha256": "0gy6lbdngiwfl9vfw32clagbmv70f93slc9zkm3dz3mca37435kz" - } - }, { "ename": "helm-emmet", "commit": "acbc5e9fab159ad2d63b10c0fa6ac18636bb2379", @@ -46404,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": [ @@ -46742,40 +47308,6 @@ "sha256": "1dacvnkqqiax02c627z9qi61iyqgr0j3qqmjp29h0v494czvrdbs" } }, - { - "ename": "helm-ghc", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d", - "fetcher": "github", - "repo": "david-christiansen/helm-ghc", - "unstable": { - "version": [ - 20141105, - 1459 - ], - "deps": [ - "cl-lib", - "ghc", - "helm" - ], - "commit": "e5ee7b8d3b745d162553aecfbd41381c4de85f35", - "sha256": "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is" - }, - "stable": { - "version": [ - 0, - 1, - 0 - ], - "deps": [ - "cl-lib", - "ghc", - "helm" - ], - "commit": "d3603ee18299b789be255297dc42af16dd431869", - "sha256": "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn" - } - }, { "ename": "helm-ghq", "commit": "e94eec646def7c77b15f6a6ac1841200848e62c7", @@ -47230,16 +47762,16 @@ "repo": "yyoncho/helm-icons", "unstable": { "version": [ - 20200719, - 1359 + 20210219, + 1752 ], "deps": [ "dash", "f", "treemacs" ], - "commit": "d8c15dc61c1f321686b447e83abb17e14bc6f1c6", - "sha256": "0na4nks6l7917r64rc49b38lwsdj7wvslnnikms92882z5c8c6nn" + "commit": "5a668ef21ba02bf1fce2db18950858c769bf5d05", + "sha256": "0n759vnymjgpf24kn7704vj8l1phsnjrgllqhcv1c50fsni1fajl" } }, { @@ -47474,8 +48006,8 @@ "helm", "lean-mode" ], - "commit": "cc1f5fadf8e9ae08aa25828985edc97df04d94a7", - "sha256": "0v03bisr0ljk1ypbicgh9izxwazz8ry5xcd7r1lqb339xqb0bzqb" + "commit": "15bee87dc4080b87c543964375b7ce162317ab6f", + "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4" } }, { @@ -47621,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": [ @@ -47974,18 +48506,19 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20210111, - 1022 + 20210228, + 1853 ], "deps": [ "dash", "helm", "helm-org-ql", + "org", "org-multi-wiki", "org-ql" ], - "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", - "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" + "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2", + "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5" }, "stable": { "version": [ @@ -48176,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" } }, { @@ -48771,8 +49304,8 @@ "helm", "rtags" ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -48897,8 +49430,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20210108, - 1818 + 20210221, + 923 ], "deps": [ "f", @@ -48906,14 +49439,14 @@ "s", "searcher" ], - "commit": "d27c7cafc79b6e5e11881014eee9817e3897762f", - "sha256": "117m2c8ms66gqwsxgdwywx166bif2i2y5dgq1w0yw5j4h02q3ji7" + "commit": "181f60cb8505aec05393a9dbf414733d19f76d2a", + "sha256": "06bnnbay56ngiddkvvwmy3fv4v2gjss8gm7gjcp2064m9njgw5mx" }, "stable": { "version": [ 0, 2, - 4 + 5 ], "deps": [ "f", @@ -48921,8 +49454,8 @@ "s", "searcher" ], - "commit": "7b3016faeca201843d849c00d11665a90c1709fb", - "sha256": "07whjqsi7jq4i3fypzasq2iivsj025x3701wfgsj2f02xyvgfk4p" + "commit": "3c0e4997126b5e7ba2db2dba8f1dbc5cb92d2459", + "sha256": "1fcinlxrvzmlrn17gfpv3n2wf9si084p6yi3jg0jzagnprris8lx" } }, { @@ -48952,25 +49485,26 @@ "repo": "emacs-helm/helm-selector", "unstable": { "version": [ - 20201219, - 1639 + 20210125, + 857 ], "deps": [ "helm" ], - "commit": "6a943b9952c749c2a83c284cfcf5b56f5f6622ad", - "sha256": "0msc8byspjd0ygpbnxkiv2g9qv5kxpcp2vh2sjg7yxrfbishj8hq" + "commit": "4da4711c4cfd14527abe20d66787beeb49171b26", + "sha256": "01lh1df0bnas1p7xlqc4i1jd67f8lxgq0q2zsvx10z8828i76j3v" }, "stable": { "version": [ 0, - 5 + 6, + 1 ], "deps": [ "helm" ], - "commit": "7542a6dffe338db8109b0233e4d4c8f4b22354a0", - "sha256": "1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63" + "commit": "4da4711c4cfd14527abe20d66787beeb49171b26", + "sha256": "01lh1df0bnas1p7xlqc4i1jd67f8lxgq0q2zsvx10z8828i76j3v" } }, { @@ -48991,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", @@ -49033,30 +49585,30 @@ "repo": "emacs-helm/helm-sly", "unstable": { "version": [ - 20210114, - 1928 + 20210205, + 1424 ], "deps": [ "cl-lib", "helm", "sly" ], - "commit": "7fbd6544511d8669c8122b6a9128fd09e835c3fe", - "sha256": "061qihf8fwka7jpcvn1z76rcjbipfri41xfkn17i7pg4nzmqhaaw" + "commit": "3691626c80620e992a338c3222283d9149f1ecb5", + "sha256": "06x8wyx1r0s7askkvlbklgz1cszv34qsvv3gryndw350smk1v8kx" }, "stable": { "version": [ 0, - 5, - 1 + 7, + 2 ], "deps": [ "cl-lib", "helm", "sly" ], - "commit": "ccf8e83644bc1b2113eab46693e64d3f0c56198f", - "sha256": "13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx" + "commit": "3691626c80620e992a338c3222283d9149f1ecb5", + "sha256": "06x8wyx1r0s7askkvlbklgz1cszv34qsvv3gryndw350smk1v8kx" } }, { @@ -49203,26 +49755,26 @@ "repo": "emacs-helm/helm-switch-to-repl", "unstable": { "version": [ - 20201214, - 1216 + 20210206, + 844 ], "deps": [ "helm" ], - "commit": "e6cae905c9d224bcca02437696afae7d6633c4a9", - "sha256": "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2" + "commit": "f0e732e7217fc0373b0805245fa15920cf676619", + "sha256": "0n8qa549c5syvgqw1h2zrakjjbygddpxzaifaq5irscgdcajrads" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "helm" ], - "commit": "e6cae905c9d224bcca02437696afae7d6633c4a9", - "sha256": "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2" + "commit": "f0e732e7217fc0373b0805245fa15920cf676619", + "sha256": "0n8qa549c5syvgqw1h2zrakjjbygddpxzaifaq5irscgdcajrads" } }, { @@ -49682,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": [ @@ -49896,6 +50447,30 @@ "sha256": "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf" } }, + { + "ename": "hiccup-cli", + "commit": "524a84be8692bd29b93e4897467e2e798be5fa53", + "sha256": "0xv6bq2ryz71lqqm1z6wg0lf1qmqwydg17zi614dsajsa5xhrjkb", + "fetcher": "github", + "repo": "kwrooijen/hiccup-cli", + "unstable": { + "version": [ + 20210208, + 652 + ], + "commit": "b56ae0d5cd5ce3ef24ed13be5103e231c91ef4e2", + "sha256": "0cl84mlgrjwjxgk2kx4930rarxyc6n07lvy54gmb907i4l6flw61" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "cfbb957a1f86bc1d28e778bfdffdeaaa2ae79286", + "sha256": "0f3b7wsq9b0xswvj4073ykkcc36kybz16bz4q068qziig22d9szb" + } + }, { "ename": "hide-lines", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", @@ -50151,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": [ @@ -50392,26 +50967,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20200904, - 2236 + 20210201, + 148 ], "deps": [ "cl-lib" ], - "commit": "1917b7b9ac2cb3dcb152f4435de61d1858a4064b", - "sha256": "0rpmmzwjqij5v8k33qlpq323za96447pdwrwzwk4474n4v5xsp50" + "commit": "e146d672ea4c00fe17018e7e76e49d59570eeb2b", + "sha256": "0bcrlw76nihbffm7p5jh9vf3r1756p6vwa7hbwp933r4caaiyqid" }, "stable": { "version": [ 5, 3, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "1583be4a8a01b765841f7306284528ae713abb7b", - "sha256": "1l8v3vq3yw7zr1yxyscfw8lggcf0klnyszhv18505c6myybp2dkp" + "commit": "e146d672ea4c00fe17018e7e76e49d59570eeb2b", + "sha256": "0bcrlw76nihbffm7p5jh9vf3r1756p6vwa7hbwp933r4caaiyqid" } }, { @@ -50493,10 +51068,10 @@ }, { "ename": "history", - "commit": "f51d4cc6521546c99197adeb35459fcd53bd67d4", - "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g", + "commit": "d1172402073d66c671de75ddf5c9b6ac3f6d64cd", + "sha256": "14n0h6lca450w68lk20q98bdbkfadmsqmv1sb73m0pnvzyh5c04z", "fetcher": "github", - "repo": "boyw165/history", + "repo": "tcw165/history", "unstable": { "version": [ 20160821, @@ -50607,8 +51182,8 @@ 20201126, 818 ], - "commit": "82f42045c11ad8c6f13db3a32dcda970a378d164", - "sha256": "1ydks5mrzsxj7q3kvv8ji6vy4jxfra7lhd3vfyqldp3inhz3rpkz" + "commit": "05a8c5119c717f53e2e9c279d316f04dd744b9b3", + "sha256": "11pa6nlpisaba9db0a8iqs86m4ly93cnd8rszd051dg3av8snx67" } }, { @@ -50677,11 +51252,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210105, - 744 + 20210117, + 1140 ], - "commit": "9661a462d86b22293caaa4c3d94f971a15dbf1d5", - "sha256": "0w0l990wqdv9fdxf8a02fx0aj6ffp83jp3zh81jf3j5i0l75xfkr" + "commit": "4d18ccde596aef84ef278aa60144390ab41f0046", + "sha256": "0r9yz485g393yh4nh1a8nqhk1yxjapq2dzjs3l13ld34hql776yc" }, "stable": { "version": [ @@ -50709,8 +51284,8 @@ "htmlize", "popup" ], - "commit": "bad680b33c2ca20a6088986a10735a5df3cb9996", - "sha256": "0vd2fn011l5iqi1ja8j3l0wq90wr70b8dk75mh3xrrl8jp55xwxl" + "commit": "f1deebb0cbe9ca040856d3cc99942335250d9566", + "sha256": "0hnmia3c052php3i2g1sbsp402fgi17yv6as044ck617p7avz971" } }, { @@ -50849,6 +51424,26 @@ "sha256": "1dd0k7r5kx15sph12vzakhq27zh7vy9r541qdp8w5051k6apw3pw" } }, + { + "ename": "holy-books", + "commit": "6b74662e2f4bee4b7c06be029bfa75eca35d5d86", + "sha256": "1s9kkjnbmm7vxh767asmnv4h040ksyqzhn3h7x5h0iszhrp6nmp2", + "fetcher": "github", + "repo": "alhassy/holy-books", + "unstable": { + "version": [ + 20210227, + 2225 + ], + "deps": [ + "dash", + "org", + "s" + ], + "commit": "53ee29d1b1a1a9cbd664c318b01aa1c13011efff", + "sha256": "0n7qnr23h22lsp2n19z3j30zq6l2rvqj1mldkaki0gvw5whi4r3w" + } + }, { "ename": "home-end", "commit": "f67c9cf33e0f11a9bd6e1521af86d180177111c4", @@ -50863,6 +51458,17 @@ "deps": [ "keypress-multi-event" ], + "commit": "fbddad2c1268720ce17662a232b48f666e489526", + "sha256": "0wabzpah1vkg8ns21agvrs9s7rm1r0cxghmfv6c2zq71886glv1y" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "keypress-multi-event" + ], "commit": "30676ceec0d4ad84038cd0d65ee45ae810ab185c", "sha256": "0czvnk74988p6gqz5jz83gkvvqdrdmzn4qz6cc8dmbyxk1zg6l8y" } @@ -51064,16 +51670,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20201002, - 1901 + 20210217, + 1723 ], "deps": [ "org", "promise", "request" ], - "commit": "e7c2e75a0365bca16e8910e295f330c35fa016ae", - "sha256": "1wsbd4rjfh27w5qzrzd1h6xpqp7s5amw33wdaa2cfp7c67pnm4kc" + "commit": "27e9e015b930175896c07536c25e379a4e1997af", + "sha256": "14f3fqz8sjmjh7si5gk31fh7bnvc9p1rfd9p2l39zvasvk1sxki0" } }, { @@ -51084,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" } }, { @@ -51120,25 +51726,25 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20210113, - 822 + 20210119, + 741 ], "deps": [ "dash" ], - "commit": "5876209c9712bd1acbbf1d31f6e3293e5ab88971", - "sha256": "03cn43vd2zq67hzb1hy82b7lshzslxzndjj1z1liv1kspww2hkch" + "commit": "c4c1be487d6ecb353d07881526db05d7fc90ea87", + "sha256": "1i3ps5zrr719nrcrsyhlmfdazzcz1agrmx424mbyca5vra8cc35i" }, "stable": { "version": [ 2, - 2 + 3 ], "deps": [ "dash" ], - "commit": "a23a72342fda1eb3cc8d792f86efabe45eb0d1fd", - "sha256": "1p3qa7g0wa0wbviv2f8bda39cjys3naayk5xjm3nxxmqsyy8papx" + "commit": "2eddb85a66508ad607e94fd8384b18feb07a2449", + "sha256": "0can9v336lgnq0q2ha3js0565jzp3dlwwqxhcbx5swk5kp148f07" } }, { @@ -51703,6 +52309,24 @@ "sha256": "1r5h55zcm5n2vx126q16ndhgdchcj59qqcybhsqw69vk02x96arg" } }, + { + "ename": "i-ching", + "commit": "28b05f2e04d286f3115e33e9d3e717caef8a0a46", + "sha256": "14g095dd8gzp64xwnnha1smd5jqgswzfaw9vfz4ihyglsjvl23m1", + "fetcher": "github", + "repo": "zzkt/i-ching", + "unstable": { + "version": [ + 20210222, + 1519 + ], + "deps": [ + "request" + ], + "commit": "51a3180ed07ae9f8b7ff3f2b822d998495864a07", + "sha256": "1rrykszzcyvrmks2clrpdq5kdldcqp38wc908bhq2b4qw7w3d7sw" + } + }, { "ename": "i2b2-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -51810,19 +52434,19 @@ "repo": "muffinmad/emacs-ibuffer-project", "unstable": { "version": [ - 20200210, - 2252 + 20210205, + 1940 ], - "commit": "8cc8c96cb15874dd55cdbfce759f528de0046f9f", - "sha256": "0ysjyirw9gkrs8wivvvxfgdq8radpkl6nhh2a0ac3s42vrwbf9g1" + "commit": "2483d2dbd715c4bd892d1fbc968a17a01888cb2d", + "sha256": "165g2lsg8apdpn7i36h0x5j80clpjpf3d1d1l8g8ahf5280flcfw" }, "stable": { "version": [ 2, - 0 + 1 ], - "commit": "8cc8c96cb15874dd55cdbfce759f528de0046f9f", - "sha256": "0ysjyirw9gkrs8wivvvxfgdq8radpkl6nhh2a0ac3s42vrwbf9g1" + "commit": "2483d2dbd715c4bd892d1fbc968a17a01888cb2d", + "sha256": "165g2lsg8apdpn7i36h0x5j80clpjpf3d1d1l8g8ahf5280flcfw" } }, { @@ -51880,11 +52504,11 @@ "repo": "jojojames/ibuffer-sidebar", "unstable": { "version": [ - 20180219, - 131 + 20210215, + 1849 ], - "commit": "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc", - "sha256": "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz" + "commit": "59e20690fc4f5ccd751e7a13a60664b97f053a1c", + "sha256": "1z6japr7n950222x33jinb34z7j6n5spj9cn8nq8f8yf8rgp6n2j" } }, { @@ -51978,11 +52602,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210105, - 500 + 20210227, + 2146 ], - "commit": "288166784de29db2f5f61722cc11151deca3f34a", - "sha256": "0if14qqixkkg8nfikfzhqqnsclhkbx4n8885gm9w0zlibkcj65pk" + "commit": "e490b01f7420bc15bc8e7b4594964208c3d31107", + "sha256": "1b069vnjlwnwk62332ndwizjp44dhjxvajv2nndpxqrkpqg9s8jb" }, "stable": { "version": [ @@ -52001,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" } }, { @@ -52182,17 +52806,17 @@ }, { "ename": "ido-complete-space-or-hyphen", - "commit": "59e11094068d3a0c0e4edc1f82158c43d3b15e0e", - "sha256": "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc", + "commit": "af424a73243aabec86c5bcd688a0cf29ad57199c", + "sha256": "084lgxjq2wfvhp1pv0dcn3ac8hy6jhjpyv1bxan6pdr2v5bc0lz2", "fetcher": "github", - "repo": "doitian/ido-complete-space-or-hyphen", + "repo": "DarwinAwardWinner/ido-complete-space-or-hyphen", "unstable": { "version": [ - 20180929, - 150 + 20210206, + 1505 ], - "commit": "ed60ebed113e4e1552efeab0c416f7c88428268e", - "sha256": "15h0alwi7qfqyi7w7gdl06ykxvafbx1p4614rg81kmzgs4dpqgy3" + "commit": "d1244243e042b8d5b6b991db752a17a44ea169bc", + "sha256": "1gl646lj1i2yxmgrgwd0sz9abq3zqf9z4qkl6ilp49ijk4cks63g" }, "stable": { "version": [ @@ -52211,16 +52835,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20210103, - 1621 + 20210206, + 1750 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "f91e5a1d696c13db029fd62806fe9bcb9702be26", - "sha256": "0yhl6wa3fkvkfx87vhjl8dhn3igzrilby2vxhllgysb5kbd9adzc" + "commit": "36a8bb93a59a16c8d5a5163c8cfde3770a1052df", + "sha256": "03v0d93fwp5k2n8mmkj3szqm80ilbzkqqdaz5v1v2ar0p4sajl8v" }, "stable": { "version": [ @@ -52463,11 +53087,11 @@ "repo": "creichert/ido-vertical-mode.el", "unstable": { "version": [ - 20201012, - 1514 + 20210205, + 436 ], - "commit": "5a6e17048528c328c129db6dccfe605f301ddef2", - "sha256": "19mwbz6a67a76pm9820w3rvz0mb54gx09nq5fzz4lkwn94578kyn" + "commit": "b1659e967da0687abceca733b389ace24004fa66", + "sha256": "0wihhkbcfsfy3drqhg443vlz931c0nvpr9rdmp8l8m33ca1bbx5i" }, "stable": { "version": [ @@ -52539,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": [ @@ -52585,11 +53209,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210114, - 1621 + 20210203, + 23 ], - "commit": "dc3b419f1b945bd806bf40b7a478e7a2144c2077", - "sha256": "1xqq0hl8wcxa64pfn11pxcb7gcfgczaw166h0qksczwib2v4racc" + "commit": "0d6d2387188763a88cdf84f749e6f32d5a72bbd6", + "sha256": "0v34zqbfr7z3mr5c9nyksxkdgmnyvvsr9zaq202hhq25lwlhrkpq" }, "stable": { "version": [ @@ -52681,10 +53305,10 @@ }, { "ename": "image+", - "commit": "02d7400477a993b7a3cae327501dbf8db97dfa28", - "sha256": "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg", + "commit": "98ecbfb97550c3dfffaab63fcfe27786f3574bff", + "sha256": "14xcb0a5ihq16amri3n8avbg1jjx4hg3dnynxd4903gig72kywbx", "fetcher": "github", - "repo": "mhayashi1120/Emacs-imagex", + "repo": "emacsorphanage/image-plus", "unstable": { "version": [ 20150707, @@ -52840,11 +53464,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20201204, - 801 + 20210223, + 1226 ], - "commit": "17b586307065f868a999e58fab30749d1b722aa2", - "sha256": "14c48zgdi54i9yz8ya6vgclafzqpfnjxsxf4dvzxcn74p4sb246z" + "commit": "b5d191c9168918a47373c70e97ae83ba46b946f6", + "sha256": "10qj11q35q9ck5dlkv26ra5zy5p3jckb24jl7y050af0fip1m0vd" } }, { @@ -52855,26 +53479,26 @@ "repo": "vspinu/imenu-anywhere", "unstable": { "version": [ - 20190512, - 1939 + 20210201, + 1704 ], "deps": [ "cl-lib" ], - "commit": "88b0e120284058b32252e4b0ed1a07c9fe44092f", - "sha256": "1w0n4hx29zc6n06qfq3ryc4dcfmk7wx3lw083yv7fi12hjj255vm" + "commit": "06ec33d79e33edf01b9118aead1eabeae8ee08b1", + "sha256": "0lbwfhcl40ayxskvmsvdrg8p63qp086xpzw61bqk4b3fxndxl04h" }, "stable": { "version": [ 1, 1, - 4 + 6 ], "deps": [ "cl-lib" ], - "commit": "fc7f0fd2f19e5ebee70156a99bf87393123893e3", - "sha256": "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5" + "commit": "06ec33d79e33edf01b9118aead1eabeae8ee08b1", + "sha256": "0lbwfhcl40ayxskvmsvdrg8p63qp086xpzw61bqk4b3fxndxl04h" } }, { @@ -52985,11 +53609,11 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20210109, - 1653 + 20210126, + 1127 ], - "commit": "288b367ea0efccd5e98efbdf925591ffc989a654", - "sha256": "1y62yfg67lnbc89l6k4gw5fibahnlpn23g415a6zdk2vz89n6y0k" + "commit": "c5684a17c78e6e05ea0bdb63e44373b064db935a", + "sha256": "09fw0bgqr7fhwhm7vgdd12iw9nbgn19qna7k6vv1ljsdfcmwg5s5" }, "stable": { "version": [ @@ -53192,6 +53816,30 @@ "sha256": "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5" } }, + { + "ename": "indent-control", + "commit": "c2c3a73f54091f5347877d51a68b0e009253583b", + "sha256": "0nd7crp6k1mklhz0y1zypc3jmjfydy6d1ksx24sm9zj83i3fp339", + "fetcher": "github", + "repo": "jcs-elpa/indent-control", + "unstable": { + "version": [ + 20210117, + 356 + ], + "commit": "ec9238bb204875d0d789e077c84c1d2ffe4e8173", + "sha256": "1r61jvbx57gqlfq2kkbxwz4rsidj6dig4czkxjnb01nigzp0y58c" + }, + "stable": { + "version": [ + 0, + 3, + 4 + ], + "commit": "2594740d8e8b324722d133a2db051ba4941eb170", + "sha256": "0v42lv5ig5hpnc02saqqmrjcvy8n216s7jnlc4f9jjyl7bl7lfsx" + } + }, { "ename": "indent-guide", "commit": "5d7110054801e3af5e5ef710a29f73116a2bc746", @@ -53332,8 +53980,8 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20201103, - 2040 + 20210222, + 1110 ], "deps": [ "company", @@ -53342,8 +53990,8 @@ "json-process-client", "seq" ], - "commit": "b870d1ed6b350d3753e7a148c61c373ca76ba78a", - "sha256": "1fscqkpk3z6pxgy1kf548jbck5p57k02badm7j8ggixbvng63d3g" + "commit": "32487a432d6c0728e1fd69db61c4a07b94bb5798", + "sha256": "11s3mn096bsbsrj14h9wpi0721yhlnnd434yswgj6m12k1wpdmzq" }, "stable": { "version": [ @@ -53385,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": [ @@ -53437,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", @@ -53669,6 +54341,29 @@ "sha256": "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih" } }, + { + "ename": "inheritenv", + "commit": "40b820a8d2f250b2bc67082049bafe712c329da3", + "sha256": "13ah98c141lvrm4yq6mryk2ji2fl3vnac6vp8lgri8rpvwkk46nz", + "fetcher": "github", + "repo": "purcell/inheritenv", + "unstable": { + "version": [ + 20210204, + 354 + ], + "commit": "13c0135ddd96519ddeb993ee21163d6e11b4f464", + "sha256": "1zwj26mxc4md4ar79pfdi8i4v2qr9bdrqjb8ykal524gqm79xsb9" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "bc680a2670156cd482edba83d8c81142282174ba", + "sha256": "0ygzf70vfb7qwpsllcq5i3brprsnx3sxy2zng02mzwrr5jkx4ypc" + } + }, { "ename": "ini-mode", "commit": "000cca577d000bafe7bf5711d0bfe7593fb6975a", @@ -53789,8 +54484,8 @@ 20210109, 1112 ], - "commit": "c010838770bad2a3fc37fcb5c497bf92d5aca27b", - "sha256": "0pf5q4n4p2szmvgh6zcfb7q9p58fac3k5bvqxq6wialz14m779lr" + "commit": "e8ae7b2345b8b21dd866fc043906ceecd40832c7", + "sha256": "19fxqb6x05480wa4dp4mv2a6cw5sgc8bsm3syqpbhmflymfvxnsy" } }, { @@ -54060,8 +54755,8 @@ 20191129, 958 ], - "commit": "383eb955bf0084a6e6ec03c9bd34511e20e0407d", - "sha256": "11bm00pw0bg8z6b5gyfmb2iss5libp6m4x0mc8agazabxzhmzyx9" + "commit": "e1791a96a2633a9f5ea99fc0a20ebacedcefdaaa", + "sha256": "1biysf8cqfw4q7d2dnlisviign3n5knvrb0g6zdalzv8pnd1cxqr" }, "stable": { "version": [ @@ -54073,40 +54768,6 @@ "sha256": "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h" } }, - { - "ename": "intero", - "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", - "sha256": "1a25lsm1psjvn9az3vd0an46p9qwrrmn09r16dqnhsjcaiabinxi", - "fetcher": "github", - "repo": "chrisdone/intero", - "unstable": { - "version": [ - 20200125, - 848 - ], - "deps": [ - "company", - "flycheck", - "haskell-mode" - ], - "commit": "fdb0550a2ddb5692d470336aa4a057717d572695", - "sha256": "0myjhj416cbvlfv2x9h624nygfis94jaw9gqf75sjv6y4inkzy73" - }, - "stable": { - "version": [ - 0, - 1, - 40 - ], - "deps": [ - "company", - "flycheck", - "haskell-mode" - ], - "commit": "107640cc3a3ea12db24ae674ff7a820f6073f3d5", - "sha256": "0yr6g2f35rmym6nkdgm6wdczirc5b9f7sza2sad0mx02b81qmaci" - } - }, { "ename": "interval-list", "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", @@ -54152,15 +54813,15 @@ "repo": "dcjohnson/inverse-acme-theme", "unstable": { "version": [ - 20170823, - 254 + 20210204, + 1640 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "74d6f3e2f6534371509dd2d77006435156c276d6", - "sha256": "15fk60ky8kbj665yjylmgc4nn4qsk57fvarqzwv3fns64yfshkv3" + "commit": "79008920ce7923312ada6f95a3ec1f96ce513c0b", + "sha256": "169zsp8kd8dq8mcfzm228wm8c97rv56clsg6z8dp8aaz7nw1kxgf" } }, { @@ -54393,6 +55054,21 @@ "sha256": "0nwwghsdv11bxqar4ppraxxmm6i076s7nmi9l2c53m708xn4p6pi" } }, + { + "ename": "iscroll", + "commit": "1a654105396633a1018cddb459a46630071455b3", + "sha256": "06nzfza043n2ypjp0kc009n3ax4avafvgfqdhkzr7x6bzgxvkx6d", + "fetcher": "github", + "repo": "casouri/iscroll", + "unstable": { + "version": [ + 20210128, + 1938 + ], + "commit": "d6e11066169d232fe23c2867d44c012722ddfc5a", + "sha256": "0pbcr5bwmw2ikwg266q2fpxaf0z5h5cl1rp3rhhn9i9yn7hlfc78" + } + }, { "ename": "isearch-dabbrev", "commit": "b9dfc7c1112bac8744910c58f77a98a901fd8065", @@ -54494,29 +55170,6 @@ "sha256": "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach" } }, - { - "ename": "isolate", - "commit": "c8091f8d72c24a103f6dcaadc18bbec745c1c3d3", - "sha256": "1ldyvw01nq2ynxaaqmw9ihk9kwfss9rqpaydn9f41bqj15xrypjc", - "fetcher": "github", - "repo": "casouri/isolate", - "unstable": { - "version": [ - 20190808, - 731 - ], - "commit": "e93cb652f150705347480a2ee13b63fa625b1edf", - "sha256": "0fa4z1mm62s1x4fd6d4pwl6zvksx1xiv6id9fy7rdbs0vznsjgqb" - }, - "stable": { - "version": [ - 1, - 2 - ], - "commit": "700aa3c7945580c876d29c3c064282c33ebb365c", - "sha256": "0j96rzfabn6lgv9xxyndpq3d2nys5z1brrrd7bga786zzwlp78a9" - } - }, { "ename": "isortify", "commit": "c756ccbae044bc23131060355532261aa9a12409", @@ -54681,20 +55334,20 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210114, - 1859 + 20210225, + 1251 ], - "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", - "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -54705,15 +55358,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200615, - 938 + 20210225, + 1251 ], "deps": [ "avy", "ivy" ], - "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", - "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + }, + "stable": { + "version": [ + 0, + 13, + 2 + ], + "deps": [ + "avy", + "ivy" + ], + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -54732,8 +55398,8 @@ "cl-lib", "swiper" ], - "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", - "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" + "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", + "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" }, "stable": { "version": [ @@ -54938,30 +55604,30 @@ "repo": "jcs-elpa/ivy-file-preview", "unstable": { "version": [ - 20201127, - 629 + 20210124, + 1639 ], "deps": [ "f", "ivy", "s" ], - "commit": "402b4b915bc7daa14d16a48b47a2e453ce80dcd3", - "sha256": "0z1czcqdkdxn1c92fa640idacc8c1b9ykfk8r94d2174ki93jd9j" + "commit": "b237ee8e9fd2fd1b52254ef84cd06a0bb6c10a24", + "sha256": "0bimn8j3md579sg7bypsynmjnq1mlmmslci1k98sc8kfnky8260c" }, "stable": { "version": [ 0, 4, - 3 + 5 ], "deps": [ "f", "ivy", "s" ], - "commit": "4727ac0dd7906807c830e2abdd3e081812105ad6", - "sha256": "0ia0a38f3dfiqz96fc405ax472zyj92yn61qs9mpdz8ql3pv2dwb" + "commit": "b237ee8e9fd2fd1b52254ef84cd06a0bb6c10a24", + "sha256": "0bimn8j3md579sg7bypsynmjnq1mlmmslci1k98sc8kfnky8260c" } }, { @@ -55060,28 +55726,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200608, - 1010 + 20210225, + 1251 ], "deps": [ "hydra", "ivy" ], - "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", - "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], "deps": [ "hydra", "ivy" ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -55111,15 +55777,15 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20201214, - 307 + 20210206, + 919 ], "deps": [ "ivy", "migemo" ], - "commit": "0f34245dae2f890c685be767e3dc2c24c65dfe28", - "sha256": "1d013v8nb83g1hkfc5vxf5y7m67fi8346xm912hyyy03871kb469" + "commit": "9cdf3823b3303d69c0c77dfee91136817da12aea", + "sha256": "0nxk1i208zm6p666920gh1nmrfhfqglhgs07b5ir4b7mz3m5caab" }, "stable": { "version": [ @@ -55234,15 +55900,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20201215, - 39 + 20210122, + 45 ], "deps": [ "ivy", "posframe" ], - "commit": "83047d440ff132d5a45acde5955f71853edeefb9", - "sha256": "03n1a9qzc53i3lx0ywayc2v8p0n4ydl7ly6niaj9dj15ik0nzxsp" + "commit": "3132719a9a7c04431fe65f1dced8acafe789bdf6", + "sha256": "133l0rd3iwphj9xcgww5m54mmyfd7icr46s792awlpc1ch7748c3" }, "stable": { "version": [ @@ -55266,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" } }, { @@ -55328,14 +55994,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20201224, - 4 + 20210212, + 1441 ], "deps": [ "ivy" ], - "commit": "f8a1f5c90d2a113b597ef5903634c089fce3365b", - "sha256": "1bwp26b7m3zxl00ywav7qfwlszxms3z00w41k7nvb47a4s0cvffl" + "commit": "7b9b7b20c3ead81da90232cd6707dfad3c1f1eb3", + "sha256": "03p13z609ighdq4axls93alqfl7pclx12g4vdd7lwpcy0r0cgyf8" }, "stable": { "version": [ @@ -55365,8 +56031,8 @@ "ivy", "rtags" ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -55389,8 +56055,8 @@ "repo": "jcs-elpa/ivy-searcher", "unstable": { "version": [ - 20201001, - 834 + 20210221, + 923 ], "deps": [ "f", @@ -55398,14 +56064,14 @@ "s", "searcher" ], - "commit": "8eb55ff22b4b833094232acb35ec46261f069fa3", - "sha256": "0in9xihr2v6xn7iqlj5zz0h127bg4yf9hmrfvgxn53pcivzj9vw9" + "commit": "3a2f5073a0d5842a6b3c386e70cc484e3c4ea77b", + "sha256": "1bk8kaxqq1m76x1i4hy3jqcy05pr6dlzjd4dbyi8lrx9sxnfrnkk" }, "stable": { "version": [ 0, 3, - 8 + 10 ], "deps": [ "f", @@ -55413,8 +56079,8 @@ "s", "searcher" ], - "commit": "8eb55ff22b4b833094232acb35ec46261f069fa3", - "sha256": "0in9xihr2v6xn7iqlj5zz0h127bg4yf9hmrfvgxn53pcivzj9vw9" + "commit": "46a461eb873083bc53d7fd3a15b266c52b3cbfb4", + "sha256": "1qsbbpmk3211lm29mks7r3dfphyikbkkj94028748y6ngwqk1vb4" } }, { @@ -55995,8 +56661,8 @@ "auto-complete", "jedi-core" ], - "commit": "9d5f29116c4d42cae561a9d69e6fba2b61e2cf43", - "sha256": "1bckxppfzd5gwn0aw4h86igb7igal9axqncq7j8zmflg7zppncf1" + "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab", + "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35" }, "stable": { "version": [ @@ -56020,16 +56686,16 @@ "repo": "tkf/emacs-jedi", "unstable": { "version": [ - 20191011, - 1750 + 20210202, + 856 ], "deps": [ "cl-lib", "epc", "python-environment" ], - "commit": "9d5f29116c4d42cae561a9d69e6fba2b61e2cf43", - "sha256": "1bckxppfzd5gwn0aw4h86igb7igal9axqncq7j8zmflg7zppncf1" + "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab", + "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35" }, "stable": { "version": [ @@ -56188,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" } }, { @@ -56212,11 +56877,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20200329, - 506 + 20210228, + 132 ], - "commit": "f04d08db36715d7509fd68448f74f917c6c1a382", - "sha256": "1pmzls19wpg60ql0b5l6rhml8hh8mzpbc0dgylzhps1jghi055s1" + "commit": "fb2bacab9475410c79e6e4ca344f093f7698466d", + "sha256": "0m3p75659krzcyc54ri0x8bwr1zxhkrfmyz8z7z5mjpydb8qb1v8" } }, { @@ -56396,11 +57061,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210114, - 900 + 20210206, + 1851 ], - "commit": "6a307c7ee17d44f1b0fe3dfba2bc34e0ca055818", - "sha256": "0q8y512l91r32igdksc6i2gwv0csl35xqlnx1cw41fwdpnbvdx4m" + "commit": "fd9be900549bb0c0a373d6fd1552295f1e8a1d08", + "sha256": "0g9bihlmq6bwbyzk9zr3gig5w0vaysz1gsdqacq604jls34ks491" } }, { @@ -57071,8 +57736,8 @@ 20190714, 1521 ], - "commit": "1623346b308dc8f593346dc947fdc4092d674834", - "sha256": "1kkn4xjn9i207x580902jfpcrhpkvpyzxk4jh1bclbryki9602zv" + "commit": "2f41d292b87916f6989e7ff5dc94da18ae6a9e4e", + "sha256": "1z5v7z98dinlayxzik45gjja93daxym75mh2shsy4wz8yclkw22p" }, "stable": { "version": [ @@ -57239,23 +57904,26 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20210114, - 1549 + 20210124, + 923 ], "deps": [ "s" ], - "commit": "0774d3b5b954e82e5bbcbe5123c689341297b01e", - "sha256": "056zv48nbqvnadca4q2hh0aal2bz00f9ayzqpwnsxl482p8bi93k" + "commit": "7ce38a9caf2a9c105afe66f464a2f30e816d69f3", + "sha256": "11vpqqnxqj9nxh8kccj4y6h3f8lib6jxnsk6vxc2j2fqw6alnafm" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d", - "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk" + "deps": [ + "s" + ], + "commit": "7ce38a9caf2a9c105afe66f464a2f30e816d69f3", + "sha256": "11vpqqnxqj9nxh8kccj4y6h3f8lib6jxnsk6vxc2j2fqw6alnafm" } }, { @@ -57330,8 +57998,8 @@ "deps": [ "vterm" ], - "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", - "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" + "commit": "c051cdc4ba574039b622fce37a5f61685dcc6d89", + "sha256": "0ixlh640106cdvdnnmr7p6n0c5bg5qzyk9mspylsnlgiws4gz1ff" }, "stable": { "version": [ @@ -57477,8 +58145,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20200417, - 1907 + 20210116, + 255 ], "deps": [ "cl-lib", @@ -57486,8 +58154,8 @@ "websocket", "zmq" ], - "commit": "360cae2c70ab28c7a7848c0c56473d984f0243e5", - "sha256": "1bn0jwpigpl5n45vpz73vv12g078151vyhkkhkwy5xqx627swxf9" + "commit": "6ce8d01e3a550a3268b415bf9d9b635d4dba5940", + "sha256": "1l0a6abyshrr6wb9xhgwgkdcarnhxj929rg52zf63xix351dlqi9" }, "stable": { "version": [ @@ -57543,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": [ @@ -57694,16 +58362,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20201111, - 2159 + 20210212, + 2031 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "fa27e48b49d42ed6d8b4492d7c734b0f1e647fc1", - "sha256": "1qg6crhqraj78frdqbqr260j9l0h8cdp96bqzwjwai8ia16zskn7" + "commit": "34af1bc1225b044d9a15d8c276b7e33b12cb8720", + "sha256": "08b1r4yz7ikzwxn4hlip75vmd77hc8nsmiphdw46a9h6w9aw0v30" } }, { @@ -57834,15 +58502,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20201216, - 717 + 20210225, + 725 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", - "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" + "commit": "7f27dd887da0e2d2522f711f8954c997de366ac4", + "sha256": "134ijij23vhc5jw1bvfvkikl64lwvnsmbprqsv64791x1fvcbd6y" }, "stable": { "version": [ @@ -57984,14 +58652,14 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20201204, - 406 + 20210226, + 2246 ], "deps": [ "cl-lib" ], - "commit": "18c675aa2ff1749eb42f081f0549398b82cd4540", - "sha256": "1mz5rfzyv4varn09pza5yb851vmsbicsz4zgc0y7zni2bhlj9250" + "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", + "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" } }, { @@ -58005,8 +58673,8 @@ 20200601, 333 ], - "commit": "18c675aa2ff1749eb42f081f0549398b82cd4540", - "sha256": "1mz5rfzyv4varn09pza5yb851vmsbicsz4zgc0y7zni2bhlj9250" + "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", + "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" } }, { @@ -58035,6 +58703,14 @@ 20201109, 1358 ], + "commit": "7fd89c306c975a1fa3ab16ba7a4d3b102130a868", + "sha256": "1m1p3iydn5s3dlmjv751ligbwxkg472rhcbk80q2y1lnwjsnbhdy" + }, + "stable": { + "version": [ + 1, + 0 + ], "commit": "dda02615b45a86c806d61e0484e08aa51343f8d8", "sha256": "08zxn25jbd3sqwd2bsbnh9kj8jf5jygyf8x4i8i6k89jw2fd7mds" } @@ -58168,11 +58844,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20201229, - 1006 + 20210123, + 1149 ], - "commit": "b02892ec77ef8b83c957652c7859422d6f46e051", - "sha256": "1ggl3k2h9y7nwhawpddl0mk9smm5bpq42fyp1pq64z67zrb4217l" + "commit": "a3a0798349adf3e33277091fa8dee63173b68edf", + "sha256": "08n4lfd6zb0qwpaw48q7p1mi6rn5rzja02113fphz7ra2kapbpva" }, "stable": { "version": [ @@ -58265,26 +58941,26 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20201125, - 1434 + 20210125, + 823 ], "deps": [ "cl-lib" ], - "commit": "6cefdf42d95a20565d51974d73ad38749c46cddd", - "sha256": "0qlp9hfb3kzp36c03zjxv7sxgsikqmfjm0ynvgqch3bccwqbsz1v" + "commit": "0b282e19ac3d23b9a74f656b137b9eebeb2aaa39", + "sha256": "0ni03xnakai9ncq07gwzqy4walgijd04bnxslk3b4xnnk60i8m2h" }, "stable": { "version": [ 3, - 0, - 3 + 1, + 0 ], "deps": [ "cl-lib" ], - "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705", - "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n" + "commit": "0b282e19ac3d23b9a74f656b137b9eebeb2aaa39", + "sha256": "0ni03xnakai9ncq07gwzqy4walgijd04bnxslk3b4xnnk60i8m2h" } }, { @@ -58298,6 +58974,14 @@ 20190109, 530 ], + "commit": "f7041deccd9d03066c2fe41c3443c42a4713ac02", + "sha256": "1pj621z2ywwx6kybhyifm9grp9bkhk6f3fwancn0x53c33zp2daq" + }, + "stable": { + "version": [ + 1, + 0 + ], "commit": "9de65a27e10d8ae47aa6d28c02c3eb82ee8c0b2e", "sha256": "1ybbayxfix63rwc8p5kl4wxxlk6vg53abw40fqrlkbc6qrr7nm5c" } @@ -58603,8 +59287,8 @@ 20180702, 2029 ], - "commit": "554e98fb7c439d182a48dce7276932139a325f02", - "sha256": "1afw0ak9wbf63d23sfp78a9ial4vscw002p0b47rlsq895j683cb" + "commit": "de520e601fee568b03800e8069118730ccbbdb95", + "sha256": "1yk5ygmhkzhfwk770k6lhqx5hjcwsjrgnf99qzl59af74qxn3wya" }, "stable": { "version": [ @@ -58624,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": [ @@ -58888,8 +59572,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20201223, - 1730 + 20210222, + 2212 ], "deps": [ "dash", @@ -58897,8 +59581,8 @@ "transient", "yaml-mode" ], - "commit": "9b1aa4830a4470ff8f11ecc0bc80b5cdaee473fd", - "sha256": "1n1z8w2n7raxfmd4la2knzvs9vnprcdhxjlp21k6r757k75na3qn" + "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e", + "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni" }, "stable": { "version": [ @@ -58930,8 +59614,8 @@ "evil", "kubel" ], - "commit": "9b1aa4830a4470ff8f11ecc0bc80b5cdaee473fd", - "sha256": "1n1z8w2n7raxfmd4la2knzvs9vnprcdhxjlp21k6r757k75na3qn" + "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e", + "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni" }, "stable": { "version": [ @@ -58954,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": [ @@ -58995,8 +59679,8 @@ "evil", "kubernetes" ], - "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509", - "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg" + "commit": "de4ff6ccdf58a939908d384efe9cf06b2bcabe12", + "sha256": "0nz34h601him6x1a6fkvzvr4r3f5d55cz520ddsmin9zwpq7rlhq" }, "stable": { "version": [ @@ -59108,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", @@ -59185,16 +59899,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210115, - 651 + 20210220, + 728 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "e4205c5da3a0c99f0b29677736711ee069e2c175", - "sha256": "0kxdli25dbzq7mjinnvfxy2x9zy79062l45kafpayywa1ipwgfkp" + "commit": "e9aeee78c3aede7e39fec993b846e731d7790acf", + "sha256": "1dkbrwd1dchc9h650r7rfw9xcjr342xkyjjrq0lyxwa8v5s4558v" } }, { @@ -59301,25 +60015,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20201217, - 1633 + 20210207, + 1829 ], "deps": [ "cl-lib" ], - "commit": "3f0ad28202207c266bd8fc7904b224db69ceccf6", - "sha256": "0rc6hggdqpfvcq1kx6ghnzqzn7842331b0qfng42vmqn44mk9skx" + "commit": "2c99ce29b86fc635649f4e89723912dc1cc4f36c", + "sha256": "12fzzdc4jns440gb71iydsicni646gciaxv50p0wrfk9mbppidck" }, "stable": { "version": [ 0, - 10 + 12 ], "deps": [ "cl-lib" ], - "commit": "3f0ad28202207c266bd8fc7904b224db69ceccf6", - "sha256": "0rc6hggdqpfvcq1kx6ghnzqzn7842331b0qfng42vmqn44mk9skx" + "commit": "2c99ce29b86fc635649f4e89723912dc1cc4f36c", + "sha256": "12fzzdc4jns440gb71iydsicni646gciaxv50p0wrfk9mbppidck" } }, { @@ -59682,11 +60396,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20201211, - 412 + 20210224, + 144 ], - "commit": "e0c4b7484ab6ee3bbf8413f620ccb99af4328d2f", - "sha256": "18vvl8a5s6n1kky31n0khnv89998gy9vfk5q58hkczfadc6nss76" + "commit": "fbe9bfba5ef4c99ee190b259a5e3341dd7a71935", + "sha256": "16rki5xzffws02l2nr2ra0kxapizqdix5373ny9f4hlkvp7bqgzi" }, "stable": { "version": [ @@ -59726,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": [ @@ -59817,8 +60531,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20200930, - 604 + 20210209, + 1734 ], "deps": [ "dash", @@ -59827,8 +60541,8 @@ "flycheck", "s" ], - "commit": "cc1f5fadf8e9ae08aa25828985edc97df04d94a7", - "sha256": "0v03bisr0ljk1ypbicgh9izxwazz8ry5xcd7r1lqb339xqb0bzqb" + "commit": "15bee87dc4080b87c543964375b7ce162317ab6f", + "sha256": "127b7ny5mr1y14yg54gy7an3lk3928w4y9a22295i4v4zgj704j4" } }, { @@ -59879,11 +60593,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20200224, - 2229 + 20210209, + 4 ], - "commit": "86505672be0aabc9fa1048bc453ab2fc855b27e1", - "sha256": "00j6j2n0z616r9p78wp8hk62d9s2dpzlmflfm7ilrx40dnd4nlgj" + "commit": "ac7e2887baebedd51afbadc9e4c6f7b59351b0bb", + "sha256": "0v6nw2yqy8lhwssq2myx91jjlsg8d97f60yhrpjk3qc62037q60b" } }, { @@ -59924,11 +60638,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210106, - 227 + 20210221, + 1315 ], - "commit": "bcd8cefb720702db88986a52bb66e08e2e451c05", - "sha256": "1l2lhz45lc7njdv3kl5g8z5ig6vykxlp446raaif14k2flhw24a0" + "commit": "3495d1224ee73aa96c1d5bd131dc3a7f23d46336", + "sha256": "137z70baylzv6bm6y2wyl1p3f47hzkvjzqcmwmwjmlkpc0p5j4ac" }, "stable": { "version": [ @@ -59963,8 +60677,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20200730, - 1433 + 20210121, + 1600 ], "deps": [ "aio", @@ -59973,8 +60687,8 @@ "log4e", "spinner" ], - "commit": "153a3a6a9ffb64ffce37b3d203c13a85cc1884ab", - "sha256": "0600njpn3dvd8xrj21r5p69mc1r76ri1bjcxy2krp53dnsy3nvfb" + "commit": "9c44791407c3f4f76d903ee43367547803ae9c32", + "sha256": "14nlmgbkb8vyb0r25sdg03lg2h38gj83vspp9v9vsqyiiirhnvnh" }, "stable": { "version": [ @@ -60207,6 +60921,25 @@ "sha256": "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932" } }, + { + "ename": "lexic", + "commit": "d7c4ddd3b6eb8243e6a4bdb9188e95ad24bfcf5e", + "sha256": "1im7x26gkhk3lkfx8r36q9aa0wayhi1dvbsrighn3pg86bl1k5cs", + "fetcher": "github", + "repo": "tecosaur/lexic", + "unstable": { + "version": [ + 20210203, + 358 + ], + "deps": [ + "dash", + "visual-fill-column" + ], + "commit": "e59224cd5808af50e8b9ba8cce0a687cf09aacc1", + "sha256": "1si5ndfs8xbk96iiwcwlhi57k914jnsq3zdgvlb7xm3y8zjy2l6x" + } + }, { "ename": "lfe-mode", "commit": "c44bdb00707c9ef90160e0a44f7148b480635132", @@ -60218,8 +60951,8 @@ 20201007, 2214 ], - "commit": "e5f20c459a13b35ed1e71b1d2667363af168e958", - "sha256": "0fapq9b14lxx5qm55yhcj2f1ym0kfrh6796ffb2i032bprh8n3m6" + "commit": "5bb4b76b1d1d2453de69920b3a1a6b2a302aea07", + "sha256": "1dqpksmpnnpi591p76hhv95p5gmkmsw794vzny7rd4xkdgcc39jv" }, "stable": { "version": [ @@ -60462,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" } }, { @@ -60495,8 +61228,8 @@ 20180219, 1024 ], - "commit": "30cc83af69216ceced310c058ffae48bbe67fed1", - "sha256": "143l1fb3i0z7dxd39lw5qds62kv5ii9wy4gbqy3jg11swva0xkcd" + "commit": "a49afb9c168eaf8aaaf94f0c631b7b74db9a1d82", + "sha256": "0213ppx15rdb5cxg7w8978880fzv3dh2m9p6idkmlfj7bndfd411" }, "stable": { "version": [ @@ -60724,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" } }, { @@ -60807,8 +61540,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20201226, - 1746 + 20210121, + 926 ], "deps": [ "ace-window", @@ -60817,8 +61550,8 @@ "iedit", "zoutline" ], - "commit": "1ad128be0afc04b58967c1158439d99931becef4", - "sha256": "15an4nbpri49imvkbhhynsmczkzhl4i037r8hcg4mam3w5nw14y8" + "commit": "38a7df4cbb16cfe3d62dc8ea98b50e2d9a572e58", + "sha256": "1q3sgk8ffwajmh8l7c4p4fz36xw4fqds8yqblbi5kardaa8bs8cs" }, "stable": { "version": [ @@ -60853,8 +61586,8 @@ "evil", "lispy" ], - "commit": "0f13f26cd6aa71f9fd852186ad4a00c4294661cd", - "sha256": "0ah59s9c24addlx1rxgm11jihn7w45xrf0wrmrb7mbmqf3rj3izc" + "commit": "89316f01822b2135e52ca27fd308d207ef618052", + "sha256": "10k3hxxpx2v2k4dyad7j1bzmr1q7rzvv4y6c67pa9zcqyaw8m91v" } }, { @@ -61084,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" } }, { @@ -61131,14 +61864,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20200708, - 803 - ], - "deps": [ - "cl-lib" + 20210130, + 107 ], - "commit": "722b7b3988336642167e0e0db12800a23410ab07", - "sha256": "19fckshqp1dxf7msjjk6cd506i0ydzqb1fqz879pfbbvhg6iclva" + "commit": "de73de9e8060574cb0c85be4ec3b5d8ff8a92b7b", + "sha256": "19kyrvpkmbgiygcxr3hyrba9smz33y0adz5fwh1kb5qhcyrq8jw7" }, "stable": { "version": [ @@ -61337,6 +62067,36 @@ "sha256": "1d8m7pbfny0bkbaq609k1m8y5cd2lm0w1dnl53lls9ahyz60hdk4" } }, + { + "ename": "llama", + "commit": "773b273063715a9b4373f23c583880948d812826", + "sha256": "13i2s5aqgk3hb3b3rvm597dhapajbsybr3vrkjswq5p36mda66fq", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/llama", + "unstable": { + "version": [ + 20210201, + 837 + ], + "deps": [ + "seq" + ], + "commit": "f2f1476e88153b167bf4ce755f7455fcb3f98458", + "sha256": "0qnzbamf763h8fwjsn7i47a1amb8nixl25zw58jh4hhl470czi2f" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "seq" + ], + "commit": "2027ce79165bf40314ad838c282920c53b5d7eae", + "sha256": "1jnll9xaxfwwvs0xjpdz8y6xlrsckm3a8ri5ml8k3fp81yby9as5" + } + }, { "ename": "lms", "commit": "7d6c24152f88dad15ef9f304c0016a97ede71dab", @@ -61455,11 +62215,11 @@ "repo": "fourier/loccur", "unstable": { "version": [ - 20191022, - 1955 + 20210224, + 2041 ], - "commit": "284d7bb285bd382be6c1936077de7e2246fa2374", - "sha256": "16jslrdzxlcl6s5jiylqfv48xrm7fqk765jwcgzayjl94939r22l" + "commit": "01b7afa62589432a98171074abb8c5a1e089034a", + "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2" } }, { @@ -61622,11 +62382,11 @@ "repo": "Wilfred/logstash-conf.el", "unstable": { "version": [ - 20200725, - 1843 + 20210123, + 1949 ], - "commit": "131565042f8f12b9b88bd477959246dd034fa7d6", - "sha256": "1cyrmhnc38piw8q6d8j8xwyk0vl0a00mzjhmswkwd76w06adr9md" + "commit": "ebc4731c45709ad1e0526f4f4164020ae83cbeff", + "sha256": "1bjmd1xy45p4v2307sxd6mna9iqxvvz82sx5jbdf3hz5d71w5vfn" }, "stable": { "version": [ @@ -61784,35 +62544,6 @@ "sha256": "04h97vnd758gsdfg30wkrhnh4hz7k63xbrw178dxfcwsylq32wi0" } }, - { - "ename": "love-minor-mode", - "commit": "0f224c4c7519b3668b1270c957227e486896b7b6", - "sha256": "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m", - "fetcher": "github", - "repo": "ejmr/love-minor-mode", - "unstable": { - "version": [ - 20170727, - 536 - ], - "deps": [ - "lua-mode" - ], - "commit": "3ca8f3405338f2d6f4fbcdd5e89342a46378543a", - "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" - }, - "stable": { - "version": [ - 1, - 2 - ], - "deps": [ - "lua-mode" - ], - "commit": "3ca8f3405338f2d6f4fbcdd5e89342a46378543a", - "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" - } - }, { "ename": "lox-mode", "commit": "8a4f385fd128097781b563ad91d4aa8301167f5e", @@ -61850,8 +62581,8 @@ "deps": [ "lispy" ], - "commit": "c3da907fdc1c7da8b0c19721605bf63d9d1be404", - "sha256": "1znjl9v72sy87ir6ia1qkgrfnxdgh9fk5pdl4k002labmsi2aw93" + "commit": "076ce9acb68f6ac1b39127b634a91ffd865d13d8", + "sha256": "10sab50wmr3zn7jgzx93201ymhmacqacn3m2qllsqkfw2gpsi6dn" } }, { @@ -61862,8 +62593,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210110, - 15 + 20210215, + 1558 ], "deps": [ "dap-mode", @@ -61874,14 +62605,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", - "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" + "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f", + "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr" }, "stable": { "version": [ 1, 17, - 12 + 13 ], "deps": [ "dap-mode", @@ -61892,8 +62623,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", - "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" + "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f", + "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr" } }, { @@ -61904,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" } }, { @@ -61947,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", @@ -61955,15 +62716,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20210108, - 1332 + 20210209, + 2150 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "5d3f4814f6ac44547a62551472cc76fbaebcccf7", - "sha256": "0qak0vl9jicx9sv4sa2ash5agxxsx8qycp4jk3wxs96q5kjshf62" + "commit": "7efbef3d206989faa8b691a4230a3ed872542187", + "sha256": "15xp3gjj9zdvxbhcgw21108s9y99rfmih5sqlk7f0m9hw5mqw4zm" } }, { @@ -62025,13 +62786,12 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210105, - 1625 + 20210228, + 1108 ], "deps": [ "dap-mode", "dash", - "dash-functional", "f", "ht", "lsp-mode", @@ -62039,8 +62799,8 @@ "request", "treemacs" ], - "commit": "33364a268a61366f1a07596e9fe7bd0f6d73fd90", - "sha256": "0ii26773cm945z1s4vyfqgzjsizv1a9wiadgg3klnfz9748y93a4" + "commit": "93db10d0b521435824732e1e46ac1fcf05c9893f", + "sha256": "0fskr9s7rp9dcarv3jz4pdkhhik0j6y19s10zp1fknwniql7kvj5" }, "stable": { "version": [ @@ -62157,8 +62917,8 @@ "deps": [ "lsp-mode" ], - "commit": "2140e65fc5d759cdf163128ef6ab15c246d6039b", - "sha256": "10qf62c6raqhikhmfrav6qhc1mj229mrabzs1swyc06sx1sgkiwf" + "commit": "5fc536f24dc659f998bc673129d9e7c4b20d297c", + "sha256": "1k34zpg6f3i1pb68zh6fc7azd4hmbclnjpad1893q2zhqwxqdwz8" }, "stable": { "version": [ @@ -62224,20 +62984,19 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210114, - 1955 + 20210228, + 1524 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "0062a7cd4ab674390287e6b20d93ac42ed1f5512", - "sha256": "16awnan07b6ayf0rnxs8hal468bc7i24gw0l849s04v41y2i35cg" + "commit": "555bd9f0ee598f2c5601c7e33ef640f4fbe8e246", + "sha256": "0wjkcyq67447b79rif8hys2sy4gvzzb494jw6h8ab244zbkrrag9" }, "stable": { "version": [ @@ -62288,15 +63047,15 @@ "repo": "emacs-lsp/lsp-origami", "unstable": { "version": [ - 20200914, - 1846 + 20210126, + 843 ], "deps": [ "lsp-mode", "origami" ], - "commit": "aa309589668d32a8b4bb23c8f41163f6ae208f7b", - "sha256": "1l5n01icyp00ljcs5sfk3wbp74gn53p0mj1l4fqdpi70c1wahwmv" + "commit": "bedea3d25552d6969e917a15a0acc3d333ddc742", + "sha256": "0sbqplrchfz7d662xk1xjrgxvijd3dzwpvphaksv6agv4bjikbad" }, "stable": { "version": [ @@ -62385,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" } }, { @@ -62405,14 +63164,14 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20201023, - 1750 + 20210217, + 1823 ], "deps": [ "lsp-mode" ], - "commit": "c4ebc7a11398733055a1dc07f9cffacd04d1c2dc", - "sha256": "0sdvqnk598gdzjrzrgwqg2m8fzs9dpbbzsp70hqnrkp14x9jklmi" + "commit": "689f6cf815c8ee2ca2332f31dfda8ddefb0b7e26", + "sha256": "13vc2pwxl2cl2qa3gjkpa6si3760y7xyrlg1ygk3g1633w756h80" }, "stable": { "version": [ @@ -62475,8 +63234,26 @@ "deps": [ "lsp-mode" ], - "commit": "948c3a35fd05496a77af2d8935e754db112cb4c3", - "sha256": "1n9jfaq1w2vxhv2gpvmj3qyc8bwacyj6kdyw62hlgbl7xnhhhc6d" + "commit": "ff204ed820df8c3035ebdc4b5a583640d52caeeb", + "sha256": "1q9ml3r827am27fhs9vlrgsxnq43k3zjb3h5mi999da1nhqwcs49" + } + }, + { + "ename": "lsp-tailwindcss", + "commit": "c837c3b97d7e833d22a1605dcf3c2ebc35c19e0c", + "sha256": "0cnkj1ahp48i8zx1qh0fbxf40cnv6d1i9c579kmkfmfbnvxpp080", + "fetcher": "github", + "repo": "merrickluo/lsp-tailwindcss", + "unstable": { + "version": [ + 20210208, + 1458 + ], + "deps": [ + "lsp-mode" + ], + "commit": "0558fd1cdbc31c48ca02308bee1b65c77f3fce3a", + "sha256": "0lbpwcf6vnk99rk3mzq3mbh4nxgl6prjrrak2aq9c789n7qainfr" } }, { @@ -62487,19 +63264,18 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20201230, - 2214 + 20210216, + 1250 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lsp-mode", "treemacs" ], - "commit": "64e375fcc700d4d47cf52ad912e6863d479e3bfa", - "sha256": "19wy4xk0ll8pxdyq74a0zjlqkssc6ww21ac79zihndv90604c5km" + "commit": "3bae4a91e05d55d5ca92da272ffcd497f370e9df", + "sha256": "03dvf5vf74p3vjzv98csidw6hzpx2w7f20xmyy12cpiip76wanf0" }, "stable": { "version": [ @@ -62520,23 +63296,22 @@ }, { "ename": "lsp-ui", - "commit": "883d739e46c32c95adcf41835078ba3604188eda", - "sha256": "0n4z7gmpkbz9azbk8pi4f368396y4s9bpqvkdykzq6ykqyswk4bm", + "commit": "c4b521f55483fd176f4a3f4fc5e0799fe4506580", + "sha256": "0g6pkdr05yihw6fl651yih5fa51kv2l1xy4sr4487z2m4azb223b", "fetcher": "github", "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210110, - 1507 + 20210220, + 703 ], "deps": [ "dash", - "dash-functional", "lsp-mode", "markdown-mode" ], - "commit": "fbe9a859f0b50097270ccf1314952de2d2039c12", - "sha256": "01xw3jpwffk5gg86s5n2i1jwn0xslc9bdbacfxy0iyrn6qp5jr1i" + "commit": "0ac3e12138a7eeaf764845d1e7e61b02769003ec", + "sha256": "1xqdmbfvn3i7lpk287jslgc9j6zlfxxw6hamqhb25y22bkqjgxsp" }, "stable": { "version": [ @@ -62565,8 +63340,8 @@ 20201110, 1250 ], - "commit": "9454aeeb665df360543b47e162f03276a16b01a5", - "sha256": "0ssqqhvc08g5917i4lmsr698zr57v9hpnbw67l1lx48ra4vr6fcr" + "commit": "2d9a468b94acd8480299d47449b53136060b7b23", + "sha256": "1586k3friamcyfg1xszhkh1vaddrfxji1mn7rd7s8id8f7sp8mnv" }, "stable": { "version": [ @@ -62781,8 +63556,8 @@ "deps": [ "cl-lib" ], - "commit": "703ee41303dc251b7672b7cba5aeb6aa54a76c90", - "sha256": "0cplbz7mc2zrxfk8g349ahb7gzli2hn5kda9155nbk8dw74xmj7d" + "commit": "94240ebb716f11af8427b6295c3f44c0c43419d3", + "sha256": "0c3l50qpdzracjncsbjv5chpvjdphhzwqk4jwv31fw6p62i1zvlb" }, "stable": { "version": [ @@ -62867,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", @@ -62980,18 +63774,17 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210105, - 1030 + 20210228, + 1841 ], "deps": [ - "async", "dash", "git-commit", "transient", "with-editor" ], - "commit": "25f432551347468ce97b8b03987e59092e91f8f0", - "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" }, "stable": { "version": [ @@ -63019,15 +63812,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20200516, - 2028 + 20210210, + 2312 ], "deps": [ "cl-lib", "magit" ], - "commit": "c5ecb4b53ea2461e737ea00242ef1e69e35da398", - "sha256": "0f1psh03hsb57h3r66zfa0jmwkky12121lhvpynlgj330ryxl5bj" + "commit": "870174f23faa00b003b3eb63452228511c2da597", + "sha256": "156d0gd0a2cx9rn0zb9i96s3l62rys1dpxcdix2j6aix6iv669ql" }, "stable": { "version": [ @@ -63059,8 +63852,8 @@ "magit", "transient" ], - "commit": "3425ad5b16cb48d6802b7e9ed044b4cd7a99c785", - "sha256": "10iinizl99aivrf9zihykabb5lyg62kxbmydwaf7swzxf4dgxn2k" + "commit": "2d4bdacf498ed3ff7d2c3574d346b2d24cbb12da", + "sha256": "0rbbprjax6af0np1m5prilh2ndbhhlzfrq8sb8mn5vi3is2w1mgs" } }, { @@ -63274,8 +64067,8 @@ "deps": [ "magit" ], - "commit": "f4b88f0c127faa154f138907bf4e98b1baf12fb6", - "sha256": "10l0z0c0q6sbf3id5dajws30cxzjvi5rgx1hl8jf6nxr5zcmcmm1" + "commit": "a6130871e5f4421618e66d9254d0b5df9f3a1ef2", + "sha256": "1zrgqcxp2jshp52m0sa73kk071hvisqlrk79k9is6smkjss97s8c" }, "stable": { "version": [ @@ -63330,15 +64123,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210103, - 1554 + 20210124, + 1829 ], "deps": [ "libgit", "magit" ], - "commit": "25f432551347468ce97b8b03987e59092e91f8f0", - "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" } }, { @@ -63373,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, @@ -63486,14 +64279,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210103, - 1631 + 20210224, + 1417 ], "deps": [ "dash" ], - "commit": "25f432551347468ce97b8b03987e59092e91f8f0", - "sha256": "0vxsh75xynpfkfvmyyz8x3rppbwr9rgk7zjfil2af2kzba3p27vl" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" }, "stable": { "version": [ @@ -63550,13 +64343,13 @@ "version": [ 2, 2, - 1 + 2 ], "deps": [ "magit" ], - "commit": "c833903732a14478f5c4cfc561bae7c50671b36c", - "sha256": "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9" + "commit": "99601f47f47a421576809595ca7463fd010760b1", + "sha256": "00lsfkmsz26pz1paqn73skgx747250vc2pa0n8n0h7ywxj9dkzvb" } }, { @@ -63573,8 +64366,8 @@ "deps": [ "magit" ], - "commit": "e52e8ab4906996c410f6c6db890b9bfe0951d4ce", - "sha256": "0mp466bnm63pas8z0p6b0684i3rakb6cs5xzkz8jv3z3x34ak12c" + "commit": "8eea04c10d116057d3d4f249e6a184d5ed090263", + "sha256": "1m2p317xkbhfadba30m8lq01k543368ajbxid1v9627slgkcjf89" }, "stable": { "version": [ @@ -63815,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": [ @@ -64282,11 +65075,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210114, - 1652 + 20210224, + 1404 ], - "commit": "327ad58bd69a372dc10dbb5b5d3d47f246e28020", - "sha256": "0nx5322278vr44aq27kaj5nr0rcq4d3wcbfyb3fpl80asj672m09" + "commit": "2387cba868a21f6c18244b8c84125221a866dfb5", + "sha256": "00pr1zw9si8if76pjvxvalxzwk42320y2k6fnkbpdfm8yv6pxkd1" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "62ed158ff588900b9d3e56f3f05f659763c8c2ba", + "sha256": "1qihw1vq9sysrl6ha23ggycp0n2n1dx1ajkaqfm5vmv8480al07i" } }, { @@ -64394,11 +65195,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210112, - 1557 + 20210220, + 1301 ], - "commit": "3e380572a5177d0fa527c15efd15e340f53a923b", - "sha256": "1zhxw0cp95zy3qy9ai9k81zja5m31964nyyrjqzlywxx7zjk4x9g" + "commit": "051734091aba17a54af96b81beebdbfc84c26459", + "sha256": "11qybgasg4im76j4kryynqvqbqpxm1xfs5dxgjhr3whn3wiqba51" }, "stable": { "version": [ @@ -64461,8 +65262,8 @@ "repo": "ancane/markdown-preview-mode", "unstable": { "version": [ - 20181213, - 1339 + 20210207, + 2114 ], "deps": [ "cl-lib", @@ -64470,8 +65271,8 @@ "web-server", "websocket" ], - "commit": "f98d9114ca87e3e8e5ce70e601d13061eda15415", - "sha256": "1d1id99gagymvzdfa1mwqh8y3szm8ii47rpijkfi1qnifjg5jaq9" + "commit": "01af98ac1adcc9cb247fbc6c80fb159c30360ee6", + "sha256": "0n6ywxq12jqacdpah350ha6gqryxsh0iix93m0xnyy34dq2by4rc" }, "stable": { "version": [ @@ -64766,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" } }, { @@ -64824,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" } }, { @@ -64907,15 +65707,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20201226, - 1538 + 20210124, + 2005 ], "deps": [ "s", "test-simple" ], - "commit": "1600cfc059a80ed8fa0d381b88f29ba658811cc5", - "sha256": "030sg31xh46vrmsafvn04sdvyv4vzqf8rf5ghrlina1gav6kybfd" + "commit": "5e80033e6fa9089d5cd6fa93f6484b544f2ba059", + "sha256": "0qh19a3yi5cccj01wxrlyaw1zcaxvpjhxc5qk3mf4f1l8gm1sfi2" }, "stable": { "version": [ @@ -65345,16 +66145,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210114, - 1624 + 20210301, + 59 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "d012944ac149358d0e978b10ff0e8a090921e044", - "sha256": "0i89v52damd9jhg9sdqghxrcbdybix2cw8hzx6lawg847wc09j06" + "commit": "5f01f8be74853f27cff021ad6e750f4b31e9375d", + "sha256": "009kfsis6qib0ax9nlipcvwclqk4kyqwafvsymssvls0r7ar50f9" } }, { @@ -65365,20 +66165,19 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20191025, - 851 + 20210129, + 1443 ], - "commit": "a1a6e02756426f58a885846cbe56c4704b2a79e1", - "sha256": "1drx20bj1bb45n6wan0ys04qp4ccqjapi4056qn0ry6fdzx3c35d" + "commit": "2a0dd5c16178efcc4b8132e3c3b3c2a6cc7b13ea", + "sha256": "0aa0izxahpyzv9vz3g8q6m332ndqb8kxgwx22bxnf01n9v90v2j7" }, "stable": { "version": [ - 3, 4, - 2 + 1 ], - "commit": "c9761a552380838e9f530b5c47c0ea3c47c33565", - "sha256": "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj" + "commit": "ab02f60994c81166820791b5f465f467d752b8dc", + "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, { @@ -65513,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" } }, { @@ -65542,8 +66341,8 @@ "metal-archives", "org-ml" ], - "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", - "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + "commit": "a218d63b990365edeef6a2394f72d1f2286aeeae", + "sha256": "1mpsc1xvgl6g3bz0dx10i3x5abivna01f1carwyz9w47zs599svk" } }, { @@ -65626,14 +66425,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200602, - 1032 + 20210207, + 1100 ], "deps": [ "seq" ], - "commit": "6283e1fc5ddb65323513eb77638181551bda967b", - "sha256": "12sw627rhvqldbg8cvgg4fim91h3r9qlki5ni1fi0y5sa9iqh20j" + "commit": "e0ddd7a17da899fa85b1d49f1260042f8caa0612", + "sha256": "0k9lk2z8rnc2pa4wb2afj9byfryqlnw5hg1vs3bx6f0hs8rwa8yh" } }, { @@ -65659,11 +66458,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20210113, - 11 + 20210131, + 740 ], - "commit": "1dabdcd19ac93223ebc1a488666958e8c224449f", - "sha256": "0p5wwxfxds5h5v6jp4z2f423lzz3b3y84da8gw593byqzxd0sbf3" + "commit": "8c6bc6bf9562beb74b3b4fda47b2fe473139eb1c", + "sha256": "0bf30kkrmi0qw8i0viv1dnvrd52a66rp6vcklidrnv4dh5b782n8" }, "stable": { "version": [ @@ -65697,18 +66496,19 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20200311, - 2209 + 20210130, + 2016 ], "deps": [ "cider", "dash", + "geiser", "parseedn", "projectile", "s" ], - "commit": "36166b9bffeb1b5f967be2ab6f3a504632c33a65", - "sha256": "1w16sx15fk2m04gl6ahkw2scw6bvpl6bf4g0gf7532rxg339xgjg" + "commit": "a49731f39020b7c7626ba12e4c7b2f1c17a69341", + "sha256": "13m1qym94qvy197ngd8lyn8nzfsbxbr5ss29mkbvaidhi13jdrwa" }, "stable": { "version": [ @@ -65934,11 +66734,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20201223, - 1013 + 20210212, + 2041 ], - "commit": "0912cf4f500403be32735bc50e331fd06910471f", - "sha256": "1hnhgx1nyhj814dlcg8mgijnfh30a5vzzinivh2ywgr151wv3b9w" + "commit": "41afb3d79cd269726e955ef0896dc077562de0f5", + "sha256": "0yghz9pdjsm9v6lbjckm6c5h9ak7iylx8sqgyjwl6nihkpvv4jyp" } }, { @@ -66277,20 +67077,20 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20210103, - 7 + 20210203, + 2211 ], - "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", - "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" + "commit": "d5f64b967d831ea776f07aa2c80cc5fa88a3e869", + "sha256": "0gs5pmpkfm4skycmq6agy1hdxjwzw6wvfdkvczdygzvn8hjq2inn" }, "stable": { "version": [ 1, 1, - 0 + 1 ], - "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", - "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" + "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", + "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" } }, { @@ -66319,11 +67119,11 @@ "repo": "Mulling/mlso-theme", "unstable": { "version": [ - 20200828, - 1221 + 20210215, + 1755 ], - "commit": "b47243006470798caa4d3f8fe1af9bd5ef06bbee", - "sha256": "0gwa2izmi2ljh4avfpfq778ym1p91gsssbqz2q95m9py1vvb3xr7" + "commit": "40caa67262c78e7668147f86a2b7ca1dad4b2190", + "sha256": "0wcqj0wf1bhqsbvs52a7nwix71nmiy0xixvmmx2pkg7c7mxpm6v4" } }, { @@ -66534,8 +67334,8 @@ 20210115, 157 ], - "commit": "cc538e5702274ad9e8c6c41c807f890ca38f427f", - "sha256": "0ai424aggmavj3yjqpzi8a7cxxz96bm3wdbs7vy4g68xxb88ll7n" + "commit": "5b01b3cc51388faf1ba823683c3600790099c84c", + "sha256": "0nmi6bsbbgcxihjb865bmm2zrirnzi1lq02d6cl1df57k47md4ny" }, "stable": { "version": [ @@ -66648,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", @@ -66752,20 +67567,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210114, - 1245 + 20210228, + 2012 ], - "commit": "cefa14959c9118c279adccd151ac77e05b8beb3e", - "sha256": "1zqyvqkgy9w0ay0i61gq0mz5dwjdymcq4c2cbypq0adph4dlhkjq" + "commit": "9d3538f8a5007e33640b8ac1a0b725afc6287174", + "sha256": "0h3y94gglkdlygdkhakxlp5gmpvhrl76z2cm22pads722j1jj5nw" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 1 ], - "commit": "ab0f558397bb674342176c37c22190c0c1e54cc1", - "sha256": "1v82payjgx8z0qdklsrkim7xkb6hqrbs34d5qpq0sii43jwhiy5j" + "commit": "585659d36ac41dcc97ab335daa5bde566f088d4b", + "sha256": "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m" } }, { @@ -66776,11 +67591,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20200930, - 853 + 20210226, + 1623 ], - "commit": "76116f6eeb93c7902042f275a496629393730e08", - "sha256": "091wrp80y4k80w8wnv8pxipyf33dxb4qs0yn3m83bb1drn2x3g2p" + "commit": "697864d14f4b620f1be579a975bf97b769d2199e", + "sha256": "19jqf6q2fl89hpf6jl53kl6a64aryf5q2hm1dg14fyiag883m9q9" }, "stable": { "version": [ @@ -66958,11 +67773,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20200525, - 1430 + 20210206, + 1820 ], - "commit": "d1bc669200bf5753cf1963e5e65269e0d60648d5", - "sha256": "0zqrn1pvlrgbf0yc34bycahvrl8sl67jmc0436yx3lgjwpkvhf0f" + "commit": "d0489741a80d818713c290a1a4bdd985877228bb", + "sha256": "1nmnmijqfxdxz0cxyfq9fn34cy5bbf6cdg0qvg5mjxrjcfsl57dc" } }, { @@ -67060,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" } }, { @@ -67108,20 +67923,20 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20201122, - 528 + 20210228, + 718 ], - "commit": "56a6a11b612aa295ef250e5a9879dc5df3b3234d", - "sha256": "0smddm5x5m5mv15wdfm04y8hxfzvxh4gkmjr1h8dlp686jg5mvl3" + "commit": "a756418dde112a67c4c68355bee46ef17fc45d07", + "sha256": "0csv7afdyzvpnc1znh4fz3d7ddgi51dfkfbr3c1mv6wvwg844j2a" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "1d8344cec018a417cb5845c0717c7400c281caa1", - "sha256": "0ig5j4dzb0vxx145yv4ly93hndc2hkbx6dfng2zy7agf124ygh37" + "commit": "42d809ed57ad6ed63dde61f75e4b535b2700aaca", + "sha256": "0ln8qa51v1r5m2z4cjz7kfdmvq48lwgsdf7z43zmb1nzvn10gcvg" } }, { @@ -67315,20 +68130,20 @@ "repo": "wyuenho/move-dup", "unstable": { "version": [ - 20200819, - 940 + 20210127, + 1938 ], - "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69", - "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814" + "commit": "5906503e0b9b832b1d5062c9cd27cf72a2ce4817", + "sha256": "138h20zlhqdyacs6563naxlcbksbp9r4ck2jliikix5gaq950chg" }, "stable": { "version": [ - 1, - 1, - 2 + 2, + 0, + 0 ], - "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69", - "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814" + "commit": "bf2e578b89d7e7bf0b5500d9afcf49ac6ec2dcd1", + "sha256": "1hl7sddhs6wzn3z4h55znbix8n7jl9b85sd1b5s6x5n8wxj28gvz" } }, { @@ -67440,11 +68255,11 @@ "repo": "google/mozc", "unstable": { "version": [ - 20200822, - 1229 + 20210109, + 642 ], - "commit": "1f4fa17372bd196e87042738a16ab08bf904bcbf", - "sha256": "180glmkk6wnq5pc02543phih1f71vpvykqkwxs2qv7s7dyf2qg58" + "commit": "36c81efa69ecf6843e8b671a3caffb905a54f72f", + "sha256": "0smfhrcikxzaw4qbvq84ac51rdjw1mm5lm58zb8zyps7pzv3d9s8" }, "stable": { "version": [ @@ -67661,16 +68476,16 @@ "repo": "kljohann/mpv.el", "unstable": { "version": [ - 20200315, - 2158 + 20210207, + 1140 ], "deps": [ "cl-lib", "json", "org" ], - "commit": "2d40c4550558eb1bf35a69446777c4e9cae7a623", - "sha256": "0f9iq83dfj73gbx7zndvh32b102582lzv4xb8gvqjs26k5bywdxj" + "commit": "2d24187f7bdb0495c90d5109a730742e735636ba", + "sha256": "1siwl0pjmklpzywn5jmq7jgnsynpa6qafm6mqg9h8gxxbswd5xbi" }, "stable": { "version": [ @@ -67930,6 +68745,24 @@ "sha256": "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx" } }, + { + "ename": "mu4e-marker-icons", + "commit": "52f7c75f26eb02a58ed023a9d709fdcc09e11587", + "sha256": "1lyxcw7a842z4ss47sa8gzyh84p886d3qsszz9vl6978gy77i4al", + "fetcher": "github", + "repo": "stardiviner/mu4e-marker-icons", + "unstable": { + "version": [ + 20210124, + 514 + ], + "deps": [ + "all-the-icons" + ], + "commit": "e5c4f9b14eab69a0a28f108c6fee3390e19bd080", + "sha256": "1a3cinvi0j92j65qfgzmnx6z0xvq4l2jkvw9wydhm3bkmi3v6ni4" + } + }, { "ename": "mu4e-overview", "commit": "ec240f0f9bc43c5abca557607b0b89a24696744e", @@ -67977,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": [ @@ -68032,6 +68865,18 @@ ], "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6", "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "anaphora", + "s" + ], + "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6", + "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006" } }, { @@ -68289,15 +69134,14 @@ "repo": "matsievskiysv/multistate", "unstable": { "version": [ - 20200514, - 2206 + 20210124, + 2014 ], "deps": [ - "cl-lib", "ht" ], - "commit": "eadd0df2745bf10500a9ad4ee8f66f3cb470bef0", - "sha256": "081rangw4iqk1lcahk01skh518ljdp6g4ww7zydjr813x7jzv2kv" + "commit": "a7ab9dc7aac0b6d6d2f872de4e0d1b8550834a9b", + "sha256": "1r4l0s8401yfm3dl83yqffim5m1gsqzqz9pv3dvq3v8rb94m9n9s" } }, { @@ -68338,16 +69182,16 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20201119, - 529 + 20210224, + 710 ], "deps": [ "dash", "ht", "s" ], - "commit": "7f4b1cf0483366a77539081fde94fa6079b514a0", - "sha256": "0yg726jdcvkfxss1sw261rz1df3zv9g95rx3b3g8g5xncxi0cqvh" + "commit": "6fcb31f5075edc5fc70c63426b2aef91352ca80f", + "sha256": "1rq2p376016y68w6447sd7h6zgzrxbb3skh7fjw7xfq1p6f19kr4" }, "stable": { "version": [ @@ -68472,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" } }, { @@ -68749,8 +69593,8 @@ 20181120, 2224 ], - "commit": "670b81e3eddef2e7353a4eedc9553a85306445db", - "sha256": "1inbizxlfgndwxsn8cwnpf4vm42rby7pkjqxyzl7ldq4qln7q8v1" + "commit": "d8baeada19b56176c66aed5fa220751e3de11cb8", + "sha256": "0xa44mks90xhwkjvrgxll0hzwhkf317i3gxqlajl9cx8v3bhczz1" } }, { @@ -69435,8 +70279,8 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20201229, - 1005 + 20210227, + 1737 ], "deps": [ "company", @@ -69444,8 +70288,8 @@ "markdown-mode", "s" ], - "commit": "81ed1f3288eab9aed2cb0b1eb11af69f988b7d0b", - "sha256": "1dgvlk0apd7ddzzg5jcpsrdhps37my59jyvkv1sqp31km0nby6qk" + "commit": "a968a923aad07ab15fb35deb79ac95581a427b4c", + "sha256": "1mb55bbsb32gxms488pjw9fsqiic2qfmwkhm3pwcgy194723vcaa" } }, { @@ -69614,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", @@ -69676,11 +70544,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20201222, - 1503 + 20210115, + 2034 ], - "commit": "5ff56a6a68cde7cd0a67fc60e3e993be52604a6d", - "sha256": "1073x878gdg97xym31mx3l7zpbc51pkspigpxqlpq48q62llcigj" + "commit": "ca504e4387641b648e7bc6037fe515b03a90b801", + "sha256": "0gz2qrkr4gvy5wh44wiy7mhqwlxgfa8fyg0bincnba89161fnymk" } }, { @@ -69694,8 +70562,8 @@ 20181024, 1439 ], - "commit": "68f09b03c090840162d1852f1e92afa8e117cc4e", - "sha256": "1ampghm9laigs0frqfw2yjsm0whh2vff5gqp96i4d88n9ar0wj5n" + "commit": "1a8015038d9a8c6bf0c04a42588fb2a26861be63", + "sha256": "08071i5zv0jg9yb83bq9r2sj6hyw31ziwzg79gsbyr7l8whz7cx8" }, "stable": { "version": [ @@ -69793,11 +70661,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210115, - 340 + 20210124, + 204 ], - "commit": "e8e5211f6e083cf0ba9aac52acb6657818a32972", - "sha256": "1zhvj1j5pvsfa0xzky819fc1xlhy3a4snkyyp1dczbfdnk34kan9" + "commit": "0023fc5b100ec0c939ffe699d1a7d1afcf1f417a", + "sha256": "1fjf16dah95i3vlxk63rlixskgq18kn69fyg6dgpiw7pm98kjviy" }, "stable": { "version": [ @@ -69977,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" } }, { @@ -69999,17 +70866,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200730, - 1052 + 20210219, + 1948 ], "deps": [ "anaphora", "dash", - "dash-functional", "request" ], - "commit": "baeb84dd0be0e7631d1f49da30a53eb61863b04c", - "sha256": "15r5hph17pdy5c5jyxh5sia5yqd81ckki185m9jqg9yls749hy55" + "commit": "b5a221b63c8b311d50807fdfab4ae6b965844f06", + "sha256": "1lq3rh52x0f059lxk0cczins2vggiwjs5m1drj7dkb8lmlxc41y4" } }, { @@ -70092,14 +70958,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210108, - 1350 + 20210124, + 1559 ], "deps": [ "cl-lib" ], - "commit": "6e8950ad296c0f57d80d034eb0b7adf538c02906", - "sha256": "10zjxc6ipm9330awx7k9hzjf28qpnaw2rcz67dc0jbdgxkn16gl8" + "commit": "57357e15643158b4e0d9b3b4f70a82f5fc73178a", + "sha256": "1kbbbx1agzcxc5n1b6cavdx3wjxz6mgi9rafja8mk8cyaaiz0rkd" }, "stable": { "version": [ @@ -70398,20 +71264,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210113, - 1123 + 20210205, + 1412 ], - "commit": "1bbbde4a0c3153f6caa30724bd173397be43144f", - "sha256": "0lawmpg52yc7fsh2rrmwajds2yhx9jr3h8g04ikf4cma95v4d8s2" + "commit": "4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6", + "sha256": "1kfg503j44ivcx9zsqzgjl7ab936vwnw31gb6kpcjhd1kyha0mjm" }, "stable": { "version": [ 0, 31, - 3 + 4 ], - "commit": "d812256aeb91646b5b1c644fa67f07c483cca651", - "sha256": "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v" + "commit": "3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612", + "sha256": "04q9zwy6mpck82zk70xnx2knh2jmqhf676703kjw0fbvdrzw9qik" } }, { @@ -70487,8 +71353,8 @@ "deps": [ "notmuch" ], - "commit": "bac7b56e1a758670e7e6d57d233b45f45961d321", - "sha256": "0wx064c2njjq32dqbv68hysds5bm43921vsr34xb4lk748lk2qhv" + "commit": "9f3e8bbce4c8c6cd80fb71b92d315d4f3334b450", + "sha256": "1rrd3ymc7k8irq1w4496h4whks7lnfam7ibfwgcra074ligfrs4p" }, "stable": { "version": [ @@ -70511,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": [ @@ -70732,20 +71598,20 @@ "repo": "joostkremers/nswbuff", "unstable": { "version": [ - 20201207, - 805 + 20210129, + 850 ], - "commit": "76e5d96f31368a74121076df679255e1ea97f5d9", - "sha256": "08yf7cdmq6nqn4bhm4asj3yavcifwjgkyzhdcr3dm9a9jv1b3w0m" + "commit": "72fac3d4b7a1c42a71cb396d20cc22fca8a52ed5", + "sha256": "17ks8cmnwc313q9vcxbrsv9xmji2hdnw18jczc3xrgl441vkzds1" }, "stable": { "version": [ 1, - 1, + 2, 1 ], - "commit": "76e5d96f31368a74121076df679255e1ea97f5d9", - "sha256": "08yf7cdmq6nqn4bhm4asj3yavcifwjgkyzhdcr3dm9a9jv1b3w0m" + "commit": "71e241763ca0a4a1d1b432e172d46bed4f44dbe7", + "sha256": "1sswhr52rp8c4v4fv30sww1gadbdrlk3l35j8xmqfw6hbgzxb5dn" } }, { @@ -70863,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", @@ -70886,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": [ @@ -70983,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", @@ -71066,8 +71969,8 @@ "deps": [ "axiom-environment" ], - "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", - "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" + "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", + "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" } }, { @@ -71720,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", @@ -71728,11 +72649,11 @@ "repo": "micanzhang/ob-rust", "unstable": { "version": [ - 20180911, - 1535 + 20210204, + 244 ], - "commit": "6a82587598cd097e9642be916243c31f1231b24a", - "sha256": "041mvlwnkxa93fjbln0yc6pgykh6k7fwg1nigr6njgaxlfnssmlm" + "commit": "30fe7e7181f44443d02e905dda77f83ec4944e76", + "sha256": "103j84iblzw87p12w1vjinfsq6zif47lvmjzs0456d8kwli0hpkp" } }, { @@ -72073,17 +72994,17 @@ 20201204, 945 ], - "commit": "7c6e115c38e447e7cfd4d1d128bed363d3d10c4b", - "sha256": "0jik0j3mjyd8fxdlcdkxp0znlw29fm3knqa7i4fgwz6cvzkl9fa0" + "commit": "7db8d1377a127b39e2bf985c91b6a9a8d6cbeff2", + "sha256": "1vwmw3dcqxg7sy0ki86gq4kpva5ncwzygzbl5ml9947xklvnw9in" }, "stable": { "version": [ 0, - 16, + 17, 0 ], - "commit": "101d2306f5b0b23bbc25e1155c1ffd51a0bbf61e", - "sha256": "0yf1kf3yhiw39qpybz2aszwl7kjshiv45d81gq7q7xgn9nqnf0z4" + "commit": "bfd6bbe95c614d1d982244c4fd0ba494275d2245", + "sha256": "0vy69sjl184czpwbhcbgzyh8kgj6n3jq8ckllcbwic859aq8lqvn" } }, { @@ -72109,11 +73030,11 @@ "repo": "dgtized/occur-context-resize.el", "unstable": { "version": [ - 20170904, - 2309 + 20210121, + 50 ], - "commit": "cdee5a631ceed9337579d4090e0acf8140747f80", - "sha256": "0h7ypw45h5rcbwx4c4mn2ps9hp84dpjp3iay2nc9zaavv05n7ysa" + "commit": "9d62a5b5c39ab7921dfc12dd0ab139b38dd16582", + "sha256": "1s2j0205sp40nz1ljwa2nf2zm5mlkvsp95xfrra6rzbdrvbsfxyi" } }, { @@ -72267,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" } }, { @@ -72391,20 +73312,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20201029, - 922 + 20210202, + 709 ], - "commit": "b76a020aedb57a6a7d0ae61cde13434f5c802a44", - "sha256": "1qq0lx0wrflx1r2m7gidnvcv7cipc6dzh1clf5mp50mm2cp88n50" + "commit": "61d26644fd9dd2d45b80b9b82f5f930ed17530d0", + "sha256": "1nvnahwjqs9i2cinkpwg689lg134wp7l6f9f1k1jwn0dh1amqmvp" }, "stable": { "version": [ 1, 11, - 2 + 3 ], - "commit": "b76a020aedb57a6a7d0ae61cde13434f5c802a44", - "sha256": "1qq0lx0wrflx1r2m7gidnvcv7cipc6dzh1clf5mp50mm2cp88n50" + "commit": "a2dbd3dc4e7000fec29febbd089cd4558a7322b9", + "sha256": "0zcph7l0hxisbvsyzb1dw3paq5a5sjp5lrq5nq9zggvgc6zvx7sh" } }, { @@ -72959,11 +73880,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210105, - 448 + 20210227, + 1543 ], - "commit": "cbc0109eac542ef4fe0be027af1c62c4bbf846ee", - "sha256": "0cp8yspghfbgy2nhcqw8irqyhphw4jdr36864m45ralzzxc6lqac" + "commit": "9d5b95f40275dc47a57e9d4ee9b9994ee3a4b426", + "sha256": "0ksjvi257m6ij7dd40rjc106grxi727717w8k58h3i5l6f03w70f" }, "stable": { "version": [ @@ -73147,11 +74068,41 @@ "repo": "dfeich/org-screenshot", "unstable": { "version": [ - 20201130, - 1607 + 20210221, + 1336 + ], + "commit": "6a5d5f8fd7cda1200cf088f415b9983e89a03075", + "sha256": "0gqqcgadlzzbqd4sqbwbwx41app6ryz2l3lrng8bz9hq9cx547jj" + } + }, + { + "ename": "org-auto-tangle", + "commit": "8cdae87606068b7b47530e0744e91aead86d288e", + "sha256": "1cr34yjr43ah9bqvrghlyx2vag7xnamgfijb417k5m70cbk8vcb8", + "fetcher": "github", + "repo": "yilkalargaw/org-auto-tangle", + "unstable": { + "version": [ + 20210214, + 917 + ], + "deps": [ + "async" + ], + "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", + "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" + }, + "stable": { + "version": [ + 0, + 2, + 13 + ], + "deps": [ + "async" ], - "commit": "a467a1f04a416252f067b95c0f00a9f10d03c433", - "sha256": "1mi9h69zdm4yhvpsgiqvg214f5k818y3w1hz626cw0vr2jxmgdf2" + "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", + "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" } }, { @@ -73337,8 +74288,8 @@ "deps": [ "org" ], - "commit": "f7939ef5071895930eebccf490ea7cb25cc54b2c", - "sha256": "0lplrdy5432ckif94vl9phh07c6qfm8cxa1mjyn1dypn2sh8p9gi" + "commit": "e9b9b3e5bb3c63cecb1367df49205c346d9c050a", + "sha256": "0j1f75p40p033acnkds2mxhqx5wilmlhak8cgn196x6y8j1ra7d8" } }, { @@ -73581,11 +74532,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200615, - 1554 + 20210216, + 1526 ], - "commit": "8ef429124c13b1a68f7672cb6e6cb9c8b9d9db93", - "sha256": "178hpp3ylafmr2n3ydcqwqjxa8avlb8g1n3swzndc3jjk0gy6vck" + "commit": "a08f1f607f819791b9b95ad4f91c5eaa9fdbb091", + "sha256": "18ld5kqr0l7nklybdwbwrnkrh06w71myfynbwp9rh8q4lhzh73jc" } }, { @@ -73611,29 +74562,29 @@ "url": "https://git.spwhitton.name/org-d20", "unstable": { "version": [ - 20201113, - 453 + 20210212, + 139 ], "deps": [ "dash", "s", "seq" ], - "commit": "bab77ede4b1aaf879e7c24e0522da624ee23bf2e", - "sha256": "1bcvdl5h4nz2x1zvrq700vf2mbkyhvrslfkabmirhs7hd2q0n41n" + "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595", + "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "s", "seq" ], - "commit": "bab77ede4b1aaf879e7c24e0522da624ee23bf2e", - "sha256": "1bcvdl5h4nz2x1zvrq700vf2mbkyhvrslfkabmirhs7hd2q0n41n" + "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595", + "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b" } }, { @@ -73704,14 +74655,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20210105, - 1758 + 20210118, + 958 ], "deps": [ "async" ], - "commit": "97bec7412e1a4d6e9031c7a0568d0f065cd9fd00", - "sha256": "0jb49q2ayhw1s2dnd323lqc7fy9k3sznxn4dv73s4945j8w2lqcc" + "commit": "947ca223643d28e189480e607df68449c15786cb", + "sha256": "1yzv4r2820pbdpx09rdrrb9lk1dv4axhxif22f1svf8pggisrsd8" }, "stable": { "version": [ @@ -73923,6 +74874,29 @@ "sha256": "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj" } }, + { + "ename": "org-elp", + "commit": "36d4b3e08482f4c51a3d43fc961fd7d1408c5cfe", + "sha256": "1px2q2sxx4624aj09ibmqhjcmx8s0fvvmg42pvyx9gblkayl3nbf", + "fetcher": "github", + "repo": "guanyilun/org-elp", + "unstable": { + "version": [ + 20210201, + 1544 + ], + "commit": "983fd7af4244835601be090211344ed92c36d360", + "sha256": "0v2cgw360sigl0jm8fm1hld71xbcjw9j8xjlr176cn4g308zw1sa" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "f9d48042eed49b9936d162cecb4188456a9cc19b", + "sha256": "0spwyrxirmnf8182xsjrvpl8zf2662434zzhnw4qs7fz7wld2f11" + } + }, { "ename": "org-emms", "commit": "4fa5c221790acca40316510fd495951f418c8e15", @@ -74027,8 +75001,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20201113, - 2330 + 20210228, + 2038 ], "deps": [ "alert", @@ -74036,8 +75010,8 @@ "request", "request-deferred" ], - "commit": "0a6f9a7385410b70853eb65c14344ad76cc6815f", - "sha256": "0m6h2psshkr2kvckp2bmaj2y1cp3kbyw2nwwvwg2k3yymkqr8l7l" + "commit": "133cca813abd2823a6e2a9ada295b7b8b115be4f", + "sha256": "1mwspxx1im87qa886w9ib8a104xzi02qky6z5pl8va0mrcnpl86i" }, "stable": { "version": [ @@ -74181,28 +75155,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20201127, - 1712 + 20210226, + 1636 ], "deps": [ "dash", "org" ], - "commit": "1654be88f5a5e1c57e5d204f060f9a07ff4242cc", - "sha256": "0gzrdrr0b8rs2lb96j0zczmfvsy37fwri3dxzdpyvddb4x5a1rl2" + "commit": "5f9ac60cedb0be935c2b7ccefd484c0a378bc9d9", + "sha256": "0xbxfrrbcklhji6j99hvz7j6k6hv60cjvrwnf5kq3af1wy0kiayg" }, "stable": { "version": [ 1, 5, - 2 + 6 ], "deps": [ "dash", "org" ], - "commit": "a5c5ff8f2d3ae1fd3ef81511bd4b0226f6764935", - "sha256": "17r36k2gdk8n1433a84c490js1x22yjwr21ihcjj13mnfcglmzhp" + "commit": "f7e6dfb349e5c93a134f1d6badacd504b5b345ef", + "sha256": "1h65qa0m3p999pbhw9z98pn7bnz1qczsfybp3zr0g66mi7qqbalq" } }, { @@ -74237,30 +75211,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20201117, - 1211 + 20210226, + 1635 ], "deps": [ "dash", "org", "s" ], - "commit": "0863397ba2782e229fa6216beb074dd44eb0c031", - "sha256": "062dm9famamziqjczyk6w6ynk0qw6dp4k6a5k81iscz0gdlv6cfm" + "commit": "1f029b28b817dcdc7d1deb734a087ba08e66c6b5", + "sha256": "04qcdf3knpxjjp972skdqgdh56bhh8frvljw1zb5wnln6byvqxr3" }, "stable": { "version": [ 7, - 0, - 0 + 1, + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "3ada80bca278bb0fb791f7498cced6e8c9752064", - "sha256": "1y1nrw39bc1ng6p4asy4lv3y20vdvx1cqa03s5jf9nccddn5j924" + "commit": "c8998d4b81879c757cc2825200543921e0f6b637", + "sha256": "0cjpvcwfiaanaii91937907nsfadwnnlaq16yx79xk8gcvbrx1fg" } }, { @@ -74271,14 +75245,14 @@ "repo": "shg/org-inline-pdf.el", "unstable": { "version": [ - 20210107, - 940 + 20210119, + 529 ], "deps": [ "org" ], - "commit": "a449c614d63712cd55e8c38d4679667117c132c1", - "sha256": "0grsmhif0pmdsvc6lifxip1jh57h5him6ipzkr1rvbs5l47qndk7" + "commit": "f9a3321712626d2f43a8849203ceb089cf8233b1", + "sha256": "195bzlfqf91f7prv4xh1x1p5xnyygr0mzwqxbsw2apc0haaz6ajk" }, "stable": { "version": [ @@ -74354,26 +75328,26 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20210109, - 913 + 20210204, + 820 ], "deps": [ "org" ], - "commit": "08d5fce95023c015372678d353388ad0dae8952b", - "sha256": "0f1826xi9z895a1wgnvvv5nqpi2r0l6f8h761zk8ng9j1rhkz865" + "commit": "f4b15499135d43e98244dda4606a5b97462b3f39", + "sha256": "140wfvj2cygpip75w60difg9gwvh5c53ds6zbysnj5zqsjm4zica" }, "stable": { "version": [ 2, 1, - 1 + 2 ], "deps": [ "org" ], - "commit": "25ebb8f1c8cd8993fb75a15e2bb8144fb6f9e006", - "sha256": "1p9i6v3bwi1ab576vc9qg1ki91197d6nkkg857s52zsan1zlkzzw" + "commit": "c26e73a017963f6638044f1f63354c453f2db54a", + "sha256": "0s82sh2svc0mzr1ak414n5r2j0dmwvvyx4swk2c61zivc2gjd778" } }, { @@ -74473,14 +75447,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210114, - 1508 + 20210222, + 227 ], "deps": [ "all-the-icons" ], - "commit": "e20c116f7a7a42f0cd6af580ef6e53e006c5b538", - "sha256": "1321z866ahs07kil4yzqvsnjcdldapg1gvfx9k9rdx11x3awja2q" + "commit": "4662b3a7b9244aa35aae2f469f87be4a44a6b1bb", + "sha256": "1wb00rm6zdlb8hrhph783wi8zjra8m09gi6m2nnfr37al3986g0s" } }, { @@ -74551,15 +75525,15 @@ "repo": "dfeich/org-listcruncher", "unstable": { "version": [ - 20180815, - 603 + 20210130, + 1405 ], "deps": [ "cl-lib", "seq" ], - "commit": "65c09c5deba065752eb88875c54dc26abcdfaffb", - "sha256": "11chlfvil0wbvzaplzdymn4ajz85956hcs8bh3zds6ij806mqa4y" + "commit": "291a824d8da1c14a883e21281b596ce9dcd11e1b", + "sha256": "0bz57dvydz67bk704q2daxkfpdygxmz9jf6ilycjip2v16lx37i1" } }, { @@ -74652,30 +75626,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20201229, - 418 + 20210224, + 2308 ], "deps": [ "dash", "org", "s" ], - "commit": "d856ac6f0afed0299a47ed77830c676fd0fa9e55", - "sha256": "1rydmbjzq24vzfpfrb93ad4wibhpc4rnk7crqbx1p11sdby85h95" + "commit": "1b02583a5cdb8f6b7cd82b31ec80b53753cb7729", + "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" }, "stable": { "version": [ 5, - 5, - 3 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "a396e4a11394b5e00aef1450488b61aeddbd9b55", - "sha256": "1rydmbjzq24vzfpfrb93ad4wibhpc4rnk7crqbx1p11sdby85h95" + "commit": "4fe1f194a8eba00858b78d611ad8a7f14392722d", + "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" } }, { @@ -74704,11 +75678,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20210113, - 1416 + 20210216, + 1141 ], - "commit": "e08e2ab2b71763f53f2029471057d58f96085a69", - "sha256": "10v1ric4xppx92vv722d50as350pw14cqkjlswi0nqssgihxrk11" + "commit": "99ac0c85060f9e4710de73db4a19120a0a23c39e", + "sha256": "1xqb9pcj6hw1z6anvy5hm78a90m442cg868d62yyynwkzjyns64q" }, "stable": { "version": [ @@ -74728,14 +75702,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210111, - 2224 + 20210209, + 2056 ], "deps": [ "htmlize" ], - "commit": "c19f54beebe268833c44a015861bf02531591011", - "sha256": "06c8hlj3zpsx9xsw7xr06db8c61iczyvn3kkwpg54p03sjzmpsnx" + "commit": "89e746c0a864031eef940758230bc7263a6f2289", + "sha256": "15gd5zbxvdallyra9lmpb9i1r2mmwz0j0i0ra7j9imnbfiz3ln9r" } }, { @@ -74746,8 +75720,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20210111, - 1022 + 20210228, + 542 ], "deps": [ "dash", @@ -74755,8 +75729,8 @@ "org-ql", "s" ], - "commit": "c9005cbe4077cce3743b680dec97c11fa179bb36", - "sha256": "1428lky09cvlqdb8b9zf0x49cxmigrkhvhi391b2mj2qzgmjzcvm" + "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2", + "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5" }, "stable": { "version": [ @@ -74864,8 +75838,8 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20210110, - 2132 + 20210118, + 1611 ], "deps": [ "org", @@ -74873,8 +75847,8 @@ "org-pdftools", "pdf-tools" ], - "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", - "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" + "commit": "a5b61bca3f8c91b0859bb0df1a929f9a31a57b99", + "sha256": "18iy03hc7jb7qsfj25f6hmrwli6fyjbf14c1p5bhp5gwk49rm9p1" } }, { @@ -75018,39 +75992,6 @@ "sha256": "1hnd4zhhwrd6gr1skvc64a3z9k3nmhwgcyy1cp2jfyhk0iwsrqfm" } }, - { - "ename": "org-password-manager", - "commit": "38249f32d150d10b6ed86679361d99ace2375a02", - "sha256": "148rv5kzmnqlfn8z2474wn0bxir49d4mb40mjrv76kvyzyj7nly9", - "fetcher": "github", - "repo": "leafac/org-password-manager", - "unstable": { - "version": [ - 20180227, - 1810 - ], - "deps": [ - "dash", - "org", - "s" - ], - "commit": "4b30a36e71182553a02e4dd415369290d98ec03a", - "sha256": "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis" - }, - "stable": { - "version": [ - 0, - 0, - 1 - ], - "deps": [ - "org", - "s" - ], - "commit": "d3a33ddfe583180bdb76cfb8bbd772e0078b24a3", - "sha256": "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck" - } - }, { "ename": "org-pdftools", "commit": "d52346a042a72b76729d259c7f12f45d38ac27cd", @@ -75059,16 +76000,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20210110, - 2052 + 20210118, + 1611 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "812bbff3212097bb9f8d2acc4b25826ed45dde92", - "sha256": "1iaswir2fwbhnwlyi2a1h9azgfdsa8m5ydgyckf67a2y5ykwkwv7" + "commit": "a5b61bca3f8c91b0859bb0df1a929f9a31a57b99", + "sha256": "18iy03hc7jb7qsfj25f6hmrwli6fyjbf14c1p5bhp5gwk49rm9p1" } }, { @@ -75079,11 +76020,11 @@ "repo": "tumashu/org-picklink", "unstable": { "version": [ - 20191203, - 59 + 20210210, + 516 ], - "commit": "f79040ed988bdeec63b098b187e00f2b80d3d570", - "sha256": "0a0dzg8w617sn079mshihfv5sm74xphab81kmvi1dqcc5iyi15kh" + "commit": "bfdc22b436482752be41c5d6f6f37dca76b1c7c3", + "sha256": "1asq336rff0f1zh5crsj3xwyx4xiwdypzy6dlqrxzszkxx8sd4dd" } }, { @@ -75437,28 +76378,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20210111, - 1807 + 20210121, + 1011 ], "deps": [ "htmlize", "org" ], - "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", - "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" + "commit": "18a2456befcfda5f681b2b4041f3262f93e52cba", + "sha256": "1274zq6qhzl8l7hpbh2spgmf9hqrilcm31m3mbybj6gm085g17dz" }, "stable": { "version": [ 3, - 6, + 7, 0 ], "deps": [ "htmlize", "org" ], - "commit": "7b536b497edc46e6231f33d2c1eea9cd9a7eabbb", - "sha256": "16kpprrcylrysbpqsz2k47q0qb1yjz9y7az71aik1nskinnml83v" + "commit": "d404eb13d9e34354c081870ebdd69711937682b3", + "sha256": "1vzn0l8ig4rzh5h8j7kxn8kslqrij97qqv98fbnlwmrw4z87v8dr" } }, { @@ -75569,8 +76510,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210113, - 1549 + 20210225, + 1454 ], "deps": [ "bibtex-completion", @@ -75585,8 +76526,8 @@ "pdf-tools", "s" ], - "commit": "cd0b4997fad3a050a0092d1458d34286ef5122d2", - "sha256": "1rn9x5p4kmm83smg7c9xalbziliqq02fwfl4v1cgczqyb7vir7nz" + "commit": "7dbe3ace9bf8ba9bd7c28c73ff960b4732d09071", + "sha256": "0nyqhbdbawg0rfqzgfqhk38hk1mb0naksrmrgha669zzmha6vd29" }, "stable": { "version": [ @@ -75712,8 +76653,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210111, - 1138 + 20210128, + 1341 ], "deps": [ "dash", @@ -75723,8 +76664,8 @@ "org", "s" ], - "commit": "05a9bc44f2d158cc355c904382f2c7b079aeee15", - "sha256": "18s3qp671g28qy1qllnm4lay7mvyar8qcqqjn8yd3417gxwndqhh" + "commit": "b0fd12647b94ba6e3cf82a2a5b1ee7655ac07760", + "sha256": "0blpfwiff0sn39hfsk2zznmkj8ad0f4a65vcbgdqmmc9i56yahv1" }, "stable": { "version": [ @@ -75752,15 +76693,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20201220, - 1653 + 20210226, + 1227 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "9ba15069c3f7ecd1080873cd3a7d587eb7c72d08", - "sha256": "0nfsrrca1p5xlildcbjisfhhrwiwgd6jv0nfn4a2gdpxd77v39d6" + "commit": "356cb0f882ed925913dd41e1901dec0c2f86fb98", + "sha256": "0p616v191h10hz98la52qy19bg1ry4vy6y88hgw0i3ndh6k872s2" }, "stable": { "version": [ @@ -75784,8 +76725,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20210109, - 935 + 20210201, + 1122 ], "deps": [ "dash", @@ -75795,24 +76736,25 @@ "s", "simple-httpd" ], - "commit": "c7793202e9929dc2a415482779141e7b429421ce", - "sha256": "1z29xngyxmq0pd8kfx6z8n8hps4apnffnsi8qc0hvmyhp197hkqc" + "commit": "2093ea5a1a1f2d128dd377778472a481913717b4", + "sha256": "1jp8mkqx1l3w166b16l2d5zsqjcc836bkclplgjk4laysb6msry8" }, "stable": { "version": [ 1, - 0, - 4 + 1, + 2 ], "deps": [ "dash", + "f", "org", "org-roam", "s", "simple-httpd" ], - "commit": "fe0364ef63928337f442c1d987d17cfe9619df2d", - "sha256": "0a5b625i7gv467xm8p92nvrh2wzgmldm8gzcbrc15al1gvnwpbqm" + "commit": "2093ea5a1a1f2d128dd377778472a481913717b4", + "sha256": "1jp8mkqx1l3w166b16l2d5zsqjcc836bkclplgjk4laysb6msry8" } }, { @@ -75999,17 +76941,16 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20210114, - 2006 + 20210228, + 212 ], "deps": [ "dash", - "dash-functional", "org", "s" ], - "commit": "0c5a7b97be4e5e11093276af310442ab5776ab90", - "sha256": "1311yxmsdb9gms0v20dd7ak0vdkkgda5p89zrp21v4dazjh7rl9a" + "commit": "143146d5bab10e32d4a24f4c3e5e30905b0f3176", + "sha256": "1wbb5isfm1ixv2zbys75cn276zcr2927j3h2crb081acygm78qqv" }, "stable": { "version": [ @@ -76033,30 +76974,32 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20201222, - 206 + 20210220, + 2146 ], "deps": [ "dash", + "f", "org-ml", "s" ], - "commit": "ddbab360a49d4c0cab964cd1fdb80d2135a10272", - "sha256": "0rhc5sb6drzndxay52qb3f1kbxfnwvz99i1jpjs4adsmyhx35xai" + "commit": "87c712740cc0e934bbb9fd322386adf45f05c543", + "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z" }, "stable": { "version": [ - 1, + 2, 1, 0 ], "deps": [ "dash", + "f", "org-ml", "s" ], - "commit": "6160de13bcef3ad91c706d8a7b1601703b424616", - "sha256": "0rhc5sb6drzndxay52qb3f1kbxfnwvz99i1jpjs4adsmyhx35xai" + "commit": "19eaba4dcadb3f1101a2363aac2a6d2430559c70", + "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z" } }, { @@ -76067,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": [ @@ -76106,8 +77048,8 @@ "org-starter", "swiper" ], - "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098", - "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63" + "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2", + "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf" }, "stable": { "version": [ @@ -76131,11 +77073,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210113, - 731 + 20210222, + 1035 ], - "commit": "0da4f8cc3a09bdd107da18ab381a4cabb461430d", - "sha256": "1684cxa1qj3b90zckhph7vawwxwa0djpaqwps0vh9p8yngy794z2" + "commit": "9b9f7a994be54a10f5ac2a58221d52555574f78d", + "sha256": "1s3p7ig0swp1msvrzbkpyf6nv121rgschcacs3c5ps758yldg5lh" }, "stable": { "version": [ @@ -76221,26 +77163,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20200818, - 2257 + 20210216, + 1925 ], "deps": [ "org" ], - "commit": "7f83636db215bf5a10edbfdf11d12a132864a914", - "sha256": "086h7fj7k0199m3i01whmqzi4kb4h6ncikdmv6skxs41hzpnjvk4" + "commit": "9d64c42e5029910153ec74cb9b5747b074281140", + "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a" }, "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "org" ], - "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d", - "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb" + "commit": "9d64c42e5029910153ec74cb9b5747b074281140", + "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a" } }, { @@ -76348,6 +77290,25 @@ "sha256": "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy" } }, + { + "ename": "org-tag-beautify", + "commit": "faa48723cbc4486c2d8262d00aa9967bfad81738", + "sha256": "1dn164z53c38bfzx8m22dynfx2wlw8cgcm63q6kvz5xsxqqwwsmp", + "fetcher": "github", + "repo": "stardiviner/org-tag-beautify", + "unstable": { + "version": [ + 20210202, + 628 + ], + "deps": [ + "all-the-icons", + "org-pretty-tags" + ], + "commit": "4a6de709ee0d4ee719c83df6dce86f38f9db1f75", + "sha256": "02qw4b750p4rav9kw3qwcvmril8wxkgdfqklbrfbws6wz2sjjv3l" + } + }, { "ename": "org-tanglesync", "commit": "2db07414d2d39b2d40a2ae91491032844b82d801", @@ -76465,26 +77426,26 @@ "repo": "Fuco1/org-timeline", "unstable": { "version": [ - 20190612, - 1759 + 20210210, + 2306 ], "deps": [ "dash" ], - "commit": "f628519a12ce3d534b9aa5043b0273880cf29790", - "sha256": "16qjbw5l39j3kc4lfpm18ba81w9bhy9cdd3fii1n7dwyx76av73i" + "commit": "af1b44e18048278a116da89faf138310f09c74c6", + "sha256": "05gp5hqfwx668a0qvpx1wn8957qgn6g9jhrhiwgscnnxch2dp0c0" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "dash" ], - "commit": "aed995c1db6c8bfd9db0a75a978f5e261aab38e5", - "sha256": "1jz44lag1j4rawqjpcgb9zrs88vfi7vjgdh756hs2ln7i1cnvgh5" + "commit": "55cafb5512a174c3898aaacd71ab58832b9fe321", + "sha256": "106603835m3dy3bzjiasq2w574faxnn5kb72gr0y0mdkd0iwh8qa" } }, { @@ -76585,11 +77546,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20201215, - 1117 + 20210224, + 1213 ], - "commit": "d6e8e91433dfe4968f1343b483f2680f45a77d52", - "sha256": "1zz12xk8vl2qic5hpvl0jcwysbmrfb6rfigvf8hr3nhdm9fp36aw" + "commit": "9d2ba1df456d8d7c6372c8c294dbe3ee81540b33", + "sha256": "145avv616k190wzirlrh7rljysfffhh3j37wr7p6sk13wayqc27h" }, "stable": { "version": [ @@ -76731,11 +77692,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20200720, - 638 + 20210208, + 305 ], - "commit": "1ae97371b207dabfecaf6b4f7118abafe6cc5e2b", - "sha256": "0k9slz20gxcdpvpz8kgvvwff6cif74wybpqgg9x03wqqqda3f37v" + "commit": "f4b7445550deb30e170a25fc42541e99730e21d0", + "sha256": "07dwxxwvahl153w6nsgfwrxgiw0s6c12kmvqvni19n6aiv3zavaj" }, "stable": { "version": [ @@ -76844,30 +77805,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20201118, - 810 + 20210226, + 1635 ], "deps": [ "dash", "org", "s" ], - "commit": "cf4bd2bfb11d0e0ed8c9228c07df8eb8150504f4", - "sha256": "10ailnbq2hhn8cnw1lcibhm8vgvy1437h48gbwxkk2kf25wpm73p" + "commit": "866010a4391d12c9c1968a74e396d9b0ffa58d78", + "sha256": "0s4xkzz39xd4cdfb325h1d3nwpp4nzfzn9w1wjfpgz9n5mrpmhvp" }, "stable": { "version": [ 2, 4, - 0 + 3 ], "deps": [ "dash", "org", "s" ], - "commit": "cf4bd2bfb11d0e0ed8c9228c07df8eb8150504f4", - "sha256": "10ailnbq2hhn8cnw1lcibhm8vgvy1437h48gbwxkk2kf25wpm73p" + "commit": "8e22ffe59d241a0f43395f2cd88589ffb0c7db23", + "sha256": "0vcawnrj5ap3h0cy5h1nsiki41scgdhxf83adnvv3lj6gwif1l9a" } }, { @@ -76990,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": [ @@ -77022,8 +77983,8 @@ "repo": "tumashu/org2web", "unstable": { "version": [ - 20171005, - 2317 + 20210203, + 324 ], "deps": [ "cl-lib", @@ -77035,8 +77996,8 @@ "org", "simple-httpd" ], - "commit": "5243b399927a4c474bb3b8d1c8a00799df1f27d7", - "sha256": "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7" + "commit": "6f5c5f0cc5c877ac3a383782bbe8751264d807b6", + "sha256": "12rgrmcp91y27zcq8kcqvndb38n6ix4amf13cc2gjhi6aayxxx7k" }, "stable": { "version": [ @@ -77081,8 +78042,8 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20210113, - 1838 + 20210121, + 606 ], "deps": [ "dash", @@ -77090,8 +78051,8 @@ "ht", "s" ], - "commit": "6e0b1d094bc624a895d198874a8a423dfc033247", - "sha256": "0fhnlzg0gh9bkb471kxgsx69zqk1xybnii4lyv2lshylxac918a6" + "commit": "50c11af264505b026aed77d6b67a132f7d4f7e6b", + "sha256": "0q5qz7bm8k17v9mzixb4fbdcn9czcskkrrlnk38sgj390d2pyc7c" }, "stable": { "version": [ @@ -77190,8 +78151,8 @@ "org", "orgit" ], - "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", - "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" + "commit": "051d92661ef12b67ffadb231324806d87d1e6a54", + "sha256": "0x8wmqp9x2c7qv0ipj2rvjf7bc7z0pn8s253gjxpxmakz3l8wnyk" }, "stable": { "version": [ @@ -77291,8 +78252,8 @@ 20201129, 604 ], - "commit": "c63c1682de9a10c6d6946978c154f09bb6fa7284", - "sha256": "0vp4s8m1rg0q3pd8vdk8ys03dzsibglpkx30hfw10z847fbif85w" + "commit": "50ce687d0be602c86256211fc8f783f5ef7df8a5", + "sha256": "1hr476lr2lwh4hz8z9yi2n3gdyzaabchn364jzwkppjksq9q0q6h" }, "stable": { "version": [ @@ -77312,11 +78273,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200829, - 708 + 20210225, + 915 ], - "commit": "bab95388b182c07bc9f0679426514fe7e8c997d9", - "sha256": "18qasx17hgfrmzkljjpni4m2lgic3imyksjg6wa7xrjf0y3kwmgw" + "commit": "bcb38ada8469a7f6f9a915c36760a05b2c68ad88", + "sha256": "1db0wm7dlx1yqnfhbw4m3q3a8x4wk02j1c276qazhff4n03mbhf8" } }, { @@ -77342,14 +78303,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200825, - 640 + 20210225, + 923 ], "deps": [ "cl-lib" ], - "commit": "e93e8eaeab2137bc391cf6d0643619ce6b066d19", - "sha256": "0rbcdgsb7vzsjiwk5zskv15sf8npxdsbvpzd9r6s7aib83mb5kqa" + "commit": "f411d38de5e36f65336a37e43cfe9a5125b6543a", + "sha256": "05m6xq1c3cc2vpwfgknjx6rad8lr2hd6prbziq04qxp8x8qcs3sj" } }, { @@ -77648,8 +78609,8 @@ 20200215, 513 ], - "commit": "703ee41303dc251b7672b7cba5aeb6aa54a76c90", - "sha256": "0cplbz7mc2zrxfk8g349ahb7gzli2hn5kda9155nbk8dw74xmj7d" + "commit": "94240ebb716f11af8427b6295c3f44c0c43419d3", + "sha256": "0c3l50qpdzracjncsbjv5chpvjdphhzwqk4jwv31fw6p62i1zvlb" }, "stable": { "version": [ @@ -77739,11 +78700,11 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20201031, - 1318 + 20210214, + 1715 ], - "commit": "a34602b59063dd22ca6877466b85b2728f03c242", - "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb" + "commit": "bb6db842e4fc2ed4d635001938ebafe93925f48c", + "sha256": "0h54wdsh6g0wmqf356s6br08hq29p6cdrsd14q9w6qaxhmfzbs7m" }, "stable": { "version": [ @@ -77770,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", @@ -78044,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", @@ -78067,15 +79043,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20210113, - 1749 + 20210115, + 2234 ], "deps": [ "htmlize", "org" ], - "commit": "bae9075745f21da2dfce311ae3ca8ad12d75046c", - "sha256": "04hnl7w6hf2jwd788p3p633bdfcziwll8638mlmslpws84iwx905" + "commit": "38b83ac6a70e9f1bc5cefb79a3b4e5397d11e467", + "sha256": "140yj6z9bz7i6ap7m9b465ambsczmx43zjp7887qjf77zbnf152b" } }, { @@ -78200,14 +79176,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20201111, - 1638 + 20210129, + 2241 ], "deps": [ "org" ], - "commit": "6bc8ee08023695fa167ac0ddf1fc61e1975fa1ce", - "sha256": "0sb4ms9wd6085g6c6kfjm4bk9z1z02l8dbn15xs9axzksk4zcq6x" + "commit": "6805ccc23365620004034c18fbed22a8a07bd4dc", + "sha256": "12z1w6xsdx7p3q20h3bfap7ghxlj7awd6vpf4g3r7acd86fmxkjq" }, "stable": { "version": [ @@ -78352,8 +79328,8 @@ "deps": [ "org" ], - "commit": "be0a0dde62fde8cdf8d72b6968344906aa8c6f54", - "sha256": "1afikv50ii4xk9pkg4m6dx246bjnwka37lccif8i5r48hfy5w4bq" + "commit": "c4487689309dddff3228603754b69ab381cfa5dc", + "sha256": "17p42zv2slnfahrh9ln3rrh3fjnh2bk4j4fxljn589cgv0wblwqc" }, "stable": { "version": [ @@ -78534,11 +79510,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20201208, - 1749 + 20210219, + 2023 + ], + "deps": [ + "org-msg" ], - "commit": "b7b1d682a724ef4ea729327395aa6577cba27133", - "sha256": "1cznkrcxi0pfs7i1fvz6zg8b3z2axcmqmjw62s15p0fhn4d2czxf" + "commit": "7e135fb51f252ab1ec5a31e05a1c7e638b656b85", + "sha256": "1lg00p7nr3y5wjm7r53c93gx0ycqjgsrj4w5jxw6fzrdacqdnsz9" }, "stable": { "version": [ @@ -78557,14 +79536,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20201211, - 1518 + 20210215, + 1605 ], "deps": [ "org" ], - "commit": "e8673f4825b1c6e97f8ba895ccaf8c460cba5a09", - "sha256": "08gsb4c7a3hvkp3vdzad2wbs3n6ldxddhqp7bxsgsw7z3gfb4snv" + "commit": "499c5777174dbc7318e3f32fd50357c2823b228a", + "sha256": "1sf7ksda0898lgig1qhdzqm9v2jgrr033ainpb9406ij1v63gsh7" } }, { @@ -78721,6 +79700,21 @@ "sha256": "05133n998sp3qymhrz6sarjc7ypzjiwpvpcgilq6z8i4sl2ip98q" } }, + { + "ename": "ox-timeline", + "commit": "da58cd5a678314a359f6bdec404574b473ff361b", + "sha256": "0b0jb8n38rrllv4w2kcdh33k3vpjl0dyy7v4lpczsy23880pyfbq", + "fetcher": "github", + "repo": "jjuliano/org-simple-timeline", + "unstable": { + "version": [ + 20210118, + 536 + ], + "commit": "238e05b01dde37fa27a3a8943cc04dcc9b9b83b2", + "sha256": "0949gabr0wfsrzzaf217jsaawkc3gj1lxkrzwp3bigmxngsn4ykn" + } + }, { "ename": "ox-trac", "commit": "4b73753ef9229d0fdfbe237acc63126f1786a494", @@ -78946,26 +79940,26 @@ }, { "ename": "package+", - "commit": "49cfbbc4535aa7e175aa819d67b8aa52a6f94384", - "sha256": "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn", + "commit": "e6af50f8f11d89eca83f96f312fd9a143edae6d9", + "sha256": "1gyhy0jgqj9vv7ddm4xi5x5jaqdhkkc4mqcyr7134v2355nbpqlj", "fetcher": "github", "repo": "zenspider/package", "unstable": { "version": [ - 20201222, - 255 + 20210124, + 640 ], - "commit": "59b0f6daf219a2e0a0a0389d56471eb2a876f21d", - "sha256": "139ffhhjv45fbxqjasv46v0057sjbynqi9x6g7vikrph0js7bnja" + "commit": "06fbc904e09d3349b669c2624a587fee5accf5ef", + "sha256": "0mmziyswrfj1a43cy6qn1d8b1a302z4w3xk4z5yi5frdr22j684c" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "59b0f6daf219a2e0a0a0389d56471eb2a876f21d", - "sha256": "139ffhhjv45fbxqjasv46v0057sjbynqi9x6g7vikrph0js7bnja" + "commit": "2729bfd012c53733d3e00267d81d849ce5aa8e2d", + "sha256": "1ky1zm1rwkl0cphvdhg5vhzfg7syp8dhq774dq526nlrbfsvmiph" } }, { @@ -78976,14 +79970,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210113, - 329 + 20210209, + 1639 ], "deps": [ "cl-lib" ], - "commit": "71484efbf5f5df74c0db9936019c2e08f5ef3789", - "sha256": "08w97l0xycnm2z43n51bmgkf38cgaj4jq8p3qxyw3gx76605i8ck" + "commit": "d8ec8ddf5e39b61e9338de9a778633b7e01854cd", + "sha256": "1wdii6hlvd4pbgf7bp9d8ay0kd34nyxz2w7gyq2kx43hlcgxhyp1" }, "stable": { "version": [ @@ -79020,15 +80014,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210111, - 341 + 20210227, + 314 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "348b15a1da1d62dee378b33971e39758b96c6575", - "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" + "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04", + "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz" }, "stable": { "version": [ @@ -79057,8 +80051,8 @@ "deps": [ "package-lint" ], - "commit": "348b15a1da1d62dee378b33971e39758b96c6575", - "sha256": "0zj7qxb3b0yrrfwa8n9hhzrnsyh9msf38glmn8r087p27x0ifwzr" + "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04", + "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz" }, "stable": { "version": [ @@ -79110,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": [ @@ -79143,8 +80137,8 @@ 20201120, 2047 ], - "commit": "3b96dedb404f614479c1b321fac3e4bf11ba0782", - "sha256": "0fbv8ryxjz1ndfv4ximmr5m1rd9xkmi8dp0x14r8g5wiy9959asb" + "commit": "47437da7839394b079699eb4cfcc00627ab2df8e", + "sha256": "0hp80n3mxnkssq431h9b9xlz21dqkyzjsajylrnbfvqqwqh293qk" }, "stable": { "version": [ @@ -79164,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" } }, { @@ -79272,6 +80265,24 @@ "sha256": "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm" } }, + { + "ename": "pair-tree", + "commit": "ca9422233229d8703641d87d9250ad3f38c11fd7", + "sha256": "0rv6yp2vzcvnjkrlihm2a2a62879rcqwnzw7ph535drvwfl0inws", + "fetcher": "github", + "repo": "zainab-ali/pair-tree.el", + "unstable": { + "version": [ + 20210214, + 1651 + ], + "deps": [ + "dash" + ], + "commit": "972ba441c40edf9b2c212f64fc6670104749662b", + "sha256": "1v4d17hdh3dvb2a4n10gxlr20zal8c7v456wiknkfrpv06d8awap" + } + }, { "ename": "palimpsest", "commit": "14f6d011a0314637a2f4c1b00efa4912e67b7fa4", @@ -79413,15 +80424,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20201120, - 2241 + 20210201, + 1150 ], "deps": [ "dash", "hydra" ], - "commit": "0630a112ae7d3eab1a4c47c7ef380915560a6bb2", - "sha256": "1k31pkvd9m798i6phcr0y3wd34fgq6ii41hx3lszmikvxb1yvm2y" + "commit": "69ec31fc4da30dca2d223ac9ed1bcb5f9d3801ba", + "sha256": "0c4j95c2axbhw0jnqsj9qxc62cdqwk2w3g4a2zgi64m2qlf3q4c9" }, "stable": { "version": [ @@ -79653,20 +80664,20 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20200103, - 1238 + 20210127, + 1749 ], - "commit": "eb4a51b8ef455e0914108105e7c0008d675457cc", - "sha256": "17bdcxah216z928387yx6z9lmp4jsi461n8fwiqaibn2qy5fagas" + "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", + "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" }, "stable": { "version": [ 1, 0, - 6 + 7 ], - "commit": "eb4a51b8ef455e0914108105e7c0008d675457cc", - "sha256": "17bdcxah216z928387yx6z9lmp4jsi461n8fwiqaibn2qy5fagas" + "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", + "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" } }, { @@ -79692,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": "91856b9c5817ead97aa034fe108c4a6e884802b2", - "sha256": "0l16x34af9y60n6502iihl9nz1w4kq8hx1dipi6xa16kr5gs8ba6" - }, - "stable": { - "version": [ - 0, - 4, - 10 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "5b3b247d68eeaf7404598cbcbf2158e07f16e65d", - "sha256": "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk" - } - }, { "ename": "parinfer-rust-mode", "commit": "b35f28995db0c21ecaadd5504a10aa2ee5ac2070", @@ -79732,20 +80711,20 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20201124, - 616 + 20210218, + 1650 ], - "commit": "ca9e7b6f8c3c70daf6a933952955b6931a24af83", - "sha256": "17gf7ahvplgr7x3afpdm5zh8w8y45vzjcyb4jg8vn67grq3kij74" + "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", + "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" }, "stable": { "version": [ 0, 8, - 2 + 3 ], - "commit": "0953765ec361c1c0d6f36eb3c5dd706752af2482", - "sha256": "1d9885l1aifrdrg6c4m2kakhs3bbmfmsm02q96j0k0mzzwr7rs41" + "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", + "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" } }, { @@ -79789,20 +80768,20 @@ }, { "ename": "parse-it", - "commit": "3f163ca64c2533603410f320c7e9b9b1c2635458", - "sha256": "076b981jdhgv7kqdj6xnckp3x25wfymy0il9fffrpyfs7hrcdzgf", + "commit": "9e89bebbccf9ccf85841b00bf113925f8fb20775", + "sha256": "0l3h3sjr3xipj8lm7ph03jl326mcxscsbh0gx7gfrwfaynjb61kl", "fetcher": "github", "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20201103, - 1107 + 20210222, + 1623 ], "deps": [ "s" ], - "commit": "580713c0c578f6c91f6851ae2120e8a9b7871bb0", - "sha256": "0c61gyks581xx47a4lrdjx64d1x1py7qmzsxklvwlcx0gq6pzalm" + "commit": "b1b80d1bd1cb852d344a8daf6ba7142be2c9ee7b", + "sha256": "1dckhlzxzr8zj6hbccgs60igigcij9qrvsb3v80z5dqgj24mqab2" }, "stable": { "version": [ @@ -79956,16 +80935,16 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20201230, - 1556 + 20210203, + 810 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "a095d24cf06a7b0fbc3add480c101304a91cf788", - "sha256": "1nv6xs90zkv3qd0jxjwxlx132cz0ias0i7n2kvih6fp5gfkrzdci" + "commit": "5651da53137db9adcb125b4897c2fe27eeb4368d", + "sha256": "0xrdi06m55mzm14fw0ly0xbfyh2g43k3np2fm771nwzdw5kmin4v" }, "stable": { "version": [ @@ -80013,17 +80992,17 @@ }, { "ename": "password-generator", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1ziiz4x4slfadlm7fjpmwvq4a9fi3ird74b6v5na499ylqnzrl59", + "commit": "fd591276073bf87fd9debdffc396f650790d566a", + "sha256": "0kb424axcik38a9zn2a6mabs3ya6bs8zh06d26jzyaa4d2q75246", "fetcher": "github", - "repo": "zargener/emacs-password-genarator", + "repo": "vandrlexay/emacs-password-genarator", "unstable": { "version": [ - 20201123, - 1610 + 20210224, + 1705 ], - "commit": "d754391d11d1d384833eb82fd34e02d2baec36cb", - "sha256": "1658mzzdk012rwn049dxzrqp1k4vfbvrsksnh06zdn8m6n7xqi28" + "commit": "778f98d507d337f916bb3251fae6e351ebe50aa2", + "sha256": "07k2jsjfl3cyk0piikvn03280hbmggvkwkfin8s1wz54495504g5" } }, { @@ -80034,11 +81013,11 @@ "repo": "juergenhoetzel/password-mode", "unstable": { "version": [ - 20170412, - 629 + 20210214, + 1905 ], - "commit": "ed764a4ec1011526457c71b7c37fa9a659a866ab", - "sha256": "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr" + "commit": "ed4a4bedbdd920aad486009932495cb6ab70c3e6", + "sha256": "1xqsrvnqcfmlncqbys21p8pzwxl064lzgs5qfb2m6w0p9ipblkjw" } }, { @@ -80057,8 +81036,8 @@ "s", "with-editor" ], - "commit": "f152064da9832d6d3d2b4e75f43f63bf2d50716f", - "sha256": "0qxzqiljiqxzi1jlgm0c5f1pjz1jnnhq74lm0x9q68cim1vch48n" + "commit": "918992c19231b33b3d4a3288a7288a620e608cb4", + "sha256": "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi" }, "stable": { "version": [ @@ -80631,11 +81610,11 @@ "repo": "jeremy-compostella/pdfgrep", "unstable": { "version": [ - 20200306, - 209 + 20210203, + 1730 ], - "commit": "1576fc98754d3bdaa40573a037a80f1973110756", - "sha256": "1c3p3vdhy6wibxwpc76bvvm0583zmjmxs9pa453z3msbq33kc7j8" + "commit": "a4ca0a1e6521de93f28bb6736a5344b4974d144c", + "sha256": "093sm3ywa338lhhz2ib3ylcgklsbxcsqck2qsaq26i2qxr0r7lq2" } }, { @@ -80987,8 +81966,8 @@ "deps": [ "cl-lib" ], - "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", - "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" + "commit": "697d95f24e055eb9725781d179d7db63d6afd2b5", + "sha256": "18sjkqc94kawgfv3q9ai8m0bq3h63mlyg47bxyv0zyn34n1mpc9l" }, "stable": { "version": [ @@ -81354,38 +82333,6 @@ "sha256": "02fhna45wq3wja51yrwm0xysdvyck1r0a3dx41i5sh89504gl6a9" } }, - { - "ename": "php-auto-yasnippets", - "commit": "28b2d8802f98e339ff01ecf9733b71b6c631123e", - "sha256": "047i51ks2nn7ydrx2hjx9qvsh3lxnyxp8a6c3h3nb1acy84f5bd1", - "fetcher": "github", - "repo": "emacs-php/php-auto-yasnippets", - "unstable": { - "version": [ - 20170331, - 114 - ], - "deps": [ - "php-mode", - "yasnippet" - ], - "commit": "03e1f0899c081813901ac15c2f7a675a37cca9f5", - "sha256": "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8" - }, - "stable": { - "version": [ - 2, - 3, - 1 - ], - "deps": [ - "php-mode", - "yasnippet" - ], - "commit": "1950d83cbcc5c5d62cd3bc432e1595870fe8cabf", - "sha256": "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6" - } - }, { "ename": "php-boris", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -81614,36 +82561,6 @@ "sha256": "0dsa1mygb96nlz5gppf0sny3lxaacvmvnkg84c0cs6x223s6zfx8" } }, - { - "ename": "phpcbf", - "commit": "77ef54e3fb2715a081786dc54f99ae74def5c77c", - "sha256": "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv", - "fetcher": "github", - "repo": "nishimaki10/emacs-phpcbf", - "unstable": { - "version": [ - 20181228, - 423 - ], - "deps": [ - "s" - ], - "commit": "fb0bc6073a57126cf1a8404723aa0a715dd761aa", - "sha256": "0k2wl137nippcfx3g35kfprz2fiv8rbbi7dcpxciwnbqmn6ry7rf" - }, - "stable": { - "version": [ - 0, - 9, - 2 - ], - "deps": [ - "s" - ], - "commit": "b556b548ceb061b002389d6165d2cc63d8bddb5d", - "sha256": "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z" - } - }, { "ename": "phpstan", "commit": "43808f57146a395b92ed498803fa948a33e5f3c2", @@ -82099,16 +83016,15 @@ "repo": "pwalsh/pipenv.el", "unstable": { "version": [ - 20201206, - 1408 + 20210127, + 1444 ], "deps": [ - "f", "pyvenv", "s" ], - "commit": "f516a1a8677a6a1ce9683056e9f77b1e785e8431", - "sha256": "0ksjshvv8vnx2v91bfykajjnlcc5i0by0lrg0a34f8f3zjyaqcab" + "commit": "8f50c68d415307a2cbc65cc4df20df18e1776e9b", + "sha256": "0l81vbwp7gmcg1n7i8cwa01rpwc24db7gxqvmhln8piy1r2ymh6x" } }, { @@ -82210,11 +83126,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20210114, - 1506 + 20210123, + 1507 ], - "commit": "e4f0067bdce3e071a7d9316a6e142e1c61215169", - "sha256": "1mvn4w3k1wf8yls0mjl667yzlir1qyvxamlzdx62yhqpr9y55sip" + "commit": "8a5e95c8514315cb40c47f1acdb68a4ace921497", + "sha256": "1p903a3jbw1jp5l6d6mb50dq5zd8951qxh2b97vy30p3nnl8i0lj" }, "stable": { "version": [ @@ -82451,11 +83367,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20180301, - 1354 + 20210221, + 1956 ], - "commit": "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1", - "sha256": "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f" + "commit": "f480cd30bad76e4bc337e4be0cac6300e8154fce", + "sha256": "0f2f9dpi1yxckicybmdp7ns8x1hqhdygcvw8b7z0mhbwwxc7ml6m" } }, { @@ -82990,14 +83906,14 @@ "repo": "lijunsong/pollen-mode", "unstable": { "version": [ - 20191223, - 1920 + 20210120, + 422 ], "deps": [ "cl-lib" ], - "commit": "d0a33591498013886c2c4676e204cd684954e82a", - "sha256": "0lg65hzdjwbc3dav79f3jm7251yyq8ghcbccvkb32vwz281xhjnh" + "commit": "09a9dc48c468dcd385982b9629f325e70d569faf", + "sha256": "15z6sdkg9vygczr1imk3c5v6cbpqgsvnkydzkcmxnbwnqlx1agpc" } }, { @@ -83008,16 +83924,16 @@ "repo": "polymode/poly-R", "unstable": { "version": [ - 20200316, - 1315 + 20210210, + 1053 ], "deps": [ "poly-markdown", "poly-noweb", "polymode" ], - "commit": "51ffeb6ec45dd44eafa4d22ad2d6150cc4b248fc", - "sha256": "0a4wx73jkngw5nbq1fa4jfhba6bsmyn6vnsf887x3xhb5v3ykhsg" + "commit": "c42ff3a4d0da96ccb7f826dca5c6b2eb558a2ab5", + "sha256": "0sazc0vnks2jnrmgz9p2r821l4m9wrggr6mgcwh6v7lzwj76x3f7" }, "stable": { "version": [ @@ -83316,8 +84232,8 @@ 20200606, 1106 ], - "commit": "3284ff10017d280ba82f27dc20fe5223b0df709c", - "sha256": "0756c0fi5msqdsks95bcs0ghhk90b340y4zrkijhaz4b2cnm07h4" + "commit": "b3871e946d278a256d95a3bd4615b1df234ad75a", + "sha256": "08xn2my8n5m9mqr7zd1956vybakys17kldb6dijax1651fdjy772" }, "stable": { "version": [ @@ -83365,11 +84281,11 @@ "repo": "baudtack/pomodoro.el", "unstable": { "version": [ - 20210111, - 1934 + 20210225, + 2018 ], - "commit": "662b1f176d6faddd07be32ee6eb974ca02d5ec03", - "sha256": "02iji913mh03hdlzdl4m7lfzzqp3p7437cay5mn8ba4prpqqz76j" + "commit": "ed888b24d0b89a5dec6f5278b1064c530c827321", + "sha256": "0yv1339q5s31wxw8y34pb09b0rlvz9m3gzqb4dc1q8ncq8xb8wl5" } }, { @@ -83425,8 +84341,8 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20201113, - 1633 + 20210118, + 1325 ], "deps": [ "company-ctags", @@ -83438,8 +84354,8 @@ "yafolding", "yasnippet" ], - "commit": "ef3ce7122e2fd112bde0e49a529934be1fea0ad5", - "sha256": "0kh9p66lhv4fs778cy4dysnvlvwj7zaa1f9ivw2hnqjycqf2bz53" + "commit": "a1583287cbafce053d4345a1531c6358ce970a77", + "sha256": "0pdimil370rilynz437xw7s1a323g00hmcinzpsfbnvq4k4ajk8s" }, "stable": { "version": [ @@ -83661,11 +84577,11 @@ "repo": "emacsorphanage/popwin", "unstable": { "version": [ - 20200908, - 816 + 20210215, + 1849 ], - "commit": "215d6cb509b11c63394a20666565cd9e9b2c2eab", - "sha256": "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1" + "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50", + "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra" }, "stable": { "version": [ @@ -83762,20 +84678,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210113, - 314 + 20210208, + 229 ], - "commit": "efd7ea490defc53a5b78e7469a3a35d225b766cc", - "sha256": "1in1w9h1hal1qbcqxlk3mqn3q5qpcpni8a2c05dxqaqavbvz2y4j" + "commit": "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936", + "sha256": "039a84gwb0phjm7jcklmji1pcpbxmp4s40djhac8sbzmwdv39zi4" }, "stable": { "version": [ 0, 8, - 4 + 5 ], - "commit": "efd7ea490defc53a5b78e7469a3a35d225b766cc", - "sha256": "1in1w9h1hal1qbcqxlk3mqn3q5qpcpni8a2c05dxqaqavbvz2y4j" + "commit": "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936", + "sha256": "039a84gwb0phjm7jcklmji1pcpbxmp4s40djhac8sbzmwdv39zi4" } }, { @@ -84045,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" } }, { @@ -84113,28 +85029,28 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20201222, - 953 + 20210224, + 913 ], "deps": [ "iter2", "nvm" ], - "commit": "5b584f21b8dd9a53ceb7745c2d91c513358892e7", - "sha256": "1m5298i60s1rdy2r8wnyialkfbafd99wp9q0bzsbr7grq3cdp2ic" + "commit": "d7ab018a9312979a415d27973890129586b13dc5", + "sha256": "1phkvmhrcszhc74l92syrsmjqg1pd233fl2hpfivyclwyapqky76" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "iter2", "nvm" ], - "commit": "d5ccedc7a8ed84aff292bce688c73648dc8f567f", - "sha256": "1rk2hwpxvnc1hadvdg86jnzz4nh5kmkwp18iwvsbkgmx47cnyni3" + "commit": "8b38172bb6644b71b718c0732e5b9f1cd32e587a", + "sha256": "0zkicnfj1y2zpwbwm4ccrpvzr5z6rpkk82mdzaszkx0sksd3hzxm" } }, { @@ -84175,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": [ @@ -84417,16 +85332,16 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20191212, - 1242 + 20210116, + 816 ], "deps": [ "dash", "f", "s" ], - "commit": "6ae71f27b09b172f03fb55b9eeef001206baacd3", - "sha256": "16w1xidfbqlbdxq45ff6am9j1hzlxz3pwqvimwk4432prrvnf8zg" + "commit": "168f5ace1671876d8c3bd350c0853bd0196bddda", + "sha256": "15rshpq0h5i252xamxh70acdz9jddn5xwgswzk5h2b24kxsbfnli" }, "stable": { "version": [ @@ -84679,14 +85594,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210104, - 1216 + 20210225, + 1816 ], "deps": [ "pkg-info" ], - "commit": "c31bd41c0b9d6fba8837ebfd3a31dec0b3cd73c6", - "sha256": "10pibv07mb3mwmz6r2kmd7xdz5rly7hfbxvhmxd536zbr2s9rr1j" + "commit": "f3f8a6505d50ca0f03f7deef99a1c8aa3bcd9e58", + "sha256": "014v34kxjz04jgd70kskh0iwms17ydapk43ywwp23f3m89ps1917" }, "stable": { "version": [ @@ -84720,26 +85635,6 @@ "sha256": "1xdkm1f04z1h3ivd6zm8hckf3n3fbi5rwybg4dwi5mim6w84i7j9" } }, - { - "ename": "projectile-direnv", - "commit": "602485c251bc573e855dfd33e4e94052afbab93f", - "sha256": "1s5dapdcblcbcqyv8df26v8wxl8bhrs9ybl5h5qbzz49gigd8nqh", - "fetcher": "github", - "repo": "christianromney/projectile-direnv", - "unstable": { - "version": [ - 20160306, - 138 - ], - "deps": [ - "dash", - "projectile", - "s" - ], - "commit": "d5d29e5228f840b7a25358a2fd50353ef2dc9b16", - "sha256": "1bq47a6lckgin93cqy5wj277rlrw2cgfywgmbdpxvmbhygpg5hqr" - } - }, { "ename": "projectile-git-autofetch", "commit": "7fdfdeb69fd78fc1bb2c62392f860a8c434f1762", @@ -84779,8 +85674,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20201004, - 1011 + 20210218, + 831 ], "deps": [ "f", @@ -84789,13 +85684,13 @@ "projectile", "rake" ], - "commit": "7a256b1b1444fe0001f97095d99252e946dd9777", - "sha256": "1d8wcjrhw0k4ws0bdl1q37pm0cz1smqink1d8hi8fs505brbpfdp" + "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", + "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" }, "stable": { "version": [ 0, - 20, + 21, 0 ], "deps": [ @@ -84805,8 +85700,8 @@ "projectile", "rake" ], - "commit": "228f6316f2da229bc82fbbcf52323da951a17871", - "sha256": "1l9l0hza6p1l750i7lvys6gnrdy2j0dmlg6nbb6zr2cq6jbf1lkd" + "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", + "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" } }, { @@ -85110,11 +86005,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210110, - 1959 + 20210227, + 1942 ], - "commit": "0d731606bee81b2d73895a23b69e84796ea7e4e7", - "sha256": "1j0fhd5cmhx6h3hnk2xb30hn6sxfp1js3zgldqpvk4qrws5vs25h" + "commit": "7844e312b2a192c4245d0d05c12908efc5730e3b", + "sha256": "0ky8ivcwkjdclh1vh9hi8wc5zljamby10fd4m73nnkdi2lr6x5nr" }, "stable": { "version": [ @@ -85217,8 +86112,8 @@ 20200619, 1742 ], - "commit": "48234f5f012582843bb476ee3afef36cda94cb66", - "sha256": "1rn10w72a98k2r98lv3vaq6k8vwasdkc6c1r8lix441hd1jl60gj" + "commit": "8080bebf1f2ff87ef96a24135afe7f82d2eb3d2a", + "sha256": "1i82kgi3pwz61a07kmqw2gv79ym32rffwqqx8rlljk139k9j57mc" }, "stable": { "version": [ @@ -85314,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" } }, { @@ -85373,15 +86267,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20210102, - 1856 + 20210203, + 828 ], "deps": [ "async", "cl-lib" ], - "commit": "a3fbcbb94a41450c9a5fdbea3b4ac2134c2aa082", - "sha256": "1w0ifzmd35c9rrc1vwas63hz7f1l8w0dlzwikmiiza6jy51qn9dd" + "commit": "ed53362af4dfc813505c30ca40227072df16fdfc", + "sha256": "0crq5ynhqi6lbq471nskcnjplyj6i80rxl3z00iyisc9184r7wwb" }, "stable": { "version": [ @@ -85461,14 +86355,14 @@ "repo": "nbfalcon/ptemplate", "unstable": { "version": [ - 20201213, - 1355 + 20210204, + 1306 ], "deps": [ "yasnippet" ], - "commit": "7caca3ed9f2c1bce77943d8ef3db6721e2b027e5", - "sha256": "0p23rlhv7xqwhzd0a2ybvn799xpr2n7jdinx5r07sdxmsjrmgzv9" + "commit": "0d03fe3b2c608ab31bda309ef8e7a7d076bb0069", + "sha256": "18lb3an90py39lmxk05fw5ppxa3xqrhck2qz27a0zaxvd6y3hqmx" } }, { @@ -85479,14 +86373,14 @@ "repo": "nbfalcon/ptemplate-templates", "unstable": { "version": [ - 20210109, - 2155 + 20210222, + 1555 ], "deps": [ "ptemplate" ], - "commit": "26f1e4d40ac0e89e82c3210591064770f86490bf", - "sha256": "1yjigz22laz0f5m10kcslhg184lsqsfr72samk59l13jpnr676qg" + "commit": "f65acbb4991470cb5ae513c9f2a8197ead297704", + "sha256": "094qxh06jibc6kxs2fa5cw1xmj8mf7ykgdw02qpk0rjmczwns9vs" } }, { @@ -85646,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": [ @@ -86074,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" } }, { @@ -86230,8 +87120,8 @@ 20200503, 1624 ], - "commit": "168bee7f23d9956c12b419b18aa9f5974151e3d7", - "sha256": "00y3klba3m1j43mfggh7pvy93khk1ga1lyb98r5mlfffrymvr209" + "commit": "15396a14bc8f977a00b5288356e79467653a2c3c", + "sha256": "0j5dgaplar71lyx05ali8rhd6nmfc2dkphcq3wn0gdmd5qmwbwxk" } }, { @@ -86472,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": [ @@ -86496,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": [ @@ -86596,30 +87485,28 @@ "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ - 20200806, - 434 + 20210122, + 1247 ], "deps": [ "f", "s" ], - "commit": "51233ec7ec9fbafd13e2b0479c7b2ee0930ccca5", - "sha256": "1v4n6wx0qff2ndlxy11acm21jq5yflk28axs6jc6yh7mdj44js9x" + "commit": "e0e5cc882f2f1316268ec461a34d4be8abc313b7", + "sha256": "0hbvy8wdi5dgxn86j8z54y2fhcvm605xxm6xv054nl6fw2hh2h5h" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ - "cl-lib", - "dash", "f", "s" ], - "commit": "c59a158942634d3c07e506b2376d96e8d5d1466f", - "sha256": "0219s900kdpi3cxllvmwm8hb2lwqzikplq578f7pyxhzljjh2lma" + "commit": "e0e5cc882f2f1316268ec461a34d4be8abc313b7", + "sha256": "0hbvy8wdi5dgxn86j8z54y2fhcvm605xxm6xv054nl6fw2hh2h5h" } }, { @@ -86656,8 +87543,8 @@ 20201231, 140 ], - "commit": "e4499e7fcdfafd8d1825eb705c34a7748ca5ee64", - "sha256": "1bb9w75rxvsx024y0yx41rrskkmhpyfslw3xi414d2w5wmh82zbm" + "commit": "3fef8d74bb45ec82f3c317d904a570c3b3318ce2", + "sha256": "03n6cyg1qkn2hglvv0iynlmq1gwhxgd59jil9rc1qka60pislpgz" } }, { @@ -86791,11 +87678,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20210101, - 937 + 20210208, + 716 ], - "commit": "42835119977a6512274d8337e866479af4f26dec", - "sha256": "1qqzkk3ym4p3q8b33szmww4ixp1sjmirihnvkgmvfpv0rrc15icc" + "commit": "8c25a40d07c08a6a9754b3ae12174664e8ed7871", + "sha256": "05yl7ivr6rq6gry0ik4qg2pxsw07byqwz9sn58hpsx8v7blxwxln" }, "stable": { "version": [ @@ -86806,6 +87693,38 @@ "sha256": "03h30qcixq54q212381cf7mahi2k9q4590vm44pqy9widpigmxz7" } }, + { + "ename": "quelpa-leaf", + "commit": "2c6b25a8bde336bef7d0bd0ef0261b2b2c08abb1", + "sha256": "1gn0g4w6qas62fq1dgxa5vplpq4qry6fz98xva1rl44yv1miigjp", + "fetcher": "github", + "repo": "quelpa/quelpa-leaf", + "unstable": { + "version": [ + 20210124, + 348 + ], + "deps": [ + "leaf", + "quelpa" + ], + "commit": "eacc544b93f6fdc3be69a6ffbf960380a63fc715", + "sha256": "0ka2qk1y7byrq4rbmyhr06kfgc76afpmpdcxk3nf4g3krgi778dw" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "leaf", + "quelpa" + ], + "commit": "d367e3cd54d9ac949569f4cb7c0ff092a76391ab", + "sha256": "048216i1kn65d0ckzy1j08lg1lq2169jg7a4mchvcw3z7rmhx8f5" + } + }, { "ename": "quelpa-use-package", "commit": "c599f1254808a9d9bab87c35769052d5df2a01bf", @@ -87051,8 +87970,8 @@ "repo": "racer-rust/emacs-racer", "unstable": { "version": [ - 20191001, - 2344 + 20210119, + 225 ], "deps": [ "dash", @@ -87061,8 +87980,8 @@ "rust-mode", "s" ], - "commit": "a0bdf778f01e8c4b8a92591447257422ac0b455b", - "sha256": "1dzp2l6lcdrcss5xp32yvil4c1din09awnxg0f71fls6kh2g2fcq" + "commit": "f17f9d73c74ac86001a19d08735e6b966d6c5609", + "sha256": "1hi0ackw5pfqak5yl4z804z2vajhg7wkvzz20w9kbzcighz6vccq" }, "stable": { "version": [ @@ -87087,15 +88006,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210110, - 1607 + 20210226, + 1343 ], "deps": [ "faceup", "pos-tip" ], - "commit": "871aff8dc5a4bbc6f1d760fdbceb1f71fcf70b1f", - "sha256": "1z8lxaj24ykpa27y6v5zjwmdnaxhd7m8my5q7yxr4inlzyhhgckp" + "commit": "48084a44e50a3ecd91e40ac5b58eed297e314f3f", + "sha256": "18r0pi6g9nfhzj8l306r28al4pfwkn836arvnpbysqxjknxnvqll" } }, { @@ -87208,14 +88127,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20201228, - 6 + 20210202, + 846 ], "deps": [ "flycheck" ], - "commit": "63b6a77a38235e7917d200886922156506853c42", - "sha256": "1pfpinplhkn5d91rlbgh359w4d7hp399vpximipj69bnx3nizic6" + "commit": "61acc77535720f7ed3b8f680fa9d9a1871832f11", + "sha256": "063a76lvyx83h7smplghcg5zxkncx017kjc25y74diwsda16sn0z" } }, { @@ -87365,11 +88284,11 @@ "repo": "ralesi/ranger.el", "unstable": { "version": [ - 20200607, - 2002 + 20210125, + 330 ], - "commit": "caf75f0060e503af078c7e5bb50d9aaa508e6f3e", - "sha256": "0xfg38ginrd0sdn194gpapi67q6i81csddgsf0rqmwihazpgs060" + "commit": "2498519cb21dcd5791d240607a72a204d1761668", + "sha256": "1wzshhg6dchny9drm8lf8sw4s24icgyb4my58xvhm55dp4zl5p3b" }, "stable": { "version": [ @@ -88228,8 +89147,8 @@ 20201202, 126 ], - "commit": "d0e61f19a29108d676849e0925f00d002a26d32d", - "sha256": "1r3fmc5c2aqfqpfzdxkj6qi86j8vwmrj1gk3xz263pl3q96pzcya" + "commit": "f831f61797e03a0a1df8d99637a8738ba84d7cdd", + "sha256": "0lfpqzbrxs261cpb1hpmszcck13zkmqs67qf736cg2zx9ypfhx1g" } }, { @@ -88319,8 +89238,8 @@ 20201219, 1739 ], - "commit": "54d9914b270975e92fec56bcb3911c7335aeed7d", - "sha256": "1v2maw9jpvvfv6a6qkh3nasshf3pjzbqpyxsarhk2054d982qy5c" + "commit": "348030d5d65524b4f6a2dfad1d53f2ca92dbd49c", + "sha256": "1h96qy2741vsnrsnq5klxf2swm2kib7lfr3ni1rwsygib10hkqb5" } }, { @@ -88338,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", @@ -88641,11 +89581,11 @@ "repo": "YangZhao11/register-channel", "unstable": { "version": [ - 20180926, - 2349 + 20210120, + 1618 ], - "commit": "9272923757402d177a0b2deab1d9c3c74601c48e", - "sha256": "0k9qgrbzbxx4sjffnr02qx5wm71i3m61w7mh2j4hq9jf8k6nbkq4" + "commit": "ed7f563e92170b758dc878fcb5df88d46d5d44cc", + "sha256": "1ih1s274004faq78fgdxw3gy7i58nbanbp39ax2wi8zz6ivm9lqa" } }, { @@ -88816,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" } }, { @@ -88998,11 +89938,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20201026, - 2324 + 20210214, + 37 ], - "commit": "0183da84cb45eb94da996cd2eab714ef0d7504cc", - "sha256": "16q2mb0ir3a6kpgbkv6ag0zs10pj4gr2j1qdizzfqx7m4piyfj0n" + "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82", + "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc" }, "stable": { "version": [ @@ -89022,15 +89962,15 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20181129, - 317 + 20210214, + 37 ], "deps": [ "deferred", "request" ], - "commit": "0183da84cb45eb94da996cd2eab714ef0d7504cc", - "sha256": "16q2mb0ir3a6kpgbkv6ag0zs10pj4gr2j1qdizzfqx7m4piyfj0n" + "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82", + "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc" }, "stable": { "version": [ @@ -89259,28 +90199,28 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20201224, - 1242 + 20210129, + 1921 ], "deps": [ "f", "s" ], - "commit": "5143c92c806fd3a80e6729a42167be9caea88f45", - "sha256": "1kpnk1fhzgiv2dc3y6fk27ina7j11s6siagqpi5fckbbi18hd84i" + "commit": "f62be2d11c8a9182cf84f0efe7ed054cc304262d", + "sha256": "0ksw9s96mmb1qlypz9mc9br9139ha5jmahi42x4i8qppcn6zs5ja" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "f", "s" ], - "commit": "29240e4845a44d10134652b427580301318f1288", - "sha256": "0ckaq8z38mj17abzarvq0awsqvwnff22mxa6pgsl7ks67hzq5kb4" + "commit": "f62be2d11c8a9182cf84f0efe7ed054cc304262d", + "sha256": "0ksw9s96mmb1qlypz9mc9br9139ha5jmahi42x4i8qppcn6zs5ja" } }, { @@ -89410,28 +90350,28 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210113, - 1559 + 20210227, + 1113 ], "deps": [ "transient", "wgrep" ], - "commit": "c34266646951618af916684e954c33a9b1f86085", - "sha256": "12v7x427rwg8q9i7c81bzd4r4jpqwsv0442dahjxiivlrxqdb18h" + "commit": "8a537d9f033ba1b47f2ebe4d76f68b3dd74aefcb", + "sha256": "1gqh28fwyjxy4haclf23kzr755p8iyh2mvly3vmzpf55y2n1z8ib" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "transient", "wgrep" ], - "commit": "2ec8d1d36cfb9750c9a65c4a2687ea76399fccb3", - "sha256": "15qcnsnbni0aincm9pxpfhff3c5ivd5zs2s2qchjzhcn4kdm6kxr" + "commit": "bb89400d4d5e4eb22917f7048256745ea566a844", + "sha256": "0d8habjr4nv0xbgsk7nj5zid5zywf00vbl5zcx7anda5w1cy2zvr" } }, { @@ -89567,8 +90507,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210113, - 742 + 20210207, + 1432 ], "deps": [ "cl-lib", @@ -89576,8 +90516,8 @@ "popup", "posframe" ], - "commit": "8012c6a09195d940c2ba24d7c63974fb5b3b0e51", - "sha256": "0wnx4saydjy6h97hg9277sqykxs2qh7731qs27n5nhxq2rbyw01p" + "commit": "edcb6278b1a864d28ed96375e18ff77def09feb0", + "sha256": "1g8ns518yn30838by7nd13k73nz8k6wk580jcsfjqpwjig8vr5as" }, "stable": { "version": [ @@ -89782,14 +90722,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20201214, - 2255 + 20210202, + 111 ], "deps": [ "inf-ruby" ], - "commit": "596d27e37440cad6cd65dcf83d03c502efc01eb4", - "sha256": "09gc6yy2d5z75s37zw1xiv0qh44nvf4j24w8qd15270wkaczfixa" + "commit": "3ef165c5c99aebfd811a0f18ea7f8c983d4ab152", + "sha256": "1vwwchgd45a0lin4n04ffwz021889ps4vcj787iy5ijw34pi8zrj" }, "stable": { "version": [ @@ -89875,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, @@ -89935,11 +90875,11 @@ "repo": "daichirata/emacs-rotate", "unstable": { "version": [ - 20160909, - 836 + 20210126, + 637 ], - "commit": "091b5ac4fc310773253efb317e3dbe8e46959ba6", - "sha256": "0msjn7ays71mcw6qmdk0mpjp1rvd7fwz917vmvlcd7cpmvkyfbds" + "commit": "4e9ac3ff800880bd9b705794ef0f7c99d72900a6", + "sha256": "1v4xaqfh3madrc8jcr16xzs40vvmk2ml1qwgsxkcm11l6pglmnnk" } }, { @@ -89990,29 +90930,6 @@ "sha256": "1b4v9x8f9ykz2dqiv7p7c2f6kbl374i2723idmnvm2c9bc0hbpyv" } }, - { - "ename": "rsense", - "commit": "e2149ce3baef9ac01d5b2e8b1a933a3e1206015f", - "sha256": "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5", - "fetcher": "github", - "repo": "m2ym/rsense", - "unstable": { - "version": [ - 20100511, - 405 - ], - "commit": "8b5ee58318747ca1dde84ee41d48c4f50175cf35", - "sha256": "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d" - }, - "stable": { - "version": [ - 0, - 3 - ], - "commit": "e4297052ef32d06237e8bd1534a0caf70a34ad28", - "sha256": "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh" - } - }, { "ename": "rspec-mode", "commit": "cd83e61b10da20198de990aa081b47d3b0b44d43", @@ -90055,8 +90972,8 @@ 20201218, 1821 ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -90081,8 +90998,8 @@ "deps": [ "rtags" ], - "commit": "39339388256df662d0084b4a094d03e52748f9e8", - "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" + "commit": "aa4c827b417f5448c12401c33acdab1325917c13", + "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" }, "stable": { "version": [ @@ -90152,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" } }, { @@ -90372,15 +91289,15 @@ "repo": "ruby-test-mode/ruby-test-mode", "unstable": { "version": [ - 20201027, - 905 + 20210205, + 1107 ], "deps": [ "pcre2el", "ruby-mode" ], - "commit": "4af8a51483e5ed3104693a0052c2aebf8361c52c", - "sha256": "178dbacbhs7j74ia4ay1h84k9cx6jacyw82q6g0hnm2kgzg4x85k" + "commit": "d66db4aca6e6a246f65f7195ecfbc7581d35fb7a", + "sha256": "0rwq5g6p8n45vqf35dklkzdrhbp9i9gx03v7s1b4s4h83hlhlh51" }, "stable": { "version": [ @@ -90454,6 +91371,21 @@ "sha256": "13sm2v7al9658n17dka6dclzsprccrm3zycx6nwsgl99i14cnn99" } }, + { + "ename": "run-command", + "commit": "55089aac37c8934be2882c33bf96cc61322fec23", + "sha256": "1bcm39sy09h16j06rvshchlbzgvm12qa8snvfs99fdz3riikb2v2", + "fetcher": "github", + "repo": "bard/emacs-run-command", + "unstable": { + "version": [ + 20210224, + 1444 + ], + "commit": "cb76adf8e41d393090a4a3c6f390bd75288642c3", + "sha256": "0gkd7yabjdw6si814wzbkr7hi835pah8z6l0kfyhllvqnkp66qsc" + } + }, { "ename": "run-stuff", "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", @@ -90465,8 +91397,8 @@ 20201109, 351 ], - "commit": "54787de62839c48428f2e1edc4e2aa64851e9849", - "sha256": "0zbf2nvnwx6yyjjk4xfdpn15bna6r32n02q32qzk6bnqipw54ca3" + "commit": "80661d33cf705c1128975ab371b3ed4139e4e0f8", + "sha256": "1l66phlrrwzrykapd8hmkb0ppb2jqkvr7yc8bpbxk1dxjb9w9na2" } }, { @@ -90553,11 +91485,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20201204, - 1527 + 20210226, + 1106 ], - "commit": "c5c7ed31a2e1106ab4835b135618a34570796dc7", - "sha256": "1r2qm3n4788pyyglp23ghzbfq8xzni1vb2jgzc6v65x1047j5rl3" + "commit": "e9e9e32c4f82a9b895543c120b327ab5536ec42b", + "sha256": "0f63lms4arkqj6161v2787dgfra23a01vi82s9dcylk9z6bqyz4v" }, "stable": { "version": [ @@ -90600,8 +91532,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210103, - 1235 + 20210201, + 1846 ], "deps": [ "dash", @@ -90614,8 +91546,8 @@ "spinner", "xterm-color" ], - "commit": "4570312648cb8d4788f4fe749d67c0fce2de42e4", - "sha256": "1l6b0ljr6xwpjq46qgna2brprj81ppxwzhaj5s1xbwffzi67dc1z" + "commit": "61d600e5598a37034b8b539bd50966c3eb557f10", + "sha256": "0d5z6wab62g5xyb2bpmpprny22gy7rm11vsgij0phhnsqb8fqiig" } }, { @@ -90990,14 +91922,11 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20201216, - 934 - ], - "deps": [ - "pdf-tools" + 20210217, + 1312 ], - "commit": "b0370912049222f3a4c943856de3d69d48d53a35", - "sha256": "1ky1d3aycc1r96z3fy484p99xlmry9y9z61s7l7mw0m231k7kpbd" + "commit": "54ed966b842501c3c092dbf57b372e37b033c578", + "sha256": "0i03qb6qc2agp9s5s7l08f1wl8anqndh6xshg1c3w357vd1whv7i" } }, { @@ -91088,8 +92017,8 @@ 20200830, 301 ], - "commit": "85f1e8f2dabb94fb1c853a7c60c1dda07163ac8e", - "sha256": "16cnp54gvkx7kc6kr74mahvjwhkpc7y60c8v16m8n7si6h77lfqd" + "commit": "cacada6203a860236aff831f6a863c92dbe2b878", + "sha256": "17k4n0kwfqrn172mi3d2f67jalgc13p6xr10zhs56mbd5bzwg958" } }, { @@ -91118,11 +92047,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20201106, - 2057 + 20210205, + 851 ], - "commit": "2bf56219924e0cbc0325547799144b02d4085935", - "sha256": "1cs5d9x69q2akzf7a64awapjxljbqggxv391k885ld3zqglqkzks" + "commit": "402d6df56457e9c512c3d77c7bcb0d04c77715f1", + "sha256": "018c668i1cv6a22gvvbzgn8111wh9zbk6yr41cj9xb1pwg0y373d" }, "stable": { "version": [ @@ -91277,20 +92206,20 @@ }, { "ename": "scpaste", - "commit": "9007fb32097bc63731c3615dae9342fcef2558a2", - "sha256": "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1", - "fetcher": "github", - "repo": "technomancy/scpaste", + "commit": "8bec8e696afde1b89502f312efc0054ca59502a6", + "sha256": "1x2ikbb1k34yfrr45pk4a8171l3azbgl0mrd4pb44qz7z1rpn57m", + "fetcher": "git", + "url": "https://git.sr.ht/~technomancy/scpaste", "unstable": { "version": [ - 20200717, - 2007 + 20210223, + 1902 ], "deps": [ "htmlize" ], - "commit": "2aa1513fa0a402f03b993c0a6929daf39820b02b", - "sha256": "1cvkqb5v0v790nmhg4wi6kv6mbzfkfcgvn2xh9bmny37dcv0i2gk" + "commit": "4ec352fb9fe261ffb8b78449dea986dc34d337b3", + "sha256": "0219jzj3rwcx4k6f4grzrarq0v05jgmmracis3jb25rv0cln3i9r" }, "stable": { "version": [ @@ -91475,8 +92404,8 @@ 20201013, 123 ], - "commit": "3cd1e1801aaddd011992d284280b5b43ccbee17b", - "sha256": "0mgc3wc1kga7n3zwy7i338vdxy0nfhv61ra9708lc14rx6zjwk9f" + "commit": "ad94790492d0d66686f3457cea1caeba8bbbdc51", + "sha256": "1b725iz5xhqki33jydq9vrxvrbfraxq2q79jdbrjy548rbsxzyjf" } }, { @@ -91647,15 +92576,15 @@ "repo": "jcs-elpa/searcher", "unstable": { "version": [ - 20201010, - 641 + 20210124, + 1524 ], "deps": [ "dash", "f" ], - "commit": "432d2ea9f7d0ab7274ff2927d26e7adca85be169", - "sha256": "07kwcyg8v5svqq2v24qn4rd43r590gr9nmv3270aqad8lqjlrrn8" + "commit": "447b6f0c3b4429e70a474a325151913100bc6417", + "sha256": "1w0l0r4n0w99523klia1pfyh0y3jvskhk2wrwzdx09mad0bdfj1b" }, "stable": { "version": [ @@ -91673,10 +92602,10 @@ }, { "ename": "searchq", - "commit": "9738c1be0511540bfd8f324334518c72c9c38c94", - "sha256": "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr", + "commit": "cd08b1a89eba9dcc0ed7f6d6ccb783b6ba0c00ca", + "sha256": "0n3azkzfflxi8fif4m3q886l5gp33z2ylfl2j3h0w36xlgc9h58l", "fetcher": "github", - "repo": "boyw165/searchq", + "repo": "tcw165/searchq", "unstable": { "version": [ 20150829, @@ -91877,19 +92806,19 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210114, - 2154 + 20210228, + 1401 ], - "commit": "3abbfd9bc7d8991cce20202942a5b59a6c8d8dab", - "sha256": "05g0cwyv77ajbbq3ja4bsgh84m1829mqrp5mxg5gbwhjp9xr974r" + "commit": "bcf371433f3593bfe911369a4c87fbf7287df866", + "sha256": "052323wgs7z68hzfp6y9x262qsd0l6la667hsjvrdc64x6mv0dii" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "bec406a47bd95f5b7363be239783a01631858520", - "sha256": "0j10yxlikyg7qxcmp4fnddyd5nc3hlz080d1zcbijq020a08k86g" + "commit": "a9ecaa018f249c15fae8e1af5d4df337e846e92f", + "sha256": "02jrki6vzyfyi1bbslki5pk2348flh9dz18jkc4y7p60bvbr52cb" } }, { @@ -91900,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" } }, { @@ -91965,15 +92894,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20201115, - 116 + 20210214, + 853 ], "deps": [ "apel", "flim" ], - "commit": "f279ebe1c1f9c14bdd5d3da01af24277a6167b69", - "sha256": "1a387s4h167lsray5k5gzm8jpnrg5az7y982iamk67rz5i1ccgz5" + "commit": "20d75302509b5fba9849e74b61c1ce93e5819864", + "sha256": "14qy9k64fi8asd4ka9hv5v0aa7mkdnx6252n02gldg760janr7xl" } }, { @@ -92085,16 +93014,16 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20200827, - 725 + 20210210, + 1411 ], "deps": [ "dash", "dash-functional", "edit-indirect" ], - "commit": "dc0b3448f3d9738f5233c34c5c8fc172eda26323", - "sha256": "0qjfhal2pjw1lk7qyb89lwibabpycibf5vsadinvqnn77m25sx04" + "commit": "cc1145bde8b1868322ea799a90e38a1295089ada", + "sha256": "0m429i3zy5aik0q91r6sbr5xpqh4fgx984szp01p8fmbyb7wsh67" } }, { @@ -92436,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", @@ -92444,11 +93388,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20190903, - 1907 + 20210216, + 2031 ], - "commit": "5f24c90bb8e7333ee4315619672dc2ec69d198be", - "sha256": "0msrhh41nyvyy17skd5y5lzdz7a6lxnlqnflgz4xf2qpnc390kd6" + "commit": "e4563469fe20b9e6e63d7b19c86ac8b8b615df1d", + "sha256": "1p7a4lps2w6dnc5i1fiwx22ij4in70a0h0bl5bp7ab5ba6l22kaw" } }, { @@ -92849,11 +93793,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20201021, - 552 + 20210218, + 2329 ], - "commit": "f29aadae07bd58689720271b1f6538edfec5c476", - "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" + "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37", + "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph" } }, { @@ -93039,26 +93983,27 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20201108, - 640 + 20210218, + 115 ], "deps": [ + "language-detection", "org" ], - "commit": "da8acfb347c14e82a9c56cfd65e57b8adb8eb5d2", - "sha256": "1gc5w4svkfvd4a0sqyaq4570iabql4w6yayamcpf20n7i8wvlpws" + "commit": "3f6807543ffc1da16ede10df8a05d5e4414ba7df", + "sha256": "053r87s6jxl3hi8f7215hvn4xm6913l9wrjxwafv76gsdyl9cgz7" }, "stable": { "version": [ 2, 6, - 1 + 3 ], "deps": [ "org" ], - "commit": "716b8a51ab331952f5b617152055799e32efb77e", - "sha256": "10yrkza38ylvahgq5ga78brkzi5c2ms2v9800a0y8ld019zxkr7r" + "commit": "3dc6b980a4235b084abeae500a377e60026c28ef", + "sha256": "1gg0z15a4rygi0dxabnlpjh56sa7kwxw3fji6ibk70l1jwgd7ydc" } }, { @@ -93127,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": [ @@ -93248,20 +94192,20 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20200926, - 1404 + 20210201, + 724 ], - "commit": "f5135f652d2b21f55b4809151143845c6807de01", - "sha256": "1jnh4djxp4k0c1r6yq0n0zi9vadsj9daqnajs33g2npvhmyav0sr" + "commit": "3993e8de44c141420efbec3cdb4c5620b862a200", + "sha256": "1ivm2xr7mc8hp7g1l6l3a4mm5byn2cp7m6bv2g222997xbpk0il5" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f", - "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3" + "commit": "d41255fc2b8cadfc7882c617c7d1aff71524ed46", + "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr" } }, { @@ -93314,11 +94258,11 @@ "repo": "mswift42/silkworm-theme", "unstable": { "version": [ - 20191005, - 1903 + 20210215, + 1120 ], - "commit": "6cb44e3bfb095588aa3bdf8d0d45b583521f9e2c", - "sha256": "0w5h1gl8npmwmpvhhwchrknd977w4l3vvd2lib7qphinj117fhzv" + "commit": "ff80e9294da0fb093e15097ac62153ef4a64a889", + "sha256": "09zrhfk6w74kc4sml20k6vhnd8b07yppn69rffan5mhr3qr69176" }, "stable": { "version": [ @@ -93470,14 +94414,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20200120, - 2036 + 20210206, + 2015 ], "deps": [ "cl-lib" ], - "commit": "2a4ba8f99f39abf17976db8118e32b80eff0798b", - "sha256": "0897i5ggdivi2knblcbkyv9lpnwgdlr8ql9brd09bkdsbzhsqb6y" + "commit": "7b17fcc467e485dce5550be901d26223b8ad3f23", + "sha256": "1ksckai0hr2345vpjsahv0kzk8h52vrg2wki290v5aj64iy2nw76" } }, { @@ -93639,8 +94583,8 @@ "repo": "chrisbarrett/skeletor.el", "unstable": { "version": [ - 20191129, - 841 + 20210129, + 239 ], "deps": [ "cl-lib", @@ -93649,8 +94593,8 @@ "let-alist", "s" ], - "commit": "eb21383a9c9e7cf7ae2bbb85cb6d4f42aa3cb37f", - "sha256": "1vq4g8kpq9q4zyybw4k4hgvn13avxz653gdfrx4x5wvfqcr91mbx" + "commit": "f6e560a0bfe459e0b8a268047920ce1148f2ebf6", + "sha256": "0xal5m59z8whrsr6id52gb6f22jy6dp349xvs6xxjdfamj1083r7" }, "stable": { "version": [ @@ -93669,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", @@ -93873,15 +94840,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210105, - 2148 + 20210214, + 2243 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "48bfe6cccfdf879cd7137b00eb2ca160665a92f8", - "sha256": "1b3kjxjx30lan77vgiskvh9g5cqz4j44xa221vnh9ccixqwqhhim" + "commit": "68c58c0194ff03cd147fcec99f0ee90ba9178875", + "sha256": "0lammq7116hm79nldxlghi978m7bldccfdc9vy1rlfjj4mhnrlq0" }, "stable": { "version": [ @@ -93905,60 +94872,59 @@ "repo": "anwyn/slime-company", "unstable": { "version": [ - 20200424, - 1045 + 20210124, + 1627 ], "deps": [ "company", "slime" ], - "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", - "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" + "commit": "f20ecc4104d4c35052696e7e760109fb02060e72", + "sha256": "05dnnc4ms5c9yp9h65k2gbkg3pw9k38nx5wzlwdlfr4shqmw54w0" }, "stable": { "version": [ 1, - 3 + 6 ], "deps": [ "company", "slime" ], - "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", - "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" + "commit": "f20ecc4104d4c35052696e7e760109fb02060e72", + "sha256": "05dnnc4ms5c9yp9h65k2gbkg3pw9k38nx5wzlwdlfr4shqmw54w0" } }, { "ename": "slime-docker", - "commit": "15ec3f7208287161571c8fc3b29369ceabb44e5f", - "sha256": "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa", + "commit": "19cafb22be7286f56391dc98b362fb2aa55a9a80", + "sha256": "1vrns4fys01chk2cq10wb8w559lc7899s9dhwysg6818nvqj9my1", "fetcher": "github", - "repo": "daewok/slime-docker", + "repo": "cl-docker-images/slime-docker", "unstable": { "version": [ - 20190430, - 157 + 20210124, + 2145 ], "deps": [ - "cl-lib", "docker-tramp", "slime" ], - "commit": "151cec4a11965cdc00d231900a50f2c9f455fce2", - "sha256": "1sp6qi2i1cl41ga9y6fwf7q855y0b59fcbxdiggdhigwd5zslzcv" + "commit": "903470fe3860402794a4f268c1efffd44a30f273", + "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482" }, "stable": { "version": [ 0, - 7 + 8, + 2 ], "deps": [ - "cl-lib", "docker-tramp", "slime" ], - "commit": "1ba41c2d86540a84b47466b0b6957f8063f23aa8", - "sha256": "168s5xsf7l6s8x5hcmzmk5j9d8a3wpr4s3dlm697dg2n1717gl2z" + "commit": "903470fe3860402794a4f268c1efffd44a30f273", + "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482" } }, { @@ -94099,11 +95065,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210114, - 912 + 20210224, + 1024 ], - "commit": "eb67be9698794ba66a09f46b7cfffab742863a91", - "sha256": "11yclc8i6gpy26m1yj6bid6da22639zpil1qzj87m5gfvxiv4zg6" + "commit": "fb84318c08f59bc786e047006fc81e2ace568309", + "sha256": "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj" }, "stable": { "version": [ @@ -94607,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": [ @@ -95050,18 +96016,27 @@ } }, { - "ename": "snippet", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68", + "ename": "snitch", + "commit": "8d08307e483c328075bbf933b2ea0c03bffe8b7c", + "sha256": "1zck9r251jj3q6q1glxj20812yhkv630qnd2y7q1kkjgp68gby7g", "fetcher": "github", - "repo": "pkazmier/snippet.el", + "repo": "mrmekon/snitch-el", "unstable": { "version": [ - 20130210, - 2315 + 20210202, + 1730 + ], + "commit": "3b3e7f1bf612c4624764d1ec4b1a96e4d2850b05", + "sha256": "00r36xjglp7d1gkxkqlymqjkd8pmr5g0bg468xq9s5hp7g5md4ig" + }, + "stable": { + "version": [ + 0, + 3, + 0 ], - "commit": "11d00dd803874b93836f2010b08bd2c97b0f3c63", - "sha256": "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y" + "commit": "14e91336fb04c23d7b23836642eef3f2edef03bf", + "sha256": "1l06biw2af8yqivhmpwb6dxnslvm0xw4wr1ckmjq3yn7zx542viw" } }, { @@ -95243,14 +96218,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210112, - 1050 + 20210202, + 1730 ], "deps": [ "dash" ], - "commit": "93d124962106f4cec72e9c8ab8cb243c581d9d46", - "sha256": "11gsxakwmkymlmm8jjbkxi6ryhvfri06n2g8kh4s6abm15pnq6sh" + "commit": "4d4b004460271e310ca45606d24a60e95ca3151d", + "sha256": "1fjvi10asfz5qya91swma2k9w7a79kh7a3lik23gdqzxs0swmn4g" }, "stable": { "version": [ @@ -95274,15 +96249,15 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200113, - 1721 + 20210122, + 1746 ], "deps": [ "flycheck", "solidity-mode" ], - "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", - "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" + "commit": "b4fd719715be098921b6cbfb2ff9da31f3bd0d05", + "sha256": "0gsgj5485k7415wzq73xbj3ax9hh2l1j46ma5d0xkww3md3c3kca" }, "stable": { "version": [ @@ -95309,8 +96284,8 @@ 20200529, 1924 ], - "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", - "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" + "commit": "b4fd719715be098921b6cbfb2ff9da31f3bd0d05", + "sha256": "0gsgj5485k7415wzq73xbj3ax9hh2l1j46ma5d0xkww3md3c3kca" }, "stable": { "version": [ @@ -95428,20 +96403,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20200803, - 1402 + 20210201, + 1830 ], - "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11", - "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5" + "commit": "f765f193ccaf4ad438e1d9be842efd2f4394efa4", + "sha256": "1p6kzsci8hgccpjcy6swwa6yk741l6ay48rb35gmf03j04abszm0" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 0 ], - "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11", - "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5" + "commit": "bca7a42db1245543d81373e67d71278a0e3135a2", + "sha256": "1i1hb5xg97frkhpmv608dlqs8wclwf78sq9q3sy9776m5zfdhcxl" } }, { @@ -95836,11 +96811,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20200825, - 1818 + 20210206, + 1428 ], - "commit": "1f5b03254de6bfa9645711f2b79781f5cca8d203", - "sha256": "04x8x557va2nsl1wginvaq9ha9wfk8l45dgs88sxm60jyrci802x" + "commit": "c8c468580048e2464f012d171b2101bfb208e33d", + "sha256": "1rbv04smfyhm5qm3ghn9vsl0sm4lv20gkpw2zdzrf0l3nkb7dx45" } }, { @@ -95917,8 +96892,8 @@ "deps": [ "cl-lib" ], - "commit": "62f198256453265af48bef3a0207e80143fbff1e", - "sha256": "0a49678yaq2vc04w4xp0i9lpb7bdf1fwhjkg0xnzssvnjcnk368k" + "commit": "e8c9345e2e2427282b3dc9cd1e297e3c76d34f7f", + "sha256": "1i799cq0dydq7jdhc1b2ridlsmmkk85286g9r6nj6kif3177l171" }, "stable": { "version": [ @@ -95956,11 +96931,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210109, - 1842 + 20210301, + 224 ], - "commit": "e451b29f2702c60b664ad1e3e3ae253cfb969fa0", - "sha256": "0am4da6j5mianjj6ib5hf87z5v2q3wc8xlmgmna4mi70rx4bkz3x" + "commit": "63704d435255c1fe3d7579f0344e244c2fbdb706", + "sha256": "1fbpbj7jzm4djlbzvzjld2gs46wiy6gm9hd1pjg2rr987fl882rg" } }, { @@ -96102,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": [ @@ -96514,14 +97489,14 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20200327, - 2329 + 20210218, + 312 ], "deps": [ "reformatter" ], - "commit": "9e6351dc97a6f58f221d6e1baa7bab292309c437", - "sha256": "1r49c8ick1vk7zl4h0472z0p6j3d5b839al3s687acgqdymb24kk" + "commit": "a7b38b20320b2b4f9ec109845fed3661da9b4a49", + "sha256": "164x6vskcby6h7jaz119wqn5x73pnsf53qq314v0q4ncw2917bym" }, "stable": { "version": [ @@ -96625,11 +97600,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20200813, - 1430 + 20210201, + 1444 ], - "commit": "c10f71465a416050ee4b9633aeabaee823ff3ba9", - "sha256": "1a5bblc5sfd0akrvjs2hysjs7a9fz4p6y44l00nmk43yl7bh0678" + "commit": "760dc6cb854383ab087d9b924de7273deddefe6a", + "sha256": "15anfzsfgddrlskppk068dzlz4zkg7xyk9727a7hwg4845126q6w" }, "stable": { "version": [ @@ -96672,11 +97647,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210113, - 2052 + 20210228, + 1834 ], - "commit": "1fe8720e2e1e8884eac512d28257d655306a9686", - "sha256": "1s99ynhkak2qpfy448yi1iwxss4zwz1p61279xv1771jx7aclcd3" + "commit": "12eec5df609b16f16b520eceb0681b74d9ae8aa6", + "sha256": "043mra5ysz00jxziqglzpkg5nmhc15lvv4n7q26c5yv2dn4nbdsq" }, "stable": { "version": [ @@ -96789,11 +97764,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20201223, + 20210217, 1051 ], - "commit": "a236e04f2950bd9d7f7c79ad992d1f8b57df950d", - "sha256": "0d5vx8k18avnja6mlhzrsj3z5brs70fj3s7151zgjq5i12n6aqm2" + "commit": "820f60af17e71898303f4f3c2576f0619528a492", + "sha256": "1haypfhpbxsv2rm1wpskjdm0ddv34qvaiiyw8qhy1nn64q4b5xx0" } }, { @@ -96865,11 +97840,11 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20200830, - 1032 + 20210130, + 1325 ], - "commit": "2dd330604563d143031fc8ffd516266217aa1f9b", - "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry" + "commit": "9bb858b9f1314dcf1a5df23e39f9af522098276b", + "sha256": "031418nkp9qwlxda8i3ankp3lq94sv8a8ijwrbcwb4w3ssr9j3ds" }, "stable": { "version": [ @@ -96889,15 +97864,15 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20200830, - 1032 + 20210130, + 1325 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "2dd330604563d143031fc8ffd516266217aa1f9b", - "sha256": "1l49fqd4wh9bkdpb4mk5a1cbl5i3iwc3q690viakhpb4840jmlry" + "commit": "9bb858b9f1314dcf1a5df23e39f9af522098276b", + "sha256": "031418nkp9qwlxda8i3ankp3lq94sv8a8ijwrbcwb4w3ssr9j3ds" }, "stable": { "version": [ @@ -97100,16 +98075,16 @@ 20200606, 1308 ], - "commit": "417b344e3c97beb2e50c2c919b0d01cb0d4ed9a5", - "sha256": "105va5nb5wgqkw25rdc2d591c6fcd9wa3dzsyvg3y83fcxhqgi7g" + "commit": "755c709c02e4e091ceb934fd5672db416fc94dbd", + "sha256": "08fb1qlld0dyi7i1pd5xb1g6z2681nyrqfl1ihq0gr8dal6mc772" }, "stable": { "version": [ - 0, - 23 + 1, + 0 ], - "commit": "e6dd7eff206a6515aefced2ad701beaf625d7b7d", - "sha256": "157vdhdjzxsf7077916ibn0jbsxw9d71m8mwm4kn0i0ip7sj9xdg" + "commit": "11aa5944459e464a96f41d934e23da5320c13333", + "sha256": "0nc388hi362rks9q60yvs2gbbf9v6qp031c0linv29wdqvavwva1" } }, { @@ -97443,11 +98418,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20200820, - 57 + 20210226, + 42 ], - "commit": "eadfacdbcb8d54d83f6f6cfe7990b492f7217453", - "sha256": "0xwkkzs4pl3wgjq7n43klkh814h3kzh0mwnka07dbb0gv1xmaigl" + "commit": "787f78989253f4568942a4cece5f135f005e135f", + "sha256": "1sr6lwjd2py0pncbx4qxa8wfxa3fnmfhxr944aid672hba2pdx7s" } }, { @@ -97618,6 +98593,30 @@ "sha256": "1m9srlxavqg6yxmz6rz61saz1lj5hh029314dic8kh6g3bqdnh2w" } }, + { + "ename": "sudo-utils", + "commit": "20960a5caad9e3f51160fa1786ba422f0e01dc99", + "sha256": "1jlzw4bl8mdr7yijsb93d32cqnn7rphbdsf9cnkzrlr7dkcrnwyg", + "fetcher": "github", + "repo": "alpha-catharsis/sudo-utils", + "unstable": { + "version": [ + 20210119, + 1930 + ], + "commit": "089f7833fa256f293284a6286bf9cb2b78eff40d", + "sha256": "03kks8sqw1j8ywzk3bvcb8i6v3px5zr05c4pnrwmls724m79sagd" + }, + "stable": { + "version": [ + 3, + 0, + 1 + ], + "commit": "089f7833fa256f293284a6286bf9cb2b78eff40d", + "sha256": "03kks8sqw1j8ywzk3bvcb8i6v3px5zr05c4pnrwmls724m79sagd" + } + }, { "ename": "sudoku", "commit": "f9861d5d4cf18466b17ac8e53f3874df5312d3f3", @@ -97837,11 +98836,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20210111, - 1314 + 20210222, + 1037 ], - "commit": "266db1fc882efe17bba7033d69ec663ab4cca5f9", - "sha256": "0v1brx89qswf9803spxi9rb02mfppg1fhx7azd9q7wvh4r1n98v3" + "commit": "25d0018036f44ff9bd685a1c9a76d8ba57c1024d", + "sha256": "070i3k5djw2m1763ihqngpxfmdxq7gs058fvjaaf62dpkqy9vv3a" } }, { @@ -97882,11 +98881,11 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20201129, - 608 + 20210227, + 1105 ], - "commit": "87489d28450559078aa15b4a435143a297508e48", - "sha256": "0gyhmv60dx0zxx4bmhzsd7q5vfnkpfwlj6539bn272fwcr7zncp8" + "commit": "a34a2e1128fa99f999c34c3bc6642fb62b887f34", + "sha256": "01apd8agfdhr662lkiy5rh2xvr913754f9zz7f5hn4vkmfgambrh" } }, { @@ -98144,26 +99143,26 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201208, - 1419 + 20210225, + 1251 ], "deps": [ "ivy" ], - "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", - "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], "deps": [ "ivy" ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -98411,13 +99410,13 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20200828, - 425 + 20210118, + 807 ], "deps": [ "seq" ], - "commit": "39f772b531117edba596e7a1210b3dbb87d56adb", + "commit": "5bcd6d7e3f3b6501ccec3e6c378f33f7e7488c99", "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2" }, "stable": { @@ -98466,11 +99465,11 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210113, - 1943 + 20210219, + 2348 ], "deps": [ - "dash-functional", + "dash", "evil", "evil-cleverparens", "evil-surround", @@ -98481,8 +99480,8 @@ "smartparens", "undo-tree" ], - "commit": "c535794b539627b26b7e73481e41f3c870d4b33e", - "sha256": "0pyyjbwcacql4l45fi6jxxvrm4alz9rm8pp6abikh5di98yidjm6" + "commit": "a8e573324a56e131b92967802a8df88bedd1ef6f", + "sha256": "015ijjzzrx6gjh1qgb7ja6fwffialck814y1japg6d6smkd8b82i" }, "stable": { "version": [ @@ -98795,11 +99794,11 @@ "repo": "holomorph/systemd-mode", "unstable": { "version": [ - 20191219, - 2304 + 20210209, + 2052 ], - "commit": "51c148e09a129ddf33d95276aa0e89d4ef6f8dd2", - "sha256": "0mikrj91qip5f0sj62c4gamvw7h6wc0yz8cfyzj9h3gxrllkp87k" + "commit": "b6ae63a236605b1c5e1069f7d3afe06ae32a7bae", + "sha256": "0q1f5mnx6npr6c94x93lyza87kxjy08v7x4by13wp23fxaqxgzaf" }, "stable": { "version": [ @@ -98854,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", @@ -99107,11 +100154,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20210104, - 1044 + 20210228, + 2046 ], - "commit": "fe4030a3b44a283dc3e1062d40f2bb7ab08db542", - "sha256": "0y9c40dw9fcrjf9pdqiva12fha6d3yww6yip1g7dadi648hzr0ip" + "commit": "62b112a335a62fbc6898401761275cff5d173821", + "sha256": "0xnjwsw6ri46i5gygmn5p9ashwp1lcxglqgnllrq8b918qrayww1" }, "stable": { "version": [ @@ -99298,28 +100345,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210114, - 1122 + 20210228, + 1348 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "d72bd42f57c0a09c2e91ecb69516b2eaab1991bd", - "sha256": "05czr9wwvqbhrvvslv2nsgip78ayfx4p6lfbdxnq44qjmfvamx0y" + "commit": "d3e5d654e1a86019f85dd8c41923fce29fab45d6", + "sha256": "116ff8d8ir7dnmmm6qiy82i9ikziyx0xmy35v2p3dz4qib32n0yh" }, "stable": { "version": [ 0, 7, - 9 + 20 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "f87858583ca7c0e4328f3373aa57d715fd25bbb7", - "sha256": "14954lpkd22p3q66lykbl0fvapdly9cll313jrag5qzbcccrxq5j" + "commit": "0ed5173a2eaf1c049f3393c1518bb534a3a9ac94", + "sha256": "0g0ffxd9p0l772p6bc3s2sr3rlvgmds5jvr0fn6fnv9sypvzplfq" } }, { @@ -99353,16 +100400,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20200516, - 2102 + 20210211, + 117 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "110c578ccf6c0421cfd9eec7aa3e960b6fd49fb4", - "sha256": "157df4h9hr5mmwp0q5w0rdv7ndrjk3014r5xwwblszvx33s70gbk" + "commit": "2fbcdb44a9dfa608c44b19e731d15438b4b03d87", + "sha256": "0y7zak23cri9glysdmx035fvzrcpzr0fzsvjx9vcanlivq94v7fq" }, "stable": { "version": [ @@ -99386,11 +100433,11 @@ "repo": "lassik/emacs-teletext", "unstable": { "version": [ - 20201019, - 700 + 20210222, + 901 ], - "commit": "e674ff636e9d15cade171ef432aaeead8109dc48", - "sha256": "0ws2b1kmhrbnhmy2ld7kjkximqpbb8cdcpvz33638ylcvb46vd1x" + "commit": "7092a52b18b4b13b36f4558fade98f89e182e00d", + "sha256": "15rhrkb454kby6n4i669d2l24n7m3xa7nm9p68nbqs04c4sinynq" } }, { @@ -99437,20 +100484,20 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210111, - 521 + 20210218, + 1340 ], - "commit": "6dd630e5786e500441b5acbfe5868d7172a2dbcf", - "sha256": "1kqxmainf31d1s2qbwanwzp9dij0i6zj9pp3833clnybf4l90cr6" + "commit": "c1bb14cbaf47a24b0765b68ac6f252d0b5e2809f", + "sha256": "1sk8g4gs9103f2sk76x6zx8i74zr79fr30mg87x4shlrnj6a54fq" }, "stable": { "version": [ 0, 1, - 3 + 4 ], - "commit": "8c4ba0d5db5280a78d94bb1cc3dbd2f1abd37e9e", - "sha256": "177m72c2gdmp2jq55z1sgff8izpv39n1s7qsin2bfl4p9ccwywmr" + "commit": "1a7784e5ec9a5e43adae56674aa63e8b3cf7a2cd", + "sha256": "1k33h503038l2bcr8gs020z2cjxfs94lamkdgv52cvd9i20d0kqq" } }, { @@ -100374,18 +101421,18 @@ 20200212, 1903 ], - "commit": "442466ab9411594350d4f9ef012f9892d4034773", - "sha256": "0srj6fnk7damyh6snwnvl599iad4ys7dw944vp0d4wpay0sxqvcl" + "commit": "2a5e467de2a63fd59b15c347581f3c5dca349e2b", + "sha256": "0px46fq29xdsgys525l5ba0zbqq9d86c739zqlqnn3safvg5vrih" }, "stable": { "version": [ 2021, - 1, - 11, + 2, + 22, 0 ], - "commit": "c72b2fa29856d45c91f5ed6c98fca6d723246977", - "sha256": "1y2hjw2a0dq6vzyfg7hcn09dbw00rfyblzibf5i7s08jbvp2zzin" + "commit": "a0eb44d20005e25284d0204f42387ff872bf52b9", + "sha256": "1294wsx9g3k2y5prgxr7w8ms6h0af8c0xijvh4fjil6bsx729c6b" } }, { @@ -100435,26 +101482,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20210107, - 1831 + 20210211, + 1531 ], "deps": [ "haskell-mode" ], - "commit": "0a3a5f9d0aad689ad87649647944d6dca6c16bb5", - "sha256": "1lrwjxx0a3lalwbpndf751b1wn2yv3j2x58xa5kby63dxnxf77ph" + "commit": "839c9ae0db91509015d7638905d2d7a4811f877d", + "sha256": "1gm8i3bvqkdk2fmkl1lbra1hqlag18bi0fq1mi6grw5lkmmlhay2" }, "stable": { "version": [ 1, - 6, - 1 + 7, + 2 ], "deps": [ "haskell-mode" ], - "commit": "7377b6c8ddc23d197018af203456063864df1457", - "sha256": "0vj55135h0mw093b9rlnq8hka9sj4kmhnv8xj46z2kcqj0qcq7q8" + "commit": "223b0f4388dce62c82eb2fb86cf1351d42aef198", + "sha256": "0k93i9smhw5bws2xiybha15g26mwyq0zj6xzxccwh0bfpl76xzqq" } }, { @@ -100465,8 +101512,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20210105, - 812 + 20210211, + 1055 ], "deps": [ "cl-lib", @@ -100475,8 +101522,8 @@ "s", "typescript-mode" ], - "commit": "e622d4d879d8b1de2517962b243146ec18b6cfff", - "sha256": "1963yf9nzx4hgp16c9vyn3drx9ypyni4xrrz1kylkb3mcm10y97v" + "commit": "7f7334b42a40dd3093b830e887c36cdb4ef40858", + "sha256": "0krixylc58lglpi6kgwlxfd47c90vmck3cml0h3awplbyyr8b5vg" }, "stable": { "version": [ @@ -100951,8 +101998,8 @@ "deps": [ "cl-lib" ], - "commit": "c6ccdc83e85719a8bb07ef715cf5fd06866a479c", - "sha256": "0z8rykhhhwccy0zg6v3gnghfiawqw3afv4pvxr1hrympiyhyvhvp" + "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", + "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" } }, { @@ -101245,14 +102292,14 @@ "repo": "trueroad/tr-emacs-ime-module", "unstable": { "version": [ - 20201128, - 928 + 20210202, + 1057 ], "deps": [ "w32-ime" ], - "commit": "9406b498e6a256a5928f03cd089fdd2823b03876", - "sha256": "0q4f7c1nrvz58ycbjgfih1m3xyb0x4wn405yz4gm1172j0phcmlj" + "commit": "8fd8ae64f71d1d69d7e1bcc47a6f65aa7f8e6993", + "sha256": "020qvjszwkx5klgh865vs5z17ym651i4zzq7c4sz6qwv361ygfm8" }, "stable": { "version": [ @@ -101424,20 +102471,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210103, - 1546 + 20210228, + 1207 ], - "commit": "7811dcff825210c17bd15525fb6a98854501af99", - "sha256": "1nwpwviica8fv8q8pfgx0r4888giq48x0phgl2mkvbz8rr6nyn50" + "commit": "1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba", + "sha256": "0ci7khr2cp185kv4lm4a87fd7sgrjzz12k7w1s4iicaqvfryw9l5" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", - "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" + "commit": "9ca983bab26d1a8e189a8c44471d9575284b268d", + "sha256": "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c" } }, { @@ -101485,14 +102532,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20210106, - 2057 + 20210218, + 2015 ], "deps": [ "let-alist" ], - "commit": "7cf0d739a8a7834d6c3896b62122a0fc6953d371", - "sha256": "1gy4fmjpymabs4z5k3j07di6hqpx6w592w4qvq1iccapy1kqxbj1" + "commit": "b5c1d391b4be469a07536e901e54a8680387025f", + "sha256": "1z3gzax6i9cwipmi64hg3h98haimlb0xsz4zm1ggqwwq1zd5csvp" }, "stable": { "version": [ @@ -101630,6 +102677,24 @@ "sha256": "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz" } }, + { + "ename": "tray", + "commit": "26905a583fa78d1cf23e34ed983bbc132f5d71a4", + "sha256": "1c5rjyi7y5bni8mviafyfiwzrd6af3s82n87298d4356sjrggf2b", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/tray", + "unstable": { + "version": [ + 20210214, + 1119 + ], + "deps": [ + "transient" + ], + "commit": "e2b169daae9d1d6f7e9fc32365247027fb4e87ba", + "sha256": "1wrip00q6lbpllhaz0c7llnm774dq2mizr39ynfssvsdci38z1lm" + } + }, { "ename": "tree-mode", "commit": "84f836338818946a6bb31d35d6ae959571128ed5", @@ -101653,26 +102718,26 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201229, - 1403 + 20210116, + 621 ], "deps": [ "tsc" ], - "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", - "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" + "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7", + "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg" }, "stable": { "version": [ 0, 13, - 0 + 1 ], "deps": [ "tsc" ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2", + "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v" } }, { @@ -101683,45 +102748,57 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20201231, - 1842 + 20210215, + 1506 ], "deps": [ "seq", "tree-sitter" ], - "commit": "a11aa84a768cff2d40db7ef0c6029742b7ce46a1", - "sha256": "1zxzmqdyw681vzxwhs7bi4xylqy99v0jajsv03mppsslxl4l2fwm" + "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4", + "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "seq", + "tree-sitter" + ], + "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4", + "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53" } }, { "ename": "tree-sitter-langs", - "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3", - "sha256": "147p5hmpys4qhg5ymsmgbc3wx3x2jjw625waprfph7sr6h2cfrps", + "commit": "4029e21f74841db0c82f4a343a3b51b09cae2f25", + "sha256": "0jygxdlh94blfn5gxn949ic2v2x49cvl0rfzmvig3igyfwmm33sp", "fetcher": "github", - "repo": "ubolonton/emacs-tree-sitter", + "repo": "ubolonton/tree-sitter-langs", "unstable": { "version": [ - 20210113, - 1755 + 20210228, + 1450 ], "deps": [ "tree-sitter" ], - "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", - "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" + "commit": "fcd267f5d141b0de47f0da16306991ece93100a1", + "sha256": "0vyln2gh7x6fkn1wm5z81ibbn7ly440zb68yg7xmyvmxy8xyqfmm" }, "stable": { "version": [ 0, - 13, - 0 + 9, + 2 ], "deps": [ "tree-sitter" ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "d13a43e286e9e20daf6c6dd29357ac4992208747", + "sha256": "11ap8rwsa83pq8850sbn9w46imdi3w8zncqp56g57gwgkkq11l6h" } }, { @@ -101768,22 +102845,21 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210110, - 2030 + 20210228, + 1117 ], "deps": [ "ace-window", "cfrs", "cl-lib", "dash", - "f", "ht", "hydra", "pfuture", "s" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -101812,15 +102888,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210118, + 1808 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" } }, { @@ -101838,8 +102914,8 @@ "evil", "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -101868,8 +102944,8 @@ "deps": [ "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -101900,8 +102976,8 @@ "pfuture", "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -101933,8 +103009,8 @@ "persp-mode", "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -101958,16 +103034,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210114, - 2135 + 20210116, + 1155 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" } }, { @@ -101985,8 +103061,8 @@ "projectile", "treemacs" ], - "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", - "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102240,20 +103316,20 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201229, - 1403 + 20210116, + 621 ], - "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", - "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" + "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7", + "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg" }, "stable": { "version": [ 0, 13, - 0 + 1 ], - "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", - "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2", + "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v" } }, { @@ -102881,28 +103957,28 @@ "repo": "undercover-el/undercover.el", "unstable": { "version": [ - 20200830, - 1638 + 20210123, + 2157 ], "deps": [ "dash", "shut-up" ], - "commit": "a73c50aedbca0416d0e4d4fbeee27131bdd117aa", - "sha256": "0jkbwj8qb10nsl7imcnjlhrp1c9skw088cirrvn7380hlq07w346" + "commit": "c36a7366aa080558125fa651ed6a28d5df735b37", + "sha256": "0qji4738q0yx2n0xrpk12q2akx8rgsvpfgnnfxrnk8xiywjfrqwz" }, "stable": { "version": [ 0, - 7, + 8, 0 ], "deps": [ "dash", "shut-up" ], - "commit": "9515b247649d05219bf96b1843eed7c4d02a332e", - "sha256": "1dh4cpn1l1shchr0gg6jyld1qbjn3fy12s43pksfww4sm4rjn9rn" + "commit": "0bc3583065e49647db47d8a595fec13cb517d12f", + "sha256": "19d3373fy635vbfwr1yhxirwqn68qzny9byv74smxws4ly04mr02" } }, { @@ -102987,8 +104063,8 @@ 20200701, 1435 ], - "commit": "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca", - "sha256": "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j" + "commit": "f4db4c9b9875134df6f5279281099361ae11c2e9", + "sha256": "0s88mz3x9iwz4hj1n4l4nmya473hcv8wsps8dyx4mmgzgpdb1lvf" } }, { @@ -103002,8 +104078,8 @@ 20201218, 400 ], - "commit": "702210384a0c68f04aabc23e08ebd4d6f43ea2c7", - "sha256": "0brd92jln528j7hh8gyv5wz451cfpayvkz9fic7b0wisnwgvq26b" + "commit": "a0389147365c10c974ad68b797b185affb935fe3", + "sha256": "0qdls5h0ryh93ziwd5gibhknz8n9v66fyp55iwjk8zblgahnm6ym" } }, { @@ -103014,11 +104090,11 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20200204, - 1612 + 20210207, + 45 ], - "commit": "5a9eb34ed945a4d62362528cc7557b9c4e81a12b", - "sha256": "10ybvgdrw9hzqwbzvsr3hmzci4yp9rxi5nbcm6iafrsn7p1vv1wj" + "commit": "91a1dfe516d90dab69c368f6669bacb2458ec5e9", + "sha256": "15rmg7gl4yz3kfb1096fq20y0fnfc35jmppg7nl4vi71xv4db35d" } }, { @@ -103652,14 +104728,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20210106, - 2145 + 20210207, + 1926 ], "deps": [ "bind-key" ], - "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", - "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" + "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", + "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" }, "stable": { "version": [ @@ -103691,8 +104767,8 @@ "key-chord", "use-package" ], - "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", - "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" + "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", + "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" }, "stable": { "version": [ @@ -103754,8 +104830,8 @@ "system-packages", "use-package" ], - "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", - "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" + "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", + "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" }, "stable": { "version": [ @@ -103868,11 +104944,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20201213, - 438 + 20210124, + 138 ], - "commit": "cd3ab3a419ed50f51a7746849c80cb69910b89ca", - "sha256": "0anmmy46cbph9sjngcz3hbyzir8glzb6fqzl36wzfnxj54rzcf7l" + "commit": "d4b2014c5684b33ff73b4940bdff7b1138c1f85d", + "sha256": "00cx125pq6jad1v8pxq016hzg6wz1d06l4pc6z9r60l89y2m9hm2" } }, { @@ -104021,14 +105097,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20200118, - 2324 + 20210217, + 704 ], "deps": [ "dash" ], - "commit": "f67925928dd844b74e4002f433e6f0ebd3aae357", - "sha256": "1s022vcjzm78v1j7z29pda3lk9x93fvks4qw5v9kh2yzsrxdq4h8" + "commit": "5f00b42a0c023c461cef7af4de7652d90c788b4d", + "sha256": "1mshxcbwdjs2fs7lzqhs3pqbmdmy2fyzkf9b6r8rsxqlisa4x6sn" } }, { @@ -104087,11 +105163,11 @@ "repo": "arthurgleckler/validate-html", "unstable": { "version": [ - 20200913, - 2002 + 20210131, + 1704 ], - "commit": "04321596380c7a87ed85762b6764e98b2ef31bf8", - "sha256": "09c24i4b5yg21qzlyss4si607d1n63sj5dr2pysikkzzd81b9hki" + "commit": "39890f7d00579954a660fc3b1c0195231325efd6", + "sha256": "0xb1gnf0f408z9p6iscb9g5c5xj2d460gyzk1mr0wjm847b9cs42" } }, { @@ -104136,11 +105212,11 @@ "repo": "thisirs/vc-auto-commit", "unstable": { "version": [ - 20170107, - 1333 + 20210216, + 1517 ], - "commit": "446f664f4ec835532f4f18ba18b5fb731f6030aa", - "sha256": "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav" + "commit": "56f478016a541b395092a9d3cdc0da84a37b30a1", + "sha256": "1aw5j6akrkzr4pgf10scbfqr9axny3pf3k7yslg7g5ss1fd71afl" } }, { @@ -104151,11 +105227,11 @@ "repo": "thisirs/vc-check-status", "unstable": { "version": [ - 20170107, - 1334 + 20210216, + 1525 ], - "commit": "37734beb16bfd8633ea328059bf9a47eed826d5c", - "sha256": "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra" + "commit": "d95ef8f0799cd3dd83726ffa9b01b076f378ce34", + "sha256": "10sr9qxfx64f7a2kj93vi7lmm1pdj6qf81ci0ykkmrffmjdlf846" } }, { @@ -104196,11 +105272,11 @@ "repo": "venks1/emacs-fossil", "unstable": { "version": [ - 20201121, - 1726 + 20210124, + 812 ], - "commit": "31b0ee6285cca98d376eb5b6e1bc832c419c9fd0", - "sha256": "1jva2vnpz97mrzpix5z2y8z9qph7p1r39ajyvdzjfx6vlvwgsv0i" + "commit": "5d66231e25f34aaedb4befa0fcd80a9c30d7e607", + "sha256": "01r8j7a8b3icfgyxpgxh3pimzwig0xbhmggahzllgn96w5fafgpv" } }, { @@ -104555,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" } }, { @@ -104963,6 +106039,21 @@ "sha256": "1mhw6ysi29s57dccq8a1jh810hz0a90ssw66ih5byvrysgs0hmqw" } }, + { + "ename": "virtual-comment", + "commit": "fe865358d240a8797d08010cc22d1451d6a8be46", + "sha256": "16ykignpbrd4i31wp25fj74mz6c5sakk6sd1lxib408f980zf6j5", + "fetcher": "github", + "repo": "thanhvg/emacs-virtual-comment", + "unstable": { + "version": [ + 20210210, + 255 + ], + "commit": "dadf36158c7ff89291bea4695999860cca2d094e", + "sha256": "10vnw6p5zg3azn1hf74014497qyxbxh6rr27lba45nrnxiz6wfmp" + } + }, { "ename": "virtualenv", "commit": "923e4fcf29423ad55b13132d53759bc436466ef9", @@ -105361,11 +106452,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210111, - 522 + 20210217, + 737 ], - "commit": "9d2ef5e535e79781a0c1d2523f82d096eb48765f", - "sha256": "03nslg391cagq9kdxkgyjcw3abfd5xswza5bq8rl8mrp9f8v7i17" + "commit": "e19da61668783239e47b1a7390fca10f38ceffa9", + "sha256": "04x9514vl8315racjn3c4b1kp6wiy33d1q7b637zfzsf6w72ybpa" } }, { @@ -105376,14 +106467,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20201204, - 1537 + 20210226, + 1800 ], "deps": [ "vterm" ], - "commit": "61cb072af997aa961e2aebe0125b883ff3bd6f43", - "sha256": "082gcdb3lnjn361hnsc1pzxx8dma7pm4iv03kd284fszs032amp2" + "commit": "91f788e90b12dd940e3bc9c7b24108be37b99c03", + "sha256": "1gdf27b89d47js89wi1amicrm49qryi0d3qyjzav4ryf8m7xx54m" } }, { @@ -105467,8 +106558,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20200616, - 1136 + 20210216, + 751 ], "deps": [ "bind-key", @@ -105477,8 +106568,8 @@ "s", "versuri" ], - "commit": "3dab1ea2253d5bc2974a1a064d2b1af3bd6b24f6", - "sha256": "1q1rcnsda1392kqh944hdj30d79300ycl46ck1bzx4szx3m3p801" + "commit": "196683c3860793f2255bd0b3091ac9d538fa3ba7", + "sha256": "1465fx3h6ylgqg98m08ja0f48xwsxqai1vnigbb1fwlaxg3k23lm" }, "stable": { "version": [ @@ -105563,11 +106654,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210105, - 2310 + 20210226, + 23 ], - "commit": "f29aadae07bd58689720271b1f6538edfec5c476", - "sha256": "130ydwzpzw4s4h3jhh5h066iib7s9c8xa43imvlvcqs3vghp7p1x" + "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37", + "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph" } }, { @@ -105788,16 +106879,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210105, - 1556 + 20210209, + 1125 ], "deps": [ "apel", "flim", "semi" ], - "commit": "cf16d1272cd04ccc845476a1db9fb2ab690b0f55", - "sha256": "05mx1g5gqrbzl4p41kxsk2hl15vrfx8nf97xf2zn9c9s8nq0qj0n" + "commit": "3a3530b1c4e2a2aa02d683d166cf123e9cc16a0a", + "sha256": "09px7ns1k03frxx02gvkhjzbygz9sp214xq5qnain5mnz4vglcih" } }, { @@ -106033,11 +107124,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20201227, - 1048 + 20210131, + 1758 ], - "commit": "a3ce21f795e03c7a5489a24b2b3c4fce2d7a2f59", - "sha256": "1234cr8hd25z181vg64r10l4gmdc1nr7dij2qnp4xs9ag3zkdf1y" + "commit": "8ef47935d638902ba35a557cae5edd6ab6ab1346", + "sha256": "1csskh7wyyjjpn81if2ss29vaz8vqzszb9yg99ffkgkyx2fr57y1" }, "stable": { "version": [ @@ -106126,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" } }, { @@ -106171,32 +107265,32 @@ }, { "ename": "weblorg", - "commit": "8c9f6e5452a31772f90c1b5a5fa34b5a833073bb", - "sha256": "0gcxksn353zl0kzi387dm3fyy9n4gpjsjy5qlbr7iq4pcby4zbjb", + "commit": "61f6ede846bbf5e364c626524c567d4e3e99b906", + "sha256": "13snxyxfpjp7aznqwvkikkdpgn0vnar51mqxl2zbiwr8iksh9hpz", "fetcher": "github", "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210111, - 526 + 20210222, + 102 ], "deps": [ "templatel" ], - "commit": "1d0b5b9bc640a7147e1aa42867c7794fb5d039cc", - "sha256": "1fanpp3a40fkwdxc3ixvz6ykvkxh61mq2jxl1dgf0rrxc82mzhms" + "commit": "96aa798389536eee543ffeb0fa3c34dbd123c359", + "sha256": "0mjgw2rs67h6jgpjnidsbb4xly8dmxwgblas5vi1ddqfppzchgfr" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "templatel" ], - "commit": "5ef2daff8498be07ea9b0f50a92d84c8d21d3a49", - "sha256": "14797vv2i3b5dgzdazacw2g9r3i5zam4xr3554xzpq1l8ran0g2p" + "commit": "3c860c7b52ccee2f8d0b96e8a9e65e9695eb6e0a", + "sha256": "1lia9g9dpmn7l7valyw7mvh7ipy2nanhjbd60gha1k4p4ypx3sla" } }, { @@ -106363,11 +107457,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20201209, - 1505 + 20210227, + 1749 ], - "commit": "86c72ef8e3d25bee94c35254ad03b5d3e4836994", - "sha256": "148p1c6cwxcri2732ngbbmd27g1m61gsxbgs0f1qbpqhsy0pplz2" + "commit": "831005d21ac373d5d12a1ef2d524e83a6b114c56", + "sha256": "1grqvy901bkx0pqfy2zfyqzmk5wdarihg27lyjlz1hpiyl74y3sp" } }, { @@ -106537,20 +107631,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20201216, - 1720 + 20210131, + 1837 ], - "commit": "428aedfce0157920814fbb2ae5d00b4aea89df88", - "sha256": "116c3krgi7iyv708jwzqjz72wf1j1aczgv5cvkdscrn7zgpyvm8c" + "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44", + "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al" }, "stable": { "version": [ 3, 5, - 0 + 1 ], - "commit": "ae59b7edb0d82aa0251803fdfbde6b865083c8b8", - "sha256": "13lgjsm9pwgjsxg7lzc1c9sw2bzssxikfj6grnshqfll8kz8yr4r" + "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44", + "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al" } }, { @@ -106593,14 +107687,11 @@ "repo": "Fuco1/whitaker", "unstable": { "version": [ - 20150814, - 1122 - ], - "deps": [ - "dash" + 20210203, + 1149 ], - "commit": "eaf26ea647b729ca705b73ea70312d5ffdf89448", - "sha256": "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab" + "commit": "a6fda24ccb69a18c0706633326d5cc4fcfaed83a", + "sha256": "00s7cljadn4f713kvwgvlapzh208fpqwyxlv4sxbsw6ba3gdllrd" }, "stable": { "version": [ @@ -106622,11 +107713,11 @@ "repo": "mswift42/white-sand-theme", "unstable": { "version": [ - 20151117, - 1648 + 20210131, + 813 ], - "commit": "97621edd69267dd143760d94393db2c2558c9ea4", - "sha256": "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn" + "commit": "729dd52cc1936250183d6761eed406c4be514a71", + "sha256": "0vlq6wywhc08z4ivyahpagcxbxfww6ipbmvgw4sgc8c6h3vb8v9s" } }, { @@ -106858,11 +107949,11 @@ "repo": "progfolio/wikinfo", "unstable": { "version": [ - 20210112, - 324 + 20210121, + 1642 ], - "commit": "b3c2824ab7cd653741b2b905f5c3279e312857cc", - "sha256": "01l3qwaqrcgrwlvfhxw2db06svcqhiahp6jbn8x8k5fmq7mk5hr3" + "commit": "afa32f2b3c23e6d1565698faf9697fa445059bb9", + "sha256": "1wxdb34xsvqydr54w44b84hbins8ay1md49vphp6jqbj99q992dg" } }, { @@ -106873,15 +107964,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20201227, - 1454 + 20210126, + 405 ], "deps": [ "org", "wikinfo" ], - "commit": "8496c243f8d98ba2787b63f7d19fbae3831832d2", - "sha256": "1w7q3badp6r653grsblmnambv99r52c34gmnpdz0f5ybmw83002p" + "commit": "d1a95a62e90cff70d83a6a2ce611aa895adb9a58", + "sha256": "196hhbqpx233av4zfcz0ig5r0rbp6annr8w88j5i6bqrk0yzm2ws" } }, { @@ -107051,15 +108142,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20190628, - 1827 + 20210214, + 1451 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "f6421966761ad911fe8861aba2b110c5dd60d1ea", - "sha256": "1p0y5gnrw7q65py2wjdf1hrdpiw5c2zbgvfbfmb13257jq5mga38" + "commit": "cb61b9381ef9865e725c4641588d7b8945d35003", + "sha256": "0ppx6kbc03l18z0dwd6y0anf8bqnf9vcpdz7h552q8sycrrwfq0h" }, "stable": { "version": [ @@ -107277,14 +108368,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210110, - 1545 - ], - "deps": [ - "async" + 20210117, + 2008 ], - "commit": "139ef3933ea7aa3fe67b87450a6a1ac0895e5c81", - "sha256": "1zdgn2ajpbdxnc7qf98z7590w8y1s0iqj27fv7m8ndkrn8c1cx0x" + "commit": "2848a90addae086b657605b84a7fbecf2c4c1c65", + "sha256": "0pcy9w0q4jlwcf4hhcdm2cjgpj9ca4b04cydwlv5pnm0qrnlrzpc" }, "stable": { "version": [ @@ -107389,8 +108477,8 @@ 20200509, 2010 ], - "commit": "0d5e910f19657ab376f72e5848be50d13d3b8e50", - "sha256": "1ksm11k8gxkjn9byacy08xrz91gvzyf7fjnxv7j5ffpsccbh0wg3" + "commit": "228732caf5272dd25e5c8acb2c6c86b0ac29ece8", + "sha256": "08j0ab7i0fk3d9d805mzwszlc82afr1sjw7isnx8k35d90cnmf3d" }, "stable": { "version": [ @@ -107607,8 +108695,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20201226, - 1859 + 20210224, + 1905 ], "deps": [ "ace-link", @@ -107616,8 +108704,8 @@ "swiper", "zoutline" ], - "commit": "7ddd86aa3c62955714c2d60decd7a78c06b4771a", - "sha256": "02ci6hnjv80n3gjl04lxkcjvc2bzvn34w0z721qira1g7m2ysa8a" + "commit": "eed052db551f60483b4189e9c87cbb16f6d5947a", + "sha256": "1800q96gchagwqplpwscgjqb9f7zcc0qb2z07cbq6a17dc4rqcpl" }, "stable": { "version": [ @@ -107897,11 +108985,11 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20201208, - 811 + 20210129, + 407 ], - "commit": "609bab2d72690c2eb1562e87dfa468b927eb1295", - "sha256": "0h14af90zcbinrn8q5csjc7px4yag20as995mvcn0ik8h9xk6jc7" + "commit": "4f1a63bf990c06942c5c290d5d146f8545f43b95", + "sha256": "0awa2zhnmm49sdvxwzhbnzcynk4qsbpsrmqmh9xi9rw20711iwjr" }, "stable": { "version": [ @@ -108036,11 +109124,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210112, - 109 + 20210208, + 2056 ], - "commit": "134f9d259b68f5c3644dbed203d0d4142e2f3ce9", - "sha256": "15x15dzk67xif8ybnv9jid5xzmwimxx086ysdhryqqzrlxc3igiq" + "commit": "3ae341944297d59bf33f5580364af2858198781e", + "sha256": "09w44nmxdvc7pxyz959qj59dfqxplj22qqdal7206bb12r1l88zr" } }, { @@ -108066,11 +109154,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210114, - 751 + 20210224, + 2052 ], - "commit": "015ec792050b4df00bb640602903258431ca6a44", - "sha256": "0h8sr9ig5ww2dwg5d22dfndyq68fv5mm1lf99k76wy5dxkqs5w5c" + "commit": "df7001159f7e8c9a61c0e360e8ea47b51deb38d9", + "sha256": "1hcm86w7mkc3ms2hy1fljjnk88yin1lax6ww3aq7r2yijjsv9a4w" } }, { @@ -108571,8 +109659,8 @@ 20210110, 640 ], - "commit": "3e7360553f46461cbcacdb18cbb7a214d55b89f7", - "sha256": "1cqp0azbnhsi7l2xis6b0pwcpn4v40cqx5p79ymhhza8ch8q7rx6" + "commit": "9f0cd128fd118fbdf9ea64816c38c0d45adb9733", + "sha256": "0c326d218p8pp1dcs1zz3q2mgvda82c9drh73hgb8n610f2gvd9d" } }, { @@ -108840,8 +109928,8 @@ 20200511, 2005 ], - "commit": "91159ce448e3bc9cc5759051e2b126599567893e", - "sha256": "1f0zb417y40iwx3x116lyp74hv9x6z5c500ydvig3qsjf7l82dx2" + "commit": "96068216a4f0c4894bf780cd36164fe840cf81d5", + "sha256": "11wrvmnr74pqga8a00gd4zskan8wkgah9fyn0bwgp0x4qx4xni17" } }, { @@ -108978,11 +110066,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20201228, - 1208 + 20210205, + 1318 ], - "commit": "06d85f04133fbd49a6469174032f4c10a0abe98d", - "sha256": "16a4qfliym93rj7bsjijzwlv8r8h9kbxrd53wdk9fb6vgdk2vv9h" + "commit": "fb9cb7753af971701dcd96a51efb4d70e2b2a18f", + "sha256": "1xaal77cqics6fdm51j7pm12k61v0qxg68krgb7yi1fd90fm2iy3" }, "stable": { "version": [ @@ -109465,11 +110553,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20200909, - 513 + 20210216, + 29 ], - "commit": "1ca48766209d941f0300d725ce9bec5a8bc2d642", - "sha256": "1abzv19aghgjkzc15wcii3fvapjx221imap48gfn2d3ckbppy8lb" + "commit": "eb2a38c71a955fa934ac7a907b9924b3755e40c7", + "sha256": "0zvk10mgy3q10qmigqx2g1vfxvrwzs27lq4gq0qkh7k4qish2zgx" }, "stable": { "version": [ @@ -109515,6 +110603,21 @@ "sha256": "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq" } }, + { + "ename": "ytdious", + "commit": "946fc7cf4d5e6cd346c331bec7af519ab93f53c4", + "sha256": "1yg5kfr0kbr55ral50m56njkfl3lz2shlp2fs4cgmwrbp9pvzb9p", + "fetcher": "github", + "repo": "spiderbit/ytdious", + "unstable": { + "version": [ + 20210228, + 2111 + ], + "commit": "941460b51e43ef6764e15e2b9c4af54c3e56115f", + "sha256": "0ihqzxahqvk8jnn05k06lzhi6pd9c1a2q7qqybnmds85amkwmsad" + } + }, { "ename": "ytdl", "commit": "3531012169cb78d00cdf89fa54a7aff684200083", @@ -109829,25 +110932,25 @@ "repo": "NicolasPetton/zerodark-theme", "unstable": { "version": [ - 20190528, - 923 + 20210216, + 1640 ], "deps": [ "all-the-icons" ], - "commit": "df22536a244293591575e56970bf83814faa7c14", - "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6" + "commit": "65a4b57d064cd4bfe61750d105206c3654ac5bba", + "sha256": "1jiyz68pswbmh5fbkwndw83kim150rg2wz7i2a5lac3vj7zqr0nc" }, "stable": { "version": [ 4, - 6 + 7 ], "deps": [ "all-the-icons" ], - "commit": "df22536a244293591575e56970bf83814faa7c14", - "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6" + "commit": "342055346446bb8306ac2d3d2ac1f4236c84a404", + "sha256": "1r5s4mvwlxsb9ylr6dkfxpm1l0pbqkmn5gwjdcfk762cnxlam8cm" } }, { @@ -109858,15 +110961,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20201230, - 2127 + 20210214, + 1135 ], "deps": [ "ace-window", "deft" ], - "commit": "ca3793959669b577296e1787aa029effa29a15c5", - "sha256": "1rxp0nwnjpwz3j44yj7afjj04hx4y3157a7vrgy0dlivhjzmdgag" + "commit": "8ea36747ff499e82a911c367eba8f7423c6301a4", + "sha256": "0p0hz0s3fzpig3vinj7wv3vs29ba5rshw4glxrk3q1hlv3hh4q4s" }, "stable": { "version": [ @@ -110265,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": [ @@ -110371,14 +111474,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20191108, - 2234 + 20210215, + 2111 ], "deps": [ "cl-lib" ], - "commit": "0a5b25f364490a58ef7371534a39c75d11f54132", - "sha256": "0a0p9srdkc79isw99al3vba50vc435654wix07r9jcgdh856zbsr" + "commit": "dc5f76923436ea87b802b56a54185b6888177a8c", + "sha256": "17y1hjhygh2kq487ab1s8n2ba9npdmqg6354jv3gha6ar3mib1qi" } }, { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/26.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/26.nix deleted file mode 100644 index a151006a995..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/27.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/27.nix index 1037c0cd91d..8bc65bad8b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/27.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch deleted file mode 100644 index 88befda899a..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch deleted file mode 100644 index 2ffe8b777a0..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 9377d3ba89c..6726790d50f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/infra/libkookie/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" ; @@ -159,6 +165,14 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { '' + lib.optionalString (nativeComp && withNS) '' ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp '' + lib.optionalString nativeComp '' + echo "Generating native-compiled trampolines..." + # precompile trampolines in parallel, but avoid spawning one process per trampoline. + # 1000 is a rough lower bound on the number of trampolines compiled. + $out/bin/emacs --batch --eval "(mapatoms (lambda (s) \ + (when (subr-primitive-p (symbol-function s)) (print s))))" \ + | xargs -n $((1000/NIX_BUILD_CORES + 1)) -P $NIX_BUILD_CORES \ + $out/bin/emacs --batch -l comp --eval "(while argv \ + (comp-trampoline-compile (intern (pop argv))))" mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/macport.nix index 3c57d3bc81a..b8fcc678faa 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/formiko/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/formiko/default.nix new file mode 100644 index 00000000000..53fee165f5e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/formiko/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, gtk3 +, docutils +, gtksourceview +, gtkspell3 +, librsvg +, pygobject3 +, webkitgtk +}: + +buildPythonApplication rec { + pname = "formiko"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "ondratu"; + repo = "formiko"; + rev = version; + sha256 = "0n7w585gbrpn2xcd5n04hivrjarpr2wj260y2kpxpgh93vn52sdi"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + gtk3 + ]; + propagatedBuildInputs = [ + docutils + gobject-introspection + gtk3 + gtksourceview + gtkspell3 + librsvg + pygobject3 + webkitgtk + ]; + + # Needs a display + doCheck = false; + + meta = with lib; { + description = "reStructuredText editor and live previewer"; + homepage = "https://github.com/ondratu/formiko"; + license = licenses.bsd3; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 67cb0028ae5..da7b70cecd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -35,7 +35,6 @@ , wrapGAppsHook , dbus , xvfb_run -, glib }: stdenv.mkDerivation rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix index 324d8b13f21..34f489bfba3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/greenfoot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/jed/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/jed/default.nix index 7b197be0e6f..29c8bc258cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/jed/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/jed/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "--with-slang=${slang}" "JED_ROOT=${placeholder "out"}/share/jed" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 62f1178866c..635a8dbf46f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -3,7 +3,7 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta }: +{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }: with lib; @@ -72,11 +72,11 @@ with stdenv; lib.makeOverridable mkDerivation rec { makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret libnotify - ]}" \ + ] ++ extraLdPath)}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index c2415cf4f21..31551f1b724 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -12,7 +12,7 @@ let # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "CLion"; meta = with lib; { @@ -25,7 +25,7 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' ( cd $out/clion-${version} @@ -97,7 +97,7 @@ let }); buildGoland = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; meta = with lib; { @@ -112,7 +112,7 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -125,6 +125,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "IDEA"; + extraLdPath = [ zlib ]; meta = with lib; { homepage = "https://www.jetbrains.com/idea/"; inherit description license; @@ -134,8 +135,8 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ]; + platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ]; }; }); @@ -202,7 +203,7 @@ let }; buildRider = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Rider"; meta = with lib; { @@ -219,7 +220,7 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ @@ -241,7 +242,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with lib; { @@ -255,7 +256,7 @@ let maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' # Webstorm tries to use bundled jre if available. # Lets prevent this for the moment @@ -269,12 +270,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ + sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -282,12 +283,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ + sha256 = "1wjaavgslwpz4jniszswdy10rk3622i1w3awdwhgjlcc6mwkwz1f"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -295,12 +296,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ + sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -334,12 +335,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; - sha256 = "0dr1z2sxarz1xif4swxx28hpzsyjd86m0c3xdaw5lmpqwqlzvc5h"; /* updated by script */ + sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -347,12 +348,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ + sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -360,12 +361,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ + sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -373,12 +374,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ + sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -399,12 +400,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ + sha256 = "17x3sz4jkz2px25gj813xqrrb2cm7mdl6m5a22zg086phym66g3c"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/jupp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/jupp/default.nix index e134113e23f..c31c1fe10c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/jupp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix index 950229baee0..98b77338b9b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix @@ -1,7 +1,7 @@ -{ pkgs, parinfer-rust, rep }: +{ pkgs, parinfer-rust, rep, kak-lsp }: { - inherit parinfer-rust rep; + inherit parinfer-rust rep kak-lsp; case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix index 7ac56d9cb1e..451507885ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix index 23c8f0698cf..44b4fd7bc19 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix index 041c25f1728..0567ee39d7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index cb1265735f9..e1478ef6a03 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix index 71833be3300..337a46c0ec6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; - version = "0.2.1"; + version = "0.2.2"; - cargoSha256 = "1cbiidq0w5f9ynb09b6828p7p7y5xhpgz47n2jsl8mp96ydhy5lv"; + cargoSha256 = "sha256-8iEUOLFwHBLS0HQL/oLnv6lcV3V9Hm4jMqXkqPvIF9E="; src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; rev = "v${version}"; - sha256 = "1x5bvvq33380k2qhs1bwz3f9zl5q1sl7iic47pxfkzv24bpjnypb"; + sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k="; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/kodestudio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/kodestudio/default.nix index e0704cdbc85..aa7b7b19448 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/kodestudio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix index 63be87ee86c..90879b352e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix index cb53eb9d9d4..b5525285566 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 5c6c6c1a8d5..41ff62a619f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 9206b296b9a..f968b85c6ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/poke/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/poke/default.nix new file mode 100644 index 00000000000..1c6f005863b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/qemacs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/qemacs/default.nix new file mode 100644 index 00000000000..065dccb2b21 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/qemacs/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, lib, stdenv, xlibsWrapper, libXv, libpng }: + +stdenv.mkDerivation rec { + pname = "qemacs"; + version = "0.3.3"; + + src = fetchurl { + url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; + }; + + buildInputs = [ xlibsWrapper libpng libXv ]; + + preInstall = '' + mkdir -p $out/bin $out/man + ''; + + meta = with lib; { + homepage = "https://bellard.org/qemacs/"; + description = "Very small but powerful UNIX editor"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ iblech ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/default.nix index fa4e73a3768..d2aea1344da 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/qxmledit/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { export QXMLEDIT_INST_DOC_DIR="$doc" ''; + dontWrapQtApps = true; + meta = with lib; { description = "Simple XML editor based on qt libraries" ; homepage = "https://sourceforge.net/projects/qxmledit"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/default.nix index 2193d0ea5bb..661bec463a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/default.nix @@ -1,6 +1,6 @@ -{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir -, lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }: -with stdenv; +{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub +, lib, stdenv, formats, runCommand, spacevim_config ? import ./init.nix }: + let format = formats.toml {}; vim-customized = vim_configurable.customize { @@ -10,28 +10,37 @@ let # ~/.cache/vimfiles/repos vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; }; }; - spacevimdir = format.generate "init.toml" spacevim_config; -in mkDerivation rec { + spacevimdir = runCommand "SpaceVim.d" { } '' + mkdir -p $out + cp ${format.generate "init.toml" spacevim_config} $out/init.toml + ''; +in stdenv.mkDerivation rec { pname = "spacevim"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; rev = "v${version}"; - sha256 = "1xw4l262x7wzs1m65bddwqf3qx4254ykddsw3c3p844pb3mzqhh7"; + sha256 = "sha256-QQdtjEdbuzmf0Rw+u2ZltLihnJt8LqkfTrLDWLAnCLE="; }; nativeBuildInputs = [ makeWrapper vim-customized]; buildInputs = [ vim-customized ]; buildPhase = '' + runHook preBuild # generate the helptags vim -u NONE -c "helptags $(pwd)/doc" -c q + runHook postBuild ''; - patches = [ ./helptags.patch ]; + patches = [ + # Don't generate helptags at runtime into read-only $SPACEVIMDIR + ./helptags.patch + ]; installPhase = '' + runHook preInstall mkdir -p $out/bin cp -r $(pwd) $out/SpaceVim @@ -40,6 +49,7 @@ in mkDerivation rec { makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \ --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \ --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]} + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch b/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch index e8b31c57419..bc0f9140c7b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch @@ -2,7 +2,7 @@ diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 16688680..fcafd6f7 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim -@@ -1255,13 +1255,6 @@ function! SpaceVim#end() abort +@@ -1355,13 +1355,6 @@ function! SpaceVim#end() abort let &helplang = 'jp' endif "" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index e66febbf7fc..0d50c24d397 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix index e474ff5f19b..6e3580a563c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 77af6b67939..12b9c638c4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.0.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "03q1mdz47crflkvpc364ky52farad7517jhszb1fg1s3c2bnndn0"; + sha256 = "sha256-MFCQwhdF+WCTqDt4q5qw431y/zqEy9vHudcUYb4BYNQ="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix index 6ea6b6c6094..7ed3dee9b6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/viw/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/viw/default.nix index 3aad18ef11c..0ba381901b9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/viw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/viw/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkFlags = [ "test-command" "test-buffer" "test-state" ]; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix index c30b52782ef..d2c91f155d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/editors/xed-editor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/xed-editor/default.nix new file mode 100644 index 00000000000..d7b0703b8d5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/xed-editor/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libxml2 +, libpeas +, glib +, gtk3 +, gtksourceview4 +, gspell +, xapps +, pkg-config +, meson +, ninja +, wrapGAppsHook +, intltool +, itstool }: + +stdenv.mkDerivation rec { + pname = "xed-editor"; + version = "2.8.4"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = "xed"; + rev = version; + sha256 = "1hqr4157kp110p01jygqnnzj86zxlfiq4b53j345vqpx0f80c340"; + }; + + nativeBuildInputs = [ + meson + cmake + pkg-config + intltool + itstool + ninja + wrapGAppsHook + ]; + + buildInputs = [ + libxml2 + glib + gtk3 + gtksourceview4 + libpeas + gspell + xapps + ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then + echo "${pname} smoke test passed" + else + echo "${pname} smoke test failed" + return 1 + fi + ''; + + meta = with lib; { + description = "Light weight text editor from Linux Mint"; + homepage = "https://github.com/linuxmint/xed"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ tu-maurice ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix similarity index 93% rename from infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix rename to infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index 66ad424253e..a6b4af7892d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 8726fc1d793..0a90b84892e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.11.1"; + version = "4.12.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-Qe5mV9GBLHsmzMQg6dKib/sTnNdyOTj4wYQ9xd/iqJM="; + sha256 = "sha256-qbG0Ii3Xmj1UGGS+n+LdiNPAHBkpQZMGEzrDvOcaUNA="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 31dff2f9c2d..82007caea9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 1c4f05b42da..57d1f794d0f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index db3bd494b6b..307866c377a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -81,6 +81,29 @@ in }; }; + farbfeld = pluginDerivation rec { + pname = "farbfeld"; + version = "unstable-2019-08-12"; + + src = fetchFromGitHub { + owner = "ids1024"; + repo = "gimp-farbfeld"; + rev = "5feacebf61448bd3c550dda03cd08130fddc5af4"; + sha256 = "1vmw7k773vrndmfffj0m503digdjmkpcqy2r3p3i5x0qw9vkkkc6"; + }; + + installPhase = '' + installPlugin farbfeld + ''; + + meta = { + description = "Gimp plug-in for the farbfeld image format"; + homepage = "https://github.com/ids1024/gimp-farbfeld"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + }; + }; + fourier = pluginDerivation rec { /* menu: Filters/Generic/FFT Forward diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix index 8fde04d0d1d..bb81a374fea 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix index cdfb2f66873..daa540d31e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix index 24e064e721b..583dcf7c618 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 0e65d3199ab..616a0b71356 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.9.1"; + version = "2.11.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "1ls6n1a8vjgwkb40drpc3rapjligaf9fp218539fnwvhv26div69"; + sha256 = "0aigngfi5dbjihn43c6sg865i1ybfzj0w81zclzy8r9nqiqq0wma"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -23,15 +23,19 @@ perlPackages.buildPerlPackage rec { [ librsvg sane-backends sane-frontends ] ++ (with perlPackages; [ Gtk3 + Gtk3ImageView Gtk3SimpleList Cairo CairoGObject Glib GlibObjectIntrospection GooCanvas2 + GraphicsTIFF + IPCSystemSimple LocaleCodes LocaleGettext - PDFAPI2 + PDFBuilder + ImagePNGLibpng ImageSane SetIntSpan PerlMagick @@ -93,9 +97,21 @@ perlPackages.buildPerlPackage rec { xvfb_run file tesseract # tests are expecting tesseract 3.x precisely - ]; + ] ++ (with perlPackages; [ + TestPod + ]); checkPhase = '' + # Temporarily disable a dubiously failing test: + # t/169_import_scan.t ........................... 1/1 + # # Failed test 'variable-height scan imported with expected size' + # # at t/169_import_scan.t line 50. + # # got: '179' + # # expected: '296' + # # Looks like you failed 1 test of 1. + # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) + rm t/169_import_scan.t + xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index faa25f4aef0..26de91ee225 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , gnome3 , pkg-config , meson diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imagej/default.nix index 7e3238e94bb..312316b3397 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imagej/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index ba6af5d781f..11340fa7468 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -7,6 +7,7 @@ , fetchurl , gettext , gdl +, ghostscript , glib , glib-networking , glibmm @@ -74,6 +75,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs share/extensions + substituteInPlace share/extensions/eps_input.inx \ + --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf" + substituteInPlace share/extensions/ps_input.inx \ + --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf" + substituteInPlace share/extensions/ps_input.py \ + --replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'" patchShebangs share/templates patchShebangs man/fix-roff-punct ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix index cca7b1fc3a5..c558a6bb062 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 857a68df092..96df57d7198 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rx/LUp5s2DhEKuLUklYXjtTXjqBju+5YzK1hNfBCnIE="; + sha256 = "sha256-btkGn/67KVFB272j7u5MKZCeby2fyRthLLeXj8VgX7s="; }; vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ="; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index bd9ad301d34..204d87a59c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/solvespace/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/solvespace/default.nix index 98348129d9b..b00f7f33210 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/solvespace/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix index 313920d8154..1dfc4393c46 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/graphics/tev/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/tev/default.nix index ac8da654f05..3c48bbab0b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0fn5j9klzrjvz3bq8p9yp9nqikn2fr7bp98c1sxwpwwaadkqy9xf"; + sha256 = "12wsy2zdfhg0ygkpvz58rk86qiy259fi9grb0jxiz8zcyd6x1ngk"; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { --replace "/usr/" "''${out}/" ''; + cmakeFlags = [ + "-DTEV_DEPLOY=1" # Only relevant not to append "dev" to the version + ]; + postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix index 0c5c8f3ff28..3187f573de7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix index 2076723a372..ad94c79e0f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch b/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch index 58390cba226..3e5ccc9cdaa 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch b/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch index ac9b3146e17..24f59f67916 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch index 1a0bc000c80..3aa61da73e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/default.nix index d24e19f89e7..e0b0e2324b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/akonadi/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/calendarsupport.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/calendarsupport.nix index b316ab4e568..c7ef5c4615c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/calendarsupport.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/default.nix index 33f392fdccc..f8719c353b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/dolphin.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/dolphin.nix index 3774c7e00b6..a558ad26677 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/dolphin.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/fetch.sh b/infra/libkookie/nixpkgs/pkgs/applications/kde/fetch.sh index e3bba77f972..d659c551bd6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix index 2a8b82352b4..f19ee160984 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/filelight.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/filelight.nix index 1aeff531862..95a89b01b8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/filelight.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/incidenceeditor.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/incidenceeditor.nix index 981c184d151..7f2c284ad74 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/incidenceeditor.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kaddressbook.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kaddressbook.nix index 452c5142157..2672d815fb0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kaddressbook.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kalarm.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kalarm.nix index 70ee3f74185..8709f26bd12 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kalarm.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kamoso.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kamoso.nix new file mode 100644 index 00000000000..3e5eb53858f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kdebugsettings.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdebugsettings.nix index f4dd7ec145d..0287830485e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kdebugsettings.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix index 94656b02671..a7da03ffdd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive/default.nix similarity index 100% rename from infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive.nix rename to infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive/default.nix diff --git a/infra/libkookie/nixpkgs/pkgs/applications/kde/ffmpeg-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch similarity index 100% rename from infra/libkookie/nixpkgs/pkgs/applications/kde/ffmpeg-path.patch rename to infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch diff --git a/infra/libkookie/nixpkgs/pkgs/applications/kde/mlt-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch similarity index 100% rename from infra/libkookie/nixpkgs/pkgs/applications/kde/mlt-path.patch rename to infra/libkookie/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch diff --git a/infra/libkookie/nixpkgs/pkgs/applications/kde/kdepim-addons.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdepim-addons.nix index 0939b0ecd26..42532644a1a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kdepim-addons.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix deleted file mode 100644 index 19f476fd781..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kmail.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kmail.nix index fa3fe033035..e742f566678 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kmail.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kompare.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kompare.nix index a449a1e4f51..d4d49c6a942 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kompare.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/konqueror.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/konqueror.nix index 72fcf8ff220..eb188ccef11 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/konqueror.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kontact.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kontact.nix index 3dfa28e9dfe..801c6845e40 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kontact.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/korganizer.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/korganizer.nix index f28e0406b13..a6a28427772 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/korganizer.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/kpat.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/kpat.nix index d1e47af6b72..96bd6dd542e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/kpat.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/krdc.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/krdc.nix index 01cc39d9895..b0e79b0ff89 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/krdc.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/messagelib.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/messagelib.nix index d47a5504417..6709a1f072a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/messagelib.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/kde/srcs.nix b/infra/libkookie/nixpkgs/pkgs/applications/kde/srcs.nix index 5ff13eaf240..f78d29db6bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/infra/libkookie/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.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.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/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.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.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/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"; - 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"; + version = "20.12.1"; 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.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.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/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/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/1password-gui/default.nix similarity index 95% rename from infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix rename to infra/libkookie/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 709d1667209..924e006c4cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.12-3"; + version = "0.9.26"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24="; + hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/update.sh b/infra/libkookie/nixpkgs/pkgs/applications/misc/1password-gui/update.sh similarity index 100% rename from infra/libkookie/nixpkgs/pkgs/tools/security/1password-gui/update.sh rename to infra/libkookie/nixpkgs/pkgs/applications/misc/1password-gui/update.sh diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/9menu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/9menu/default.nix new file mode 100644 index 00000000000..8e6b7b3bcbe --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/ape/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ape/default.nix index f16d6e15733..c359d606a85 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ape/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix index c670a4b367d..8646a6716a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -5,11 +5,11 @@ watchdog, wtforms, html2text, flask-compress }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "1.0.0"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "FDyUfahjv4zqOVFr0nRhcgxr7mskFP1W/PlhZWx/6E8="; + sha256 = "6f706b925175852d8101a4afe2304ab7ee7d56e9658538b9a8e49e925978b87e"; }; # Relax some dependencies diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch new file mode 100644 index 00000000000..6aacbcc65bc --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/sox/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/sox/default.nix index dd5dbde5286..946150d2b88 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/sox/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix index 6e276d592b0..b7e738cfc12 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/authy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/authy/default.nix new file mode 100644 index 00000000000..65200d85177 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/authy/default.nix @@ -0,0 +1,110 @@ +{ alsaLib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups +, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib +, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper +, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg +}: + +let + # Currently only works with electron 9 + electron = electron_9; +in + +stdenv.mkDerivation rec { + pname = "authy"; + version = "1.8.3"; + rev = "5"; + + buildInputs = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libappindicator-gtk3 + libdbusmenu-gtk3 + libuuid + nspr + nss + pango + stdenv.cc.cc + systemd + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + ]; + + src = fetchurl { + url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; + sha256 = "1yfvkmy34mc1dan9am11yka88jv7a4dslsszy4kcc8vap4cjmgpn"; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; + + unpackPhase = '' + runHook preUnpack + unsquashfs "$src" + cd squashfs-root + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/ + + cp -r ./* $out/ + rm -R ./* + + # The snap package has the `ffmpeg.so` file which is copied over with other .so files + mv $out/*.so $out/lib/ + + # Replace icon name in Desktop file + sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop" + + # Move the desktop file, icon, binary to their appropriate locations + mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps + cp $out/meta/gui/authy.desktop $out/share/applications/ + cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png + cp $out/${pname} $out/bin/${pname} + + # Cleanup + rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so} + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/resources/app.asar + ''; + + meta = with lib; { + homepage = "https://www.authy.com"; + description = "Twilio Authy two factor authentication desktop application"; + license = licenses.unfree; + maintainers = with maintainers; [ iammrinal0 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix index 4a023849f39..d50f3637988 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix index 9921fdc7a79..039dfe59ff7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/caerbannog/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/caerbannog/default.nix new file mode 100644 index 00000000000..451980352c2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/caerbannog/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchgit +, python3 +, glib +, gobject-introspection +, meson +, ninja +, pkg-config +, wrapGAppsHook +, atk +, libhandy +, libnotify +, pango +}: + +python3.pkgs.buildPythonApplication rec { + pname = "caerbannog"; + version = "0.3"; + format = "other"; + + src = fetchgit { + url = "https://git.sr.ht/~craftyguy/caerbannog"; + rev = version; + sha256 = "0wqkb9zcllxm3fdsr5lphknkzy8r1cr80f84q200hbi99qql1dxh"; + }; + + nativeBuildInputs = [ + glib + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + atk + gobject-introspection + libhandy + libnotify + pango + ]; + + propagatedBuildInputs = with python3.pkgs; [ + anytree + fuzzyfinder + gpgme + pygobject3 + ]; + + meta = with lib; { + description = "Mobile-friendly Gtk frontend for password-store"; + homepage = "https://sr.ht/~craftyguy/caerbannog/"; + changelog = "https://git.sr.ht/~craftyguy/caerbannog/refs/${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/calibre/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/calibre/default.nix index 7917975f4f2..16541eaaa21 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -21,27 +21,25 @@ , libusb1 , libmtp , xdg-utils -, makeDesktopItem , removeReferencesTo }: mkDerivation rec { pname = "calibre"; - version = "5.10.1"; + version = "5.11.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "18pnqxdyvgmw12yarxhvsgs4jk6c5hp05gf8khybcd78330954v9"; + sha256 = "sha256-PI+KIMnslhoagv9U6Mcmo9Onfu8clVqASNlDir8JzUw="; }; patches = [ - # Patches from Debian that: - # - disable plugin installation (very insecure) + # Plugin installation (very insecure) disabled (from Debian) ./disable_plugins.patch - # - switches the version update from enabled to disabled by default + # Automatic version update disabled by default (from Debian) ./no_updates_dialog.patch - # the unrar patch is not from debian - ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + ] + ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5); platform_tag = @@ -59,8 +57,7 @@ mkDerivation rec { setup/build.py # Remove unneeded files and libs - rm -rf resources/calibre-portable.* \ - src/odf + rm -rf src/odf resources/calibre-portable.* ''; dontUseQmakeConfigure = true; @@ -173,11 +170,16 @@ mkDerivation rec { disallowedReferences = [ podofo.dev ]; meta = with lib; { - description = "Comprehensive e-book software"; homepage = "https://calibre-ebook.com"; - license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; - maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; + description = "Comprehensive e-book software"; + longDescription = '' + calibre is a powerful and easy to use e-book manager. Users say it’s + outstanding and a must-have. It’ll allow you to do nearly everything and + it takes things a step beyond normal e-book software. It’s also completely + 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; [ pSub AndersonTorres ]; platforms = platforms.linux; - inherit version; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/cataract/build.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cataract/build.nix index f894dc91bd8..0adab84830d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cataract/build.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix index 74dd82a3c6e..524f8985537 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix index 630ee3c3683..fafcf3d5440 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix index e3a0046205e..c47dd972ccf 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix index e57ffd35271..ffdcf021b02 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.5.5"; + version = "1.6.2"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "051jxa07c58ym1w0mwckwxh60v28gqcpqw5nv8sm5wxil1crcayr"; + sha256 = "sha256-4Ae8lzaec7JeYfmeLleatUS/xQUjea7O4XJ9DOgJIMs="; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/coolreader/default.nix index d3f3eb6fcf5..5b310373eee 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/coolreader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/coolreader/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "coolreader"; - version = "3.2.49"; + version = "3.2.51"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "10i3w4zjlilz3smjzbwm50d91ns3w0wlgmsf38fn2lv76zczv8ia"; + sha256 = "sha256-rRWZHkuSNhAHwxKjpRgcNXO9vs/MDAgEuhRs8mRPjP4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 8cb87274c1d..3db4872c0e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -1,6 +1,6 @@ { lib - , mkDerivation +, nix-update-script , fetchFromGitHub , substituteAll , cmake @@ -37,22 +37,28 @@ let rev = "1.4.1"; sha256 = "1c6a8mdxms5vh8l7shi2kqdhafbzm50pbz6g1hhgg6qslla0vfn0"; }; + circleflags = fetchFromGitHub { + owner = "HatScripts"; + repo = "circle-flags"; + rev = "v2.0.0"; + sha256 = "1xz5b6nhcxxzalcgwnw36npap71i70s50g6b63avjgjkwz1ys5j4"; + }; in mkDerivation rec { pname = "crow-translate"; - version = "2.6.2"; + version = "2.7.1"; src = fetchFromGitHub { owner = "crow-translate"; repo = "crow-translate"; rev = version; - sha256 = "1jgpqynmxmh6mrknpk5fh96lbdg799axp4cyn5rvalg3sdxajmqc"; + sha256 = "sha256-YOsp/noGsYthre18fMyBj9s+YFzdHJfIJzJSm43wiZ0="; }; patches = [ (substituteAll { src = ./dont-fetch-external-libs.patch; - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator; + inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags; }) (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 @@ -61,10 +67,23 @@ mkDerivation rec { }) ]; + postPatch = "cp -r ${circleflags}/flags/* data/icons"; + nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; + postInstall = '' + substituteInPlace $out/share/applications/io.crow_translate.CrowTranslate.desktop \ + --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; homepage = "https://crow-translate.github.io/"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index b5f8d4606aa..eff303a852c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -1,8 +1,26 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index 2576203..26162a0 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -91,12 +91,11 @@ qt5_add_translation(QM_FILES + ) + + configure_file(src/cmake.h.in cmake.h) +-configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) + + add_executable(${PROJECT_NAME} + ${QM_FILES} + data/icons/engines/engines.qrc +- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc ++ data/icons/flags.qrc + src/addlanguagedialog.cpp + src/addlanguagedialog.ui + src/cli.cpp diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake -index d8c88ae..47a12c0 100644 +index 21eba0a..b613d3e 100644 --- i/cmake/ExternalLibraries.cmake +++ w/cmake/ExternalLibraries.cmake -@@ -2,24 +2,20 @@ include(FetchContent) +@@ -2,29 +2,24 @@ include(FetchContent) set(QAPPLICATION_CLASS QApplication) FetchContent_Declare(SingleApplication @@ -30,4 +48,10 @@ index d8c88ae..47a12c0 100644 + SOURCE_DIR @qonlinetranslator@ ) - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator) + FetchContent_Declare(CircleFlags +- GIT_REPOSITORY https://github.com/HatScripts/circle-flags +- GIT_TAG v2.0.0 ++ SOURCE_DIR @circleflags@ + ) + + FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch index 816b6c51886..9e0f587ec7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch @@ -1,13 +1,13 @@ -diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp -index 7be4573..e65994e 100644 ---- i/src/settings/appsettings.cpp -+++ w/src/settings/appsettings.cpp -@@ -82,7 +82,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) - QLocale::setDefault(QLocale(lang)); +diff --git c/src/settings/appsettings.cpp i/src/settings/appsettings.cpp +index ff99f64..fa929ae 100644 +--- c/src/settings/appsettings.cpp ++++ i/src/settings/appsettings.cpp +@@ -80,7 +80,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) + QLocale::setDefault(locale); - s_appTranslator.load(QLocale(), QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory)); -- s_qtTranslator.load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ s_qtTranslator.load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); + s_appTranslator.load(locale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory)); +- s_qtTranslator.load(locale, QStringLiteral("qtbase"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ s_qtTranslator.load(locale, QStringLiteral("qtbase"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); } QLocale::Language AppSettings::defaultLanguage() diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix index 061e3bc62de..aa19ce2c53e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-310zrxVjUECg/3+ydo9J8EdF0RbguBIT2PklEgpgRFU="; + sha256 = "sha256-++8vTK0OR44Mcdh5g2bJEq7aO+fWySKw0XlSz2KJNio="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 05d282aaf06..68c9019f6ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper -, fontconfig, freetype, glib, gtk3 -, jdk, libX11, libXrender, libXtst, zlib }: - -# The build process is almost like eclipse's. -# See `pkgs/applications/editors/eclipse/*.nix` - -stdenv.mkDerivation rec { - pname = "dbeaver-ce"; - version = "7.3.2"; - +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, fontconfig +, freetype +, glib +, gtk3 +, jdk +, libX11 +, libXrender +, libXtst +, zlib +, maven +}: +let desktopItem = makeDesktopItem { name = "dbeaver"; exec = "dbeaver"; @@ -18,44 +24,120 @@ stdenv.mkDerivation rec { genericName = "SQL Integrated Development Environment"; categories = "Development;"; }; +in +stdenv.mkDerivation rec { + pname = "dbeaver-ce"; + version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256 + + src = fetchFromGitHub { + owner = "dbeaver"; + repo = "dbeaver"; + rev = version; + sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk="; + }; + + fetchedMavenDeps = stdenv.mkDerivation { + name = "dbeaver-${version}-maven-deps"; + inherit src; + + buildInputs = [ + maven + ]; + + 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 = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + + # don't do any fixup + dontFixup = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; + }; buildInputs = [ - fontconfig freetype glib gtk3 - jdk libX11 libXrender libXtst zlib + fontconfig + freetype + glib + gtk3 + jdk + libX11 + libXrender + libXtst + makeWrapper + zlib ]; nativeBuildInputs = [ - makeWrapper + maven ]; - src = fetchurl { - url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-4BVXcR8/E4uIrPQJe9KU9577j4XLTxJWTO8g0vCHWts="; - }; + buildPhase = '' + runHook preBuild + + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 -P desktop,all-platforms - installPhase = '' - # remove bundled jre - rm -rf jre + runHook postBuild + ''; - mkdir -p $out/ - cp -r . $out/dbeaver + installPhase = + let + productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product"; - # Patch binaries. - interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) - patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver + platformMap = { + aarch64-linux = "aarch64"; + x86_64-darwin = "x86_64"; + x86_64-linux = "x86_64"; + }; - makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}"); + in + if stdenv.isDarwin then '' + runHook preInstall - # Create desktop item. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/Applications $out/bin + cp -r ${productTargetPath}/macosx/cocoa/${systemPlatform}/DBeaver.app $out/Applications - mkdir -p $out/share/pixmaps - ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm - ''; + sed -i "/^-vm/d; /bin\/java/d" $out/Applications/DBeaver.app/Contents/Eclipse/dbeaver.ini + + ln -s $out/Applications/DBeaver.app/Contents/MacOS/dbeaver $out/bin/dbeaver + + 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/${systemPlatform}/dbeaver $out/dbeaver + + # Patch binaries. + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver + + makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ + --prefix PATH : ${jdk}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + + # Create desktop item. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + mkdir -p $out/share/pixmaps + ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm + + runHook postInstall + ''; meta = with lib; { homepage = "https://dbeaver.io/"; @@ -67,7 +149,7 @@ stdenv.mkDerivation rec { Teradata, Firebird, Derby, etc. ''; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.jojosch ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + maintainers = with maintainers; [ jojosch ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix index f5e5dccd0f3..186826e6f7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "diff-pdf"; - version = "0.4.1"; + version = "0.5"; src = fetchFromGitHub { owner = "vslavik"; repo = "diff-pdf"; rev = "v${version}"; - sha256 = "1y5ji4c4m69vzs0z051fkhfdrjnyxb6kzac5flhdkfb2hgp1jnxl"; + sha256 = "sha256-Si8v5ZY1Q/AwQTaxa1bYG8bgqxWj++c4Hh1LzXSmSwE="; }; nativeBuildInputs = [ autoconf automake pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ding/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ding/default.nix index 36e2923522d..649fbe55fae 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ding/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/dunst/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dunst/default.nix index eed07a2356e..65e86bb7dbe 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dunst/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/far2l/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/far2l/default.nix index b414cbdd0ed..87eaed97535 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/far2l/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash +{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick , libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/flavours/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/flavours/default.nix index 6ee546fa7c5..0e072aa649c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/flavours/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/free42/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/free42/default.nix index 29c6df8a72e..5810607e8d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 5eebda9610e..6ccc31ef9b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.4"; + version = "1.16.5"; src = fetchPypi { inherit pname version; - sha256 = "744deddf22fdbc51d1d89776c41b0f1127d2b4d212bd092718fad2c0dc7f160f"; + sha256 = "fb8c927630b292abf5052f8f75c3eebccbdffa609566768d4dc4d9665df91e68"; }; propagatedBuildInputs = [ requests ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gkrellm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gkrellm/default.nix index 2cc20b424b1..aaaab255c76 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gkrellm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gkrellm/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which -, IOKit ? null }: +, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook +}: with lib; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ pkg-config which ]; + nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { # Makefiles are patched to fix references to `/usr/X11R6' and to add # `-lX11' to make sure libX11's store path is in the RPATH. - patchPhase = '' + postPatch = '' echo "patching makefiles..." for i in Makefile src/Makefile server/Makefile do @@ -30,6 +31,23 @@ stdenv.mkDerivation rec { makeFlags = [ "STRIP=-s" ]; installFlags = [ "DESTDIR=$(out)" ]; + # This icon is used by the desktop file. + postInstall = '' + install -Dm444 -T src/icon.xpm $out/share/pixmaps/gkrellm.xpm + ''; + + desktopItems = [ + (makeDesktopItem { + name = "gkrellm"; + exec = "gkrellm"; + icon = "gkrellm"; + desktopName = "GKrellM"; + genericName = "System monitor"; + comment = "The GNU Krell Monitors"; + categories = "System;Monitor;"; + }) + ]; + meta = { description = "Themeable process stack of system monitors"; longDescription = '' @@ -40,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "http://gkrellm.srcbox.net"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ khumba ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix index c6617cc2324..34f4aa71a38 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock index eed618a5cbd..73bc5d068d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/default.nix index fc80a5ddb8a..4a365b5a17e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix index d259167856a..690eba645dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix +++ b/infra/libkookie/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 = "12.1.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; type = "gem"; }; - version = "8.5.0"; + 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/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index f043aa66947..85c7fbae789 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + doCheck = true; preCheck = '' patchShebangs testo diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix index 4025b313128..8501b7c0875 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpsbabel/gui.nix @@ -10,6 +10,8 @@ mkDerivation { nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtwebkit ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace mainwindow.cc \ --replace "QApplication::applicationDirPath() + \"/" "\"" \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index a1357ff0a08..00a3914e173 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "CC=cc" - "CXX=c++" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" "CFLAGS=-DENABLE_NLS" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 5ea01dfa19f..cebbcfe59ba 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.5"; + version = "8.8"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-ygBM8HtCF8d4KVOakP4ssFyTgAsPQDfjAMJaEqo+Ml4="; + sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo="; }; patches = (substituteAll { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index 6c3ba132d0b..22444e22054 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix index 21128ac9119..2d855d0c9fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gsimplecal"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "https://github.com/dmedvinsky/gsimplecal/archive/v${version}.tar.gz"; - sha256 = "1sa05ifjp41xipfspk5n6l3wzpzmp3i45q88l01p4l6k6drsq336"; + sha256 = "sha256-f19cnTX83LZT2d01B1EdWSaHcfHqpFPTo5glYkAokq8="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix index 35246a45da2..a4c32b9b931 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.80.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0xs9y5lj0mya6ag625x8j91mn9l9r13gxaqxyvl1fl40y2yjz1zm"; + sha256 = "sha256-9YroUxcLixu+MNL37JByCulCHv0WxWGwqBQ/+FGtZLw="; }; - vendorSha256 = "172mcs8p43bsdkd2hxg9qn6018fh8f36kxx0vgnq5q6fqsb6s1f6"; + vendorSha256 = "sha256-5gQyoLirXajkzxKxzcuPnjECL2mJPiHS65lYkyIpKs8="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix index 9f1431a2340..5c50ac24538 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 65c747c40a5..161aeb7720b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix index cc7be93510c..bda211e6f7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock index 969909ca6d0..e93f78e83c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix index bfbe428c861..ee348a80c4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix index 28c7de12c8c..3828fc654d6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix index 32572ffcdb3..6388d005fe5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix index c7e87dbbfd4..af259c199d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -34,6 +34,8 @@ , withKeePassNetworking ? true , withKeePassTouchID ? true , withKeePassFDOSecrets ? true + +, nixosTests }: with lib; @@ -118,6 +120,8 @@ stdenv.mkDerivation rec { wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC ''; + passthru.tests = nixosTests.keepassxc; + meta = { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix index 60905be3b1b..33f3c4144b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.8"; + version = "0.26.9"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq"; + sha256 = "sha256-d0k8OQZ+ij+dslc3iAQkgy1TyYAL7Bf1xvSH21eTGO8="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix index a903600b46d..d4156577066 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.01.1"; + version = "2021.02"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "0kignyia2xrg84bqzsp8rid4c79zg11lhw52z1854jw9v9324pja"; + sha256 = "0v7jx4a2kz1i1k9jqwcxbgdikflk28cnnp69sbhha8pkkbk8c5wh"; }; sourceRoot = "."; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix new file mode 100644 index 00000000000..533d3757a6e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchgit +, meson +, ninja +, pkg-config +, scdoc +, cairo +, librsvg +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "lavalauncher"; + version = "2.0.0"; + + src = fetchgit { + url = "https://git.sr.ht/~leon_plickat/lavalauncher"; + rev = "v${version}"; + sha256 = "MXREycR4ZetTe71ZwEqyozMJN9OLTDvU0W4J8qkTQAs="; + }; + + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + buildInputs = [ + cairo + librsvg + wayland + wayland-protocols + ]; + + meta = with lib; { + homepage = "https://git.sr.ht/~leon_plickat/lavalauncher"; + description = "A simple launcher panel for Wayland desktops"; + longDescription = '' + LavaLauncher is a simple launcher panel for Wayland desktops. + + It displays a dynamically sized bar with user defined buttons. Buttons + consist of an image, which is displayed as the button icon on the bar, and + at least one shell command, which is executed when the user activates the + button. + + Buttons can be activated with pointer and touch events. + + A single LavaLauncher instance can provide multiple such bars, across + multiple outputs. + + The Wayland compositor must implement the Layer-Shell and XDG-Output for + LavaLauncher to work. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lscolors/cargo.lock.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/lscolors/cargo.lock.patch new file mode 100644 index 00000000000..2f233a0667b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lscolors/cargo.lock.patch @@ -0,0 +1,159 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..3528c6c +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,153 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "getrandom" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" ++ ++[[package]] ++name = "lscolors" ++version = "0.7.1" ++dependencies = [ ++ "ansi_term", ++ "tempfile", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "rand" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lscolors/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lscolors/default.nix new file mode 100644 index 00000000000..76e4792ab1c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lscolors/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "lscolors"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "0av3v31fvanvn59bdm9d0v9zh5lzrq0f4vqhg6xlvabkgsa8jk04"; + }; + + cargoPatches = [ + ./cargo.lock.patch + ]; + + cargoSha256 = "02k23idwy0sb4lnjrwnyah3qp22zj161ilbc13p75k0hdijfaxl5"; + + meta = with lib; { + description = "Rust library and tool to colorize paths using LS_COLORS"; + homepage = "https://github.com/sharkdp/lscolors"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/default.nix index cb8494e1c48..bacaf88e5cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch +{ buildPythonApplication, lib, fetchFromGitHub # build inputs , atk diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix index c302a4b4a07..1c87747eaca 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -6,7 +6,6 @@ , curl , doxygen , fetchFromGitHub -, fetchpatch , ffmpeg_3 , libmediainfo , libraw diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index ad001eb3045..ae82a324df5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4600"; + version = "4601"; src = fetchurl { url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh"; + sha256 = "TQ2Ee0sy9q4PUvY3TD6zaQ9oy1xgsw5OAw4RQ7ecCUM="; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mob/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mob/default.nix index 12843ffb98c..75013f0931f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/mpvc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mpvc/default.nix index 64b55cce7a0..69aca239d31 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mpvc/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index c4c54ba7c53..2dbcef8779f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8="; + sha256 = "sha256-krhFtFQZSwfKPHmVxPGNySPL2Y9+kA0fxjZ/D+mNks4="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix index b64654ad675..3f898a13247 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,27 +30,24 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.10.13"; + version = "0.11.0"; src = fetchurl { url = - "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "J4kaNtB6DVivNDhrGwrRZJBvu4Bpzl0jY1ZtlAtQiZE="; + "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/infra/libkookie/nixpkgs/pkgs/applications/misc/omegat.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/omegat.nix index 7b91d245f81..2bb3d14e1d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/omegat.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/onboard/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/onboard/default.nix index d52120e0fb7..745d03bb189 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -6,7 +6,6 @@ , atspiSupport ? true , bash , glib -, glibcLocales , dconf , gobject-introspection , gsettings-desktop-schemas @@ -130,8 +129,7 @@ python3.pkgs.buildPythonApplication rec { --replace "/etc" "$out/etc" substituteInPlace ./Onboard/LanguageSupport.py \ - --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \ - --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" substituteInPlace ./Onboard/Indicator.py \ --replace "/usr/bin/yelp" "${yelp}/bin/yelp" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/openjump/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/openjump/default.nix index 28becefa5b1..b3e93ce5127 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/openjump/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 84ba3ced8fc..ec78c43dbe0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook , webkitgtk, discount, json-glib }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 57ec820a090..bb365ecfefd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; + dontWrapQtApps = true; + meta = with lib; { description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/0001-fix-locale.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/0001-fix-locale.patch new file mode 100644 index 00000000000..2ae1a17ca8b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index d805aa0c0aa..320d771bc67 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/reddsaver/default.nix index fae4948d8ba..bdb589d8f95 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/reddsaver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/reddsaver/default.nix @@ -7,27 +7,27 @@ }: rustPlatform.buildRustPackage rec { - version = "0.2.3"; pname = "reddsaver"; + version = "0.3.1"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "sha256-K6SyfYx8VG0t6yogHwd80AxQuj3TXofHLEqZcDsRs1s="; + sha256 = "0kww3abgvxr7azr7yb8aiw28fz13qb4sn3x7nnz1ihmd4yczi9fg"; }; - cargoSha256 = "sha256-VDr7fcE13Wy7KoGG3U1GSbWqF5Oad4EobgzOL7dtJDo="; + cargoSha256 = "09xm22vgmd3dc0wr6n3jczxvhwpcsijwfbv50dz1lnsx57g8mgmd"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - # package does not contain tests as of v0.2.3 + # package does not contain tests as of v0.3.1 docCheck = false; meta = with lib; { - description = "CLI tool to download saved images from Reddit"; + description = "CLI tool to download saved media from Reddit"; homepage = "https://github.com/manojkarthick/reddsaver"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.manojkarthick ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix index 844fd19e22c..8c4fa2efb22 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 -, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols +{ mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 +, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2 , qtsvg, qttools, qtquick1, qtcharts , qmake }: @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "redis-desktop-manager"; version = "0.9.1"; @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats - qtquick1 qtquickcontrols qtsvg qttools qtcharts + qtquick1 qtquickcontrols2 qtsvg qttools qtcharts ]; dontUseQmakeConfigure = true; + dontWrapQtApps = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; @@ -76,7 +77,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; homepage = "https://redisdesktop.com/"; - license = licenses.lgpl21; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix index fa5ee0c753a..b8d25f0db1d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { kwindowsystem ]; + dontWrapQtApps = true; + meta = with lib; { description = "KDE Plasma 5 widget for controlling Redshift"; homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/robomongo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/robomongo/default.nix index e8bba1f7a34..af5285909c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/robomongo/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix index 4e69f9cce14..6115544e79f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null, plugins ? [] }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [] }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -7,16 +7,23 @@ symlinkJoin { rofi-unwrapped.out ] ++ (lib.forEach plugins (p: p.out)); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ gdk-pixbuf ]; + preferLocalBuild = true; passthru.unwrapped = rofi-unwrapped; + + dontWrapGApps = true; + postBuild = '' rm -rf $out/bin mkdir $out/bin ln -s ${rofi-unwrapped}/bin/* $out/bin - rm $out/bin/rofi + + gappsWrapperArgsHook makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \ + ''${gappsWrapperArgs[@]} \ --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ ${lib.optionalString (plugins != []) ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}''} \ ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/senv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/senv/default.nix new file mode 100644 index 00000000000..6df8dc781e7 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/sidequest/default.nix index 6dad2eaf812..c904c221260 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/sidequest/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix new file mode 100644 index 00000000000..1221db1ad96 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index 2b97d2f0188..62a6d4785f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/stork/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/stork/default.nix new file mode 100644 index 00000000000..16d56eeaa95 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/subsurface/default.nix index 51d015c6e41..19fdd4640e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite +, bluez }: let - version = "4.9.6"; + version = "4.9.10"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "1w1ak0fi6ljhg2jc4mjqyrbpax3iawrnsaqq6ls7qdzrhi37rggf"; + sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs"; fetchSubmodules = true; }); @@ -52,6 +53,8 @@ let buildInputs = [ qtbase qtlocation libXcomposite ]; + dontWrapQtApps = true; + pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' @@ -82,6 +85,7 @@ in stdenv.mkDerivation { libdc googlemaps curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit + bluez ]; nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; @@ -103,7 +107,7 @@ in stdenv.mkDerivation { ''; homepage = "https://subsurface-divelog.org"; license = licenses.gpl2; - maintainers = with maintainers; [ mguentner ]; + maintainers = with maintainers; [ mguentner adisbladis ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/swappy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/swappy/default.nix index bf1fdf63fed..69d7836e762 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/swappy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/swappy/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , meson , ninja , wayland @@ -6,27 +8,29 @@ , pango , gtk , pkg-config -, cmake , scdoc , libnotify -, gio-sharp , glib +, wrapGAppsHook +, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "swappy-${version}"; - version = "1.2.1"; + pname = "swappy"; + version = "1.3.1"; src = fetchFromGitHub { owner = "jtheoof"; - repo = "swappy"; + repo = pname; rev = "v${version}"; - sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; + sha256 = "12z643c7vzffhjsxaz1lak99i4nwm688pha0hh4pg69jf5wz5xx3"; }; - nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; - buildInputs = [ cairo pango gtk libnotify wayland glib ]; + buildInputs = [ + cairo pango gtk libnotify wayland glib hicolor-icon-theme + ]; strictDeps = true; @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jtheoof/swappy"; - description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; + description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index afbf5b364ed..0b97110b1dd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: +{ lib +, stdenv +, fetchurl +, fetchsvn +, makeWrapper +, makeDesktopItem +# sweethome3d 6.4.2 does not yet build with jdk 9 and later. +# this is fixed on trunk (7699?) but let's build with jdk8 until then. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, p7zip +, libXxf86vm +}: let @@ -27,23 +42,30 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - patchPhase = '' + postPatch = '' patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' + runHook preBuild + ant furniture textures help mkdir -p $out/share/{java,applications} mv "build/"*.jar $out/share/java/. ant + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. @@ -59,6 +81,8 @@ let --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" + + runHook postInstall ''; dontStrip = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix index 08bc5b90fd9..f5dbd0510a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, sweethome3dApp }: +{ lib +, stdenv +, fetchcvs +, makeWrapper +, makeDesktopItem +# sweethome3d 6.4.2 does not yet build with jdk 9 and later. +# this is fixed on trunk (7699?) but let's build with jdk8 until then. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, sweethome3dApp }: let @@ -23,15 +35,20 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ]; - patchPhase = '' + postPatch = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' - ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk}/lib + runHook preBuild + + ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib + + runHook postBuild ''; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tabula/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tabula/default.nix index 1804f3c04e8..b396c578c90 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tabula/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tabula/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix deleted file mode 100644 index 0235c8af7c5..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{stdenv, fetchurl, -zlib, libpng, libjpeg, perl, expat, qt3, -libX11, libXext, libSM, libICE, -}: - -stdenv.mkDerivation rec { - name = "taskjuggler-2.4.3"; - src = fetchurl { - url = "http://www.taskjuggler.org/download/${name}.tar.bz2"; - sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl"; - }; - - buildInputs = - [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ; - - patches = [ ./timezone-glibc.patch ]; - - preConfigure = '' - for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do - substituteInPlace $i --replace /bin/bash $(type -Pp bash) - done - for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do - substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl - done - - # Fix install - for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do - # Do not use variable substitution because there is some text after the last '@' - substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/' - done - - # Comment because the ical export need the KDE support. - for i in Examples/FirstProject/AccountingSoftware.tjp; do - substituteInPlace $i --replace "icalreport" "# icalreport" - done - - for i in TestSuite/testdir TestSuite/createrefs \ - TestSuite/Scheduler/Correct/Expression.sh; do - substituteInPlace $i --replace '/bin/rm' 'rm' - done - - # Some tests require writing at $HOME - HOME=$TMPDIR - ''; - - configureFlags = [ - "--without-arts" "--disable-docs" - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - "--with-qt-dir=${qt3}" - ]; - - preInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/ - ''; - - # kde_locale is not defined when installing without kde. - installFlags = [ "kde_locale=\${out}/share/locale" ]; - - meta = { - homepage = "http://www.taskjuggler.org"; - license = lib.licenses.gpl2; - description = "Project management tool"; - longDescription = '' - TaskJuggler is a modern and powerful, Open Source project management - tool. Its new approach to project planing and tracking is more - flexible and superior to the commonly used Gantt chart editing - tools. It has already been successfully used in many projects and - scales easily to projects with hundreds of resources and thousands of - tasks. - ''; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch deleted file mode 100644 index f599e8a1730..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee - -From: Chris Schlaeger -Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100) -Subject: Try to fix time zone check for glibc 2.11. -X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda - -Try to fix time zone check for glibc 2.11. - -Reported-by: Lee ---- - -diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp -index 5e2bf21..9b7fce2 100644 ---- a/taskjuggler/Utility.cpp -+++ b/taskjuggler/Utility.cpp -@@ -206,16 +206,28 @@ setTimezone(const char* tZone) - - /* To validate the tZone value we call tzset(). It will convert the zone - * into a three-letter acronym in case the tZone value is good. If not, it -- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back -- * to UTC. */ -+ * will -+ * - copy the wrong value to tzname[0] (glibc < 2.5) -+ * - or fall back to UTC (glibc >= 2.5 && < 2.11) -+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11). -+ */ - tzset(); -+ char* region = new(char[strlen(tZone) + 1]); -+ region[0] = 0; -+ if (strchr(tZone, '/')) -+ { -+ strcpy(region, tZone); -+ *strchr(region, '/') = 0; -+ } - if (timezone2tz(tZone) == 0 && -- (strcmp(tzname[0], tZone) == 0 || -+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 || - (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0))) - { - UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone); -+ delete region; - return false; - } -+ delete region; - - if (!LtHashTab) - return true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index 530d60c7631..9c1e778bdf3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.10"; + version = "0.10.4"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ="; + sha256 = "1rs6xpnmqzp45jkdzi8x06i8764gk7zl86sp6s0hiirbfqf7vwsy"; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w="; + cargoSha256 = "0xblxsp7jgqbb3kr5k7yy6ziz18a8wlkrhls0vz9ak2n0ngddg3r"; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix index b3f26c87c50..ee781c75e69 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix +++ b/infra/libkookie/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"; - - src = fetchFromGitHub { - owner = "GothenburgBitFactory"; - repo = "taskwarrior"; - rev = "v${version}"; - sha256 = "0jv5b56v75qhdqbrfsddfwizmbizcsv3mn8gp92nckwlx9hrk5id"; - fetchSubmodules = true; - }; + version = "2.5.3"; + + 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/infra/libkookie/nixpkgs/pkgs/applications/misc/ticker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ticker/default.nix new file mode 100644 index 00000000000..bc3e8dfd6de --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ticker"; + version = "3.1.8"; + + src = fetchFromGitHub { + owner = "achannarasappa"; + 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; + + meta = with lib; { + description = "Terminal stock ticker with live updates and position tracking"; + homepage = "https://github.com/achannarasappa/ticker"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix index d49c6221902..114b1464083 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.10.2"; + version = "0.13.1"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kX5Vp+yNlzBj1ewm7zNtpmbk5B2OQi0nrUNV7l6XUH0="; + sha256 = "sha256-PGJztoGVIjUwx4x42LdpxJQMZH60x6JWY+yTHQgjHWM="; }; - cargoSha256 = "sha256-X7ULfb2+9l8ik12SwWCTdUfki6xbk8pCnFaiEvCwYGw="; + cargoSha256 = "sha256-0NNdo28fLoqwKXBQ1fBTKPGE/zE7pnWnIjgCITsaGJc="; nativeBuildInputs = [ perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index cdcb54cbc6c..f7ca7259415 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -1,65 +1,51 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf -, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat -, udev, libpulseaudio, util-linux, makeWrapper }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.24.0"; + version = "0.2.4"; src = fetchurl { - url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; - sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s"; + url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; + sha256 = "1xrf2qjhq116z18qx7n1zd7mhvkb2dccaq7az4w6fs216l8q5zf2"; }; - desktopItem = makeDesktopItem { - name = "Todoist"; - exec = "todoist %U"; - icon = "todoist"; - comment = "Todoist for Linux"; - desktopName = "Todoist"; - categories = "Utility"; + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; }; - nativeBuildInputs = [ makeWrapper dpkg ]; - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - installPhase = let - libPath = lib.makeLibraryPath ([ - stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - nss nspr alsaLib libpulseaudio cups expat udev util-linux - ] ++ (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver - ])); - in '' - mkdir -p "$out/bin" - mv opt "$out/" - mv usr/share "$out/share" + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall - # Patch binary - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:\$ORIGIN" \ - $out/opt/Todoist/todoist + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/512x512 - # Hacky workaround for RPATH problems - makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]} + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons/hicolor/0x0/apps $out/share/icons/hicolor/512x512 + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; - # Desktop item - mkdir -p "$out/share" - rm -r "$out/share/applications" - cp -r "${desktopItem}/share/applications" "$out/share/applications" + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; meta = with lib; { - homepage = "https://github.com/KryDos/todoist-linux"; - description = "The Linux wrapper for Todoist web version"; + homepage = "https://todoist.com"; + description = "The official Todoist electron app"; platforms = [ "x86_64-linux" ]; - license = licenses.mit; - maintainers = with maintainers; [ i077 ]; + license = licenses.unfree; + maintainers = with maintainers; [ i077 kylesferrazza ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/translate-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/translate-shell/default.nix index 03ed031be85..319ba3643da 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/translate-shell/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix index 9b2fcf3d17a..9ea26b52bc3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile"; - makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "Klondike Solitaire in your ncurses terminal"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/udiskie/default.nix index 87c49a19a19..d780f9e35d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/udiskie/default.nix +++ b/infra/libkookie/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; { + 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; - homepage = "https://github.com/coldfix/udiskie"; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/upwork/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/upwork/default.nix index 36fd4047761..9b8821b5115 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript +{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.4.9.6"; + version = "5.5.0.1"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; - sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb"; + sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a"; }; dontWrapGApps = true; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mv usr $out mv opt $out sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { $out/bin/upwork \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath} + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/viking/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/viking/default.nix index 61ebfb0fcc6..71f67baa6c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/viking/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/waybar/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/waybar/default.nix index 0cbe325f62a..d730f966347 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix index 32c1f0eaa64..27694174d70 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/xfontsel/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xfontsel/default.nix index 10034fbe1b1..365f6217861 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xfontsel/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix index 68adc2abbf9..864ea27ede7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } : +{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }: stdenv.mkDerivation rec { version = "1.2.6.1"; @@ -13,26 +13,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; - cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] + cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ] ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; - postInstall = if stdenv.isDarwin then '' - mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" - cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" - mv $out/XyGrib/XyGrib.app $out/Applications - wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib" - '' else '' - wrapQtApp $out/XyGrib/XyGrib - mkdir -p $out/bin - ln -s $out/XyGrib/XyGrib $out/bin/xygrib - ''; + postInstall = + if stdenv.isDarwin then '' + mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" + cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" + mv $out/XyGrib/XyGrib.app $out/Applications + wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib" + '' else '' + wrapQtApp $out/XyGrib/XyGrib + mkdir -p $out/bin + ln -s $out/XyGrib/XyGrib $out/bin/xygrib + ''; meta = with lib; { homepage = "https://opengribs.org"; description = "Weather Forecast Visualization"; - longDescription = ''XyGrib is a leading opensource weather visualization package. - It interacts with OpenGribs's Grib server providing a choice - of global and large area atmospheric and wave models.''; + longDescription = '' + XyGrib is a leading opensource weather visualization package. + It interacts with OpenGribs's Grib server providing a choice + of global and large area atmospheric and wave models. + ''; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ j03 SuperSandro2000 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index 60e3bb9fd53..49f78729a31 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 3d762d9ab2a..4b9627a843b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -1,13 +1,15 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas +, texlive, pandoc, pandoc-citeproc +}: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.7.5"; + version = "1.8.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi"; + sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0"; }; appimageContents = appimageTools.extractType2 { inherit name src; @@ -20,11 +22,11 @@ in appimageTools.wrapType2 rec { ''; multiPkgs = null; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop - install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png + install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop + install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index a1ea1d64c63..8b5f4103086 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { --replace "/bin/sh" "${bash}/bin/sh" \ --replace "cat" "${coreutils}/bin/cat" \ --replace "chattr" "${e2fsprogs}/bin/chattr" \ - --replace "mv" "${coreutils}/bin/mv" \ + --replace "mv " "${coreutils}/bin/mv " \ --replace "pkill" "${procps}/bin/pkill" done @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { --replace "/bin/sh" "${bash}/bin/sh" \ --replace "/opt/" "$out/opt/" \ --replace "chattr" "${e2fsprogs}/bin/chattr" \ - --replace "mv" "${coreutils}/bin/mv" + --replace "mv " "${coreutils}/bin/mv " done substituteInPlace $out/lib/systemd/system/appgatedriver.service \ @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; - homepage = https://www.appgate.com/support/software-defined-perimeter-support; + homepage = "https://www.appgate.com/support/software-defined-perimeter-support"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ ymatsiuk ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix index a94386ea3f1..9e36f8670d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee-clef.nix @@ -1,4 +1,4 @@ -{ version ? "release", stdenv, lib, substituteAll, fetchFromGitHub, go-ethereum }: +{ version ? "release", stdenv, lib, fetchFromGitHub, go-ethereum }: stdenv.mkDerivation rec { pname = "bee-clef"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee.nix index 5ffff918750..b0d05d928c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/bee/bee.nix +++ b/infra/libkookie/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 @@ -9,16 +9,16 @@ let rev = "824636a2c2629c329ab10275cef6a0b7395343ad"; goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe... sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg"; - vendorSha256 = "0w1db7xpissdpf8i5bb96z92zbasj5x9kk3kcisxn0dwla6n55n3"; + vendorSha256 = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; }; release = rec { pname = "bee"; - version = "0.4.2"; + version = "0.5.0"; rev = "refs/tags/v${version}"; - sha256 = "1jg7aivsgdb9bm87dlmwpf1g6gla8j6v55xmzs8h5xmwqcybbmag"; - vendorSha256 = "0w1db7xpissdpf8i5bb96z92zbasj5x9kk3kcisxn0dwla6n55n3"; + sha256 = "sha256-3Oy9RhgMPRFjUs3Dj8XUhAqoxx5BTi32OiK4Y8YEG2Q="; + vendorSha256 = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; }; - "0.4.2" = release; + "0.5.0" = release; "0.4.1" = rec { pname = "bee"; version = "0.4.1"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix index e951f4c53c0..59612550ead 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "KAOIx401G/kB/TclhidOnUja1P+mLo/mUwAqGJfVfyg="; + sha256 = "sha256-q83fKs27vkrUs3+AoKZ2342llj6u3bvbLsdnT9DnVUs="; }; - vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY="; + vendorSha256 = "sha256-0blHwZwOcgC4LcmZSJPRvyQzArCsaMGgIw+cesO+qOo="; postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix index c24f91c4e10..5794bce31f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, buildGoModule }: +{ lib, fetchgit, buildGoModule, installShellFiles }: buildGoModule rec { pname = "bombadillo"; @@ -10,8 +10,16 @@ buildGoModule rec { sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"; }; + nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage bombadillo.1 + ''; + meta = with lib; { description = "Non-web client for the terminal, supporting Gopher, Gemini and more"; homepage = "https://bombadillo.colorfield.space/"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 6e772c7931d..fe996a01aa0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.19.88"; + version = "1.20.110"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "jySedvm9V3O4kri1PgoqC0OsC1gvB0Nwx8leoUZnHK0="; + sha256 = "0xmf74qh85f2jvi90q4cw2n7cvx5p46xmdr2iznfy09hdsymxfry"; }; dontConfigure = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix index be3d8295f99..daead82e485 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index d93fc5ceb40..6c77ed3d181 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py new file mode 100755 index 00000000000..bbadb3153ee --- /dev/null +++ b/infra/libkookie/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) + fixes = re.search(r'This update includes .+ security fixes\.', content).group(0) + fixes = html_tags.sub('', fixes) + zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content) + if zero_days: + fixes += " " + zero_days.group(0) + cve_list = re.findall(r'CVE-[^: ]+', content) + cve_string = ' '.join(cve_list) + print('chromium: TODO -> ' + version + '\n') + print(url + '\n') + print('\n'.join(textwrap.wrap(fixes, width=72)) + '\n') + print("CVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72))) + break # We only care about the most recent stable channel update diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 38d1d535076..5a67aed0896 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,26 +1,26 @@ { "stable": { - "version": "88.0.4324.150", - "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", - "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", + "version": "89.0.4389.72", + "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll", + "sha256bin64": "1h2dxgr660xy1rv52ck8ps6av0l5jdhj2k29lvs190ccpxaycglb", "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.47", - "sha256": "022fq3mbd3j9a7lf02936ks0yvf73bwz1ws6m6zmnn9v8waardj2", - "sha256bin64": "09gjbg8678xfh22r3gzjvrkhgda77pr8an4j5ka5672jvhj4hbq9", + "version": "89.0.4389.72", + "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll", + "sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby", "deps": { "gn": { "version": "2021-01-07", @@ -31,22 +31,22 @@ } }, "dev": { - "version": "90.0.4412.3", - "sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442", - "sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz", + "version": "90.0.4430.11", + "sha256": "0rzg1yji1rxddxcy03lwqv9rdqnk3c25v2g57mq9n37c6jqisyq4", + "sha256bin64": "015a1agwwf5g7x70rzfb129h6r7hfd86593853nqgy1m9yprxqab", "deps": { "gn": { - "version": "2021-01-25", + "version": "2021-02-09", "url": "https://gn.googlesource.com/gn", - "rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6", - "sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc" + "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", + "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" } } }, "ungoogled-chromium": { - "version": "88.0.4324.150", - "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", - "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", + "version": "88.0.4324.182", + "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", + "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", "deps": { "gn": { "version": "2020-11-05", @@ -55,8 +55,8 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "88.0.4324.150-1", - "sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y" + "rev": "88.0.4324.182-1", + "sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay" } } } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index 12adbc0a9b7..e5282d79a28 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.13.5"; + version = "0.14.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "067l9m47j40039q8mvvnxd1amwrac3x6vv0c0svimfpvj4ammgkg"; + sha256 = "sha256-LxJJ0yBlw9hJ/agyL9dbVe4STKdXE8rtk1mMFqe1fFI="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6b8a3b1c338..f1b1b26ae3a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 4d72f210619..07a2caca85d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "85.0.2"; + version = "86.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ach/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ach/firefox-86.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "24a938fb96347b938db028452e5a1b9f6c63c43f1e9b7ff0bf2a43f92d1df45c"; + sha256 = "96cf6afb631f36dd18f0d109bfc31abbff5960e7972b59e4fa51ac0c2c81f9ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/af/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/af/firefox-86.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5799e2c1c5408da29f9922cd1a694a0ef7d4250b504dd827d5cdeeb41bc7de6e"; + sha256 = "38d4588b8498917717ea58419a35751c6c3ae987372ee6a37590a7630eb68c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/an/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/an/firefox-86.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "04ee06350b7cc1f1ab808e8cff3d02060effbb9fa656c2f687b7cbe9d18b9c2b"; + sha256 = "942c9cf4dc6f5baa6c5225a15a2856bd72c7366bcb6224b8ba5a1428cfd974f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ar/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ar/firefox-86.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a92dbd6c4253a8ded0cf4681a6c165e6809e495d1aba84d2158b80d571c1c660"; + sha256 = "a616e3dfac2bcae832bc6538692a9d811604aadb71079641f77f9b3db105fabd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ast/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ast/firefox-86.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "eeee2c9a00ab94630f331d7f1e781ba5085415d816d403e14f356717cf5fa967"; + sha256 = "0e026de4affddbdf9e5915818c02acb018b214cd005c5122593e86e821919016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/az/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/az/firefox-86.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "107fab10c5ac5947676509fce31dec23e70b4cc2f1467e914157fab0555dbada"; + sha256 = "761e129a070f017b28ce51c1f96fa95be8d98e687b44e9e97d95d18db85ad9aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/be/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/be/firefox-86.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a04273533574232e0b2c370e2d48ab2206b53b45743543fe0efeea8bd51988cc"; + sha256 = "9e80115c8a78ab5ff3eec38e31c1ec29decba3660ebc95cb909aedf3db4390ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bg/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bg/firefox-86.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0b18c8862ce9c26cb63919c3bd3aa911b6179eebcbc9a38001953b49dd09ad36"; + sha256 = "b5149b21a8ae9b08ee3abfa2fdb894582e620464af36037c43c2cd0b6667c174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bn/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bn/firefox-86.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8aa13bccd6fcd9f9c91a18dae807394dc46ea32103608c829d4dd073861b95f3"; + sha256 = "0b5ed8e2859e54ce7d64ac8b0626c69229209cfadf14e8d55225272f702a6f8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/br/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/br/firefox-86.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "121f9474e56deb5f2a606aa153c8f3c6b857f0966c9843257d22a8be01b609a6"; + sha256 = "7fb1cdb85510bb8e41f2ce5e856a0ef93c83c430bbe64079a2e3c362bd557ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bs/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bs/firefox-86.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c4781d938cd86988edc31674a46acb0120209b101d9b563c20ec6a213d161a03"; + sha256 = "2259ddd7f35d5a8d8830a429f0dec92da5ee101d5c42ff5d9f8ff003f76e5b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca-valencia/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca-valencia/firefox-86.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f0b0e35ae0ba98d0585c45a660c85345b71f834e61875f923713f0c05a78509d"; + sha256 = "5214a48525eabc0ae4cda08e70ceba59b0e9fd51976d578f512b02fefbf48b8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca/firefox-86.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1208d84a85694ce1327c9a8ab6cdb6aeb45b990704bbb9fef9b1edd664597fbb"; + sha256 = "250f4bf5659a04dfb20a651899a92bccd9d24c2e9d3186bb17acc4f452b0b648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cak/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cak/firefox-86.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ddbc3a5d3283994b7408fd8970023b71178c83db12ba8be54553395791bc9ace"; + sha256 = "959c3cf7aace0b80adc6ae2bedc578b74de66adf261de7b67654e0c57e6ee2f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cs/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cs/firefox-86.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c02faaf56a820c45bb38119c03becc53cd2ae25e93bed3ad93cc88f091b00a2d"; + sha256 = "aaed7891e891ba8926ed5904a798e6201cbc355ba11c341546f779e0f2815abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cy/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cy/firefox-86.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1d206ea516202af87511d13cbd8482b9dcbeca2447ac8b684937668afac68439"; + sha256 = "064c2419e8fd43e350e055d7bcd4ae1689c4f7667b51996be9037bc4d1c529a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/da/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/da/firefox-86.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "68976d8cd0ce910c6b8155a68a955f4dfd182fe7625ea3386f083fff27f216a9"; + sha256 = "484f1bdd24689a7a7dd7a8b4556b2f32aeb50509aa3f9d645e151dbfaab9e71b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/de/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/de/firefox-86.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6510c8105420027f1632da15060d332f9ec93353c03111a592477bf45dae5925"; + sha256 = "12670011be25e5420a5721e23d1e37592e4d1ca9a2efac85db02545398454e65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/dsb/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/dsb/firefox-86.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "736a478e15f11126ad5dbdca66cd8938d72602041ff0c1f5f78101d4f62b1aa3"; + sha256 = "2851664d7d9dd90f8e444e13b5c9f20bd6271b6e77ae857db1e3aa55429b8b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/el/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/el/firefox-86.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d0c2f1c156d239c2c410d15216a8d331cde8cdb7d54bdf40aa6519f582b93bbf"; + sha256 = "ec24c6634f20da95f820623c32d92f492f2b939280a49e327a1f465b0046632f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-CA/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-CA/firefox-86.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "0b68ac180a828a94743349cb53f64224d0013de610a5c9cffed9a9242caadab1"; + sha256 = "6c5a19ac4ac5f174569483ee5c1f053e692efc189edfca7e78f9428f05454338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-GB/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-GB/firefox-86.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "978397ce347115b87ac24c174ac4363bd345ef8471d25bfc4a639722ed7098e1"; + sha256 = "919d6e6c731d53ade97bbb330cd2e425f70565c330233a86ffe9295ff3692001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-US/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-US/firefox-86.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "98763f4b1526811967d71e1bbb9552a9a3fd877321ecb497083b9e313b528c31"; + sha256 = "c643dd519fe8b0b6d2d2241b5c241aa1b43ece397f49268865b4d1888c19173e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eo/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eo/firefox-86.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a44c9b60e0e8342dcff31ab0bc2776680b9a94bea51ef237fc4b1f013fea6ab6"; + sha256 = "d20b007ba86bdfdd7aa4bdaae08b283107a4464d88a4a9fc34bd4c95781f48d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-AR/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-AR/firefox-86.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3229e32a2db2f5a7638a734c538fbaf1b83f9dd203bb67008460783239da04c8"; + sha256 = "3d4ed05801d31a92c072384e660d7b874be835edd3b6b37741b71bec32a0fa6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-CL/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-CL/firefox-86.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "574c90358de584b2bf4ec874a8f5a22fd777ceeca92c2894fe978a793faea7c2"; + sha256 = "8ec51d79baefe2808024c33105fd4c1a8e4f5061b72530a4c01bc8a23d6b6cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-ES/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-ES/firefox-86.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1e92995900cfdbb94d673d5efb02e84321dc8917edab1ce6c86b98f860f483a8"; + sha256 = "38781952508f86d9b4aa7a0c4fae927494e207970e54ba1070943008283c2e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-MX/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-MX/firefox-86.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "56de604e9b32c7552825d87c0c2802bff66d72faad5d173fc71388118a47c046"; + sha256 = "29817ccf3aad1e38f195f18ab628bca8f9bc4dcd931919cdd9d5d22c6461ce87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/et/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/et/firefox-86.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "53297a8e1f8c5d3ac05d44c3aac1f886d7065cec6666548c3a571ec06702eb63"; + sha256 = "d4ddde9103e9355a91186e0343315f99bf0eb53b2502abb80b8fcb1056ea82e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eu/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eu/firefox-86.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3b392831ee487279ffbc2156421243990a2abe94cdcf233c375f7949c28571a1"; + sha256 = "85744b3d7e3bcd5de92ca4ec5a0ade8421689dda5a3c53e361656f3de3178a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fa/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fa/firefox-86.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bdaf06e327bc17ff05d82e27d85d4ff747b8af58e8a0b95599d4af0068c6948c"; + sha256 = "60e6ebb40f1e11a61ad63d2543acd7d83cef58c0fd4dc22f1c553749a36e3fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ff/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ff/firefox-86.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "8e029e2f755f107bbdaf4833332f94b062284529230ef148ec404d9954da5b83"; + sha256 = "878d7155fe73ff6585e8566399416361a39080cb54afd61448e1bd0e191046a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fi/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fi/firefox-86.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b1cf30bbd4046c3f6b200b876bfa022b34771d1aebb48a56b35817d5d0f46d18"; + sha256 = "d02f24944f5bbd57273e05aa4fe701b375ad8d8905d0070ec9396a55d104203d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fr/firefox-86.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "95f5265e9e7be13a8d50ff4e0c45f1247531fc78076081cf7045ffcf5e366846"; + sha256 = "ac6497f8a4bfa4e37798840bf4dc9b84463bf095074d2ba3c931e89a402a3fc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fy-NL/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fy-NL/firefox-86.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f22756db0256f2d7b3ccb15c15f1006834e8a53251ba8a315f0d72365d7140e3"; + sha256 = "456ff8a1bed8769cd9fc05b29ed23edd29c48514dda4e73ac8e8663593cc3b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ga-IE/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ga-IE/firefox-86.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7c67dc57553eca0c59293cff6f3097e56719d3c6b67d6599ea56ef799992e566"; + sha256 = "b0778c1217f9ee6e631c62ef024991212cb679a43394e07401a5f61ca2b88459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gd/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gd/firefox-86.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a1a4ceefc1f83454280e70316fcc9d0c2bb635a77596bafeed2f06d3cb133340"; + sha256 = "37eba79d0db2bf84faa2d89efa0c5b9b34f7fc732636f4b436a3e118792ba610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gl/firefox-86.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "02afd3809826d41a75f6554cc7f49eb65725df2721f16484907eb0ad3cb172c4"; + sha256 = "ef06e70653f712c4ab594a00c4d571ba098db740ff508cf78e08e859123096dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gn/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gn/firefox-86.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "dc4de709435a0015d3c4fcb615cf8ed96814b2f6038c37ee5045e632891f8719"; + sha256 = "c7bbe33c8f839b24ee6928d74d5b0cff18918ab5f2a55e4b3bc1319049b19e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gu-IN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gu-IN/firefox-86.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f9a66be242916abf1576397204c8fd0c88574fcc68fb06480d82a6d7008f1f67"; + sha256 = "71ceee81509cb6d505b836dd494eb9dba73857aa2c976ec1aab2fa57a50f1519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/he/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/he/firefox-86.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8739ec72ada89c64be8ebf692734a80f7a825c7201b4f7d43c3b0b8e18f8edba"; + sha256 = "cca354d947d83c616035fdd64019b50d1bb86c3d01e05090eae2d07953ae566b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hi-IN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hi-IN/firefox-86.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "db9f6f97951291d86f8406d919377ef1121195665734edcb4ae731ebb15efa12"; + sha256 = "a151d3a3d85f0cf96837f51b2a0df9a0a9652148dbcb53733025e15686451669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hr/firefox-86.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b8fe4cf3e7c9d30c377504d58ae11c612cf74f0a02c3b25d4efe3ed6ee7365f6"; + sha256 = "00e3301bef430e243c6516d5c94e0b5fe6e27ca58fd0192955423956395fb2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hsb/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hsb/firefox-86.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "73207d15a6146e4bfe5b2324421993382a41f8648c0fe5e4f2ef72ed5182fc74"; + sha256 = "34c2666668499c8034e732565b244fc5b0cc7b0f544296be1e86942aa62b9167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hu/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hu/firefox-86.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d57ac494fa650d1f0d46f9109952c1493ed476dcf26fbe843c3e9c5a722eac3a"; + sha256 = "d33f5467d9be5a2c6317a10fbd5285c4db7ed4191ceddc317d4ec923bd6ef7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hy-AM/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hy-AM/firefox-86.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "58ea459134ccddc63156161300f075cb747125a16aeeb8f616662783b2a8be73"; + sha256 = "a008343614e5fa43d8ce90ac5f2afc0bec98419d28efc191b836ce835b6f48a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ia/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ia/firefox-86.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d0e4ab532d39eb094de62ae41fb40055e8dc20f2b69856f0ff28633f3c2a5139"; + sha256 = "9140874f06ed6e135ae70fa40600b4e1e570b6dc6901191658870916f73d1c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/id/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/id/firefox-86.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f60c707585e197263fd64a85a120cd4c52da17194d54a2fc538bdface62b1c08"; + sha256 = "c1dea9043a7f06708498acfda90a7b166b1f7bf839bf86dc2fbb90cf7a00269f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/is/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/is/firefox-86.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f0d2a9052ebefee0f7774e47fe13de41ba8c2b7cba5ca784d6d218fbb2549a75"; + sha256 = "50a804f9b7dd594b8c449ce6dd137b5f2bce41ab29baa35f6a14977a5c7af486"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/it/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/it/firefox-86.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4946d59a1b5fe36ddeacb371efe2072f66623d82eb4f26cf0fe6b96e8dd54203"; + sha256 = "3ea5e01722a7a03a5dc498977410fd2cde90352b026489669bcb7ebaa571ffdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ja/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ja/firefox-86.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2a9f7705b5ef1258f925a6e48ccd99243003cb429bef9bba4ad56dfbd294ce11"; + sha256 = "efac929a1ace0484b5bce056bbd3d3ff4f26f897d4b1739f128d1dfd91c3c375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ka/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ka/firefox-86.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "443b974d1631602734402a2a6dedaec8a7cc017e1abbb768ceb5e767978c36af"; + sha256 = "95261b88327b5b20739d8adb2a99bb0de5d1311099e2d3fc0999405fbc918ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kab/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kab/firefox-86.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8f8283696206450cf21a4c88384ca915030a1dd7df9e93911b620dc9375e5db6"; + sha256 = "f7b4f440f27ab9141b24f2673e4b850193744d1fc03451c2134a6890b4884f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kk/firefox-86.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c9d78fdd7ac9d79dbb713a7130baceb4f19aca6bf8e7218950190ff95d921b6d"; + sha256 = "652aeb8d66ffb884983a043ff1d2ba10ff3a03aafe8cd55217a8f6a8068a3e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/km/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/km/firefox-86.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1fb2612268f53fe300955daadae60be238070dae35555707027a8a62ce4ec3f7"; + sha256 = "39deb82ca935780959e4a0f71d85cee3b90c6228237a508b239ad2a1f5a35a07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kn/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kn/firefox-86.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "86208426d917883c2eb6ea9248feead33d4115093bddf5f1c690ed176adb9c84"; + sha256 = "886370871c27c6637a74e4d8ced9ef2a9ec5062a8aae45fad5fea1dc358e38f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ko/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ko/firefox-86.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "b8057874e199124ebf283ab67e184dd2fed016b1bcb31a2f220e2e5d38d4f438"; + sha256 = "9acea882760a961e228344c2cac9dfdb8d40c6c4c874744a4f2fffc356f6499c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lij/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lij/firefox-86.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2e5bdea7a0f68efb0e6bdbe64a1df287644e14ce5fbb896040f3315c6412fc43"; + sha256 = "fd76e82cda32813d43d80ae4acaed5610882162d68e98b4ae47dd1ddc8487d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lt/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lt/firefox-86.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e1f79eba23036cdee87b9a5a2f48284bc006a191644d26e50a7ec61cb26d26c4"; + sha256 = "afcc203f0d080560364277e7cca0f4080c74011dfc0fe07c751124e341e5b729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lv/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lv/firefox-86.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4d8f26a3b6211799a87dbbab6692f4a00c81b1d70c6af990a684b1b65c255482"; + sha256 = "1b8a5cc4941d669f12593dc078d6658751609bd094a3704e9a9949341413ba9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mk/firefox-86.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3e5741eee9b27aa91827ef19e9b2b0200719120d07dccd37f5752ba1b746e29b"; + sha256 = "72d374b828e3316f119d592bde6ebfe91ac4907d63cde43f6391d4be81119bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mr/firefox-86.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "247a11da64a28084d68d450cfa92ba66868891796d60a09ff9bf28d2af347a05"; + sha256 = "17a2dec82a1d89fe74e71f924a21bb175cdb89d801ba50e5f0f0b4625fdabc1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ms/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ms/firefox-86.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "79e1823ce9d454d70660464776f1d492f67c3489f7e9ed20fef5a7331def0cf2"; + sha256 = "9af2d0b5f81d573c8fed4ff54446b2f3a77080ccec5138b1d0e707fb1c37e164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/my/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/my/firefox-86.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ebe50de263127be29aecc611c2e4b5c60068245fe64ee0a72beb2680253f85dc"; + sha256 = "3a2815eed7a1288991c769045614cc50ec3fed2810ff143652092cd32aef5e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nb-NO/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nb-NO/firefox-86.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7e5f1266acf220fa8db165c3cc3ed2bf287ca809e3dce9b74e6284a8a3bd9e63"; + sha256 = "a8255d1dffb5dcba012a15d5b0f62b9e6e4e60720ae6dc139c23f77aaf6ea99e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ne-NP/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ne-NP/firefox-86.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0b7fecf7497937709d83e002951ec4425b080fe4a6f6cc967a3eab65db93a212"; + sha256 = "e1c563748ae230a44939d27d7fa246e63ad49d242df236082af2eb0c38af8046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nl/firefox-86.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7125adcabd21b4edb2828b295713b3a35cd174abea748d5d4f8456c3e18e5707"; + sha256 = "56ab4fedc5c3a71b91693d33eb70f79ba3f0095dda66eae44e3e15f885491d5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nn-NO/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nn-NO/firefox-86.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "560d195e6b472228403b2fd5651c7a61e84491e788faafb77af511e3c74e7fb5"; + sha256 = "216e2d4434c66fd4361114467ed5e4635342ed53b74eae287d1d69ba63ac85d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/oc/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/oc/firefox-86.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ae15b401c284e5e68819e68b0e9e76ca909ff167f2d15b3d77b546708a7e7369"; + sha256 = "0f6822824131d1709c09de64643a9f6e3b03e30741d079f66229efdfb5096e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pa-IN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pa-IN/firefox-86.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "32d9ef570e718ef79b004fcbb9a7e212d06e8171c0056f90709423495c3c7bdd"; + sha256 = "9a15f3ea177314500e72ef123ed9dc36bfb9e10b92e5ab20cdaa6e7e1fa3367f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pl/firefox-86.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2201fb7b8edb8ce2b3446a4accf3f0ace2b1a18a7690a20b6e64ecb5ee1a61e2"; + sha256 = "18d19ed1597d3862d08d6daf52dd1bfb8f21c005f7cc44ce4d2e8177b4509aee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-BR/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-BR/firefox-86.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f80d4d45078bb3884d8302913ac738f33cd984709e95e279d341284b9c29749c"; + sha256 = "287c3c117532b23e45d726d4541ee726056139e976bf43210f35b529834c3884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-PT/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-PT/firefox-86.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "aba0a4166f0b815e1bc96c4faca818e82adc4b4d1bb8d26cd1f086de681eb56b"; + sha256 = "26915b7725a325db052cbc165454c34f19e7a1346aa400b1306234707bccdf9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/rm/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/rm/firefox-86.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "450640a39b0773a255c97d884d51f7dd0de04da523e28dcfb9680e750b68e965"; + sha256 = "4d5c14e2607efc653f5cae75290332229286b5ee606da635871dc04e20495fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ro/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ro/firefox-86.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "eb20d1a28f510ca98baf24c10feb186d21900690d9f0c8be5c180b72c9d3408d"; + sha256 = "a41bab63866e22712861a825aae272e3468470783f92c23117e1c116b9d66771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ru/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ru/firefox-86.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7b0c8c5b5cdbb66b36366289f7b65263abb19c174ac89cbb2970a5742eec2d66"; + sha256 = "edec67a8079f55c5f22b6928bf1d55a2e1d31aff931c9e41e503ff1b7acf2ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/si/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/si/firefox-86.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1f2e5c35d9766cb46c9c5ce5ff0f6c95ca12d0c14d12cc29d098562b8f35e9b1"; + sha256 = "0357b913e6528214f30ff5ffd4a0f1c0e26bf079d3afdc166a82ee24e8c099ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sk/firefox-86.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "528d3270d9bd722545fb57ab09059e0f43c0f605e479c0869cbe0757d1f38d8e"; + sha256 = "5a38f953d93cf4cb8b4e2dbb0206fc0a9fa3262c55d91fa4cfc3a8605098403e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sl/firefox-86.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d4948a03a97424c7b499e339a509b2ebba9b716c84e4713b140576bd787178ca"; + sha256 = "0c2c41f6d7c3f72e56cb84c921207a606f959993ec6a3cc5619bbb894ce6ef8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/son/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/son/firefox-86.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "34a841faec9720c9ec32d6e00ca775d266f47ca3b660876cbd4a1d7c9d7b87af"; + sha256 = "cfdedeaacf244b3bc63343f76ed817a165a15b2a727f04327581cd373e76ac86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sq/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sq/firefox-86.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "aa5688e676bbb8ae87f089d78d4d6cb2a9c3393bf252a7c277ab6a8c97a80951"; + sha256 = "daac917a1e105b7871a0361db364558251b931898e08c36515c64269c760d6b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sr/firefox-86.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "882263a340ef6b11b35e91262620218078c87b193f3d0ca8eb3a9365dfb98d60"; + sha256 = "c1993cabde0e7df92e45101bd62cd14a86d023763c48c18a7e00018dcfea282f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sv-SE/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sv-SE/firefox-86.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5b8baf5ee22e5da51040afb4cbdb4a6f165aecb117d181561c97903a0e63b74d"; + sha256 = "eb04be61ab3d029437f57dedbf1b66d0bfc6c0a9b29e41fe4fb7aec7b5ab47b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ta/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ta/firefox-86.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "14a00497f7a4f27680e95126b4584a13d3376b8d4f39fe0a0de9a7356bd8dca2"; + sha256 = "fbd105183afb74dc7887dfe5cc0e518e96cb8bf79c53fc502d154bbaededacd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/te/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/te/firefox-86.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0de38fdd91056121d68734c76b799534921e8adf37566465a72b4fce9d5af693"; + sha256 = "e049b79ce8a81749caa83d6b42ae710414fe08ae2f28a2c1af7c7d47f83b24e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/th/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/th/firefox-86.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "80aff43b79ab4343d6b9bb2a5eebada3ef376313fe47cb2d1d7ad51f2f2a57ad"; + sha256 = "2b3ca062e1e53d5fca726e5c5a9eb7a3a639e4f6e7f5b455bf33e305eda475cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tl/firefox-86.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "acdcbb66a68421030634bf1ea1c265ff38e84dbe010aa41058da64ce966d1e57"; + sha256 = "0fce4ea1fc379ab87c0f565c12f8ee16205108048d7fe89d7850802653247c16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tr/firefox-86.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a3365e32fb78743ae45f89ae1740a7c51cd11e927454cc836bac4e9f62cd9abe"; + sha256 = "e0a1c0a5d31225fb6af2b5b2c4d7386dc10d9c5c56081c1282615cc8d5da51ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/trs/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/trs/firefox-86.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a9da73cdade15ce508678c8347c6bf03c2d93578cfd095e0c586682efba7f2fd"; + sha256 = "129d9b5d54cc807664a27fba1fd4f003430bdccf0385cbb53ea77517ce30879f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uk/firefox-86.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "05ebea023813ea0755e105f6f1451ee0d85bba5e52660230f25487bb9d997bd0"; + sha256 = "d50f3c3f21af6c805bc8c86f886af9f1be2b2d5cb5ad061a000633fa9b7e2641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ur/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ur/firefox-86.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ee4cda80858fc6ab33996a546be8de565a5d4d969ce26d0d1aa70ba7a923e496"; + sha256 = "ac9240e7896f695f48526ad275d887ddef7eb98aa3dd94800a1b4da081110876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uz/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uz/firefox-86.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7be525a02c9bbd4beee8678eb8488f50337aaf16883ebd41f5b2f67586b4e57d"; + sha256 = "94bd2d3f2f95e32381f6b945f4b1149f355dffcc27ec829fd0849ec4895a6da7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/vi/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/vi/firefox-86.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cc6a9d73810294f3261aaf26d4678c4a49b88375f48321384443f027a5a0b5ba"; + sha256 = "e7c8034074e6d1f8f6987321e24dffdbe8acfa11d6784b8c8d033e690a5ed145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/xh/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/xh/firefox-86.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5eee0a8b232448992ab37546d698d4f212df53c562f29261023e64cf5762138c"; + sha256 = "b8f0f3ee8aeeec6fdac5ee15cf688735809994c71cbe4f01b238a3cc1386006a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-CN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-CN/firefox-86.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "94ac5a87b53fc8aa6769a4f6faf56d0089965514d8e811ca94ce2cd996e536e2"; + sha256 = "47b4f3411306839882f5755b3eb2038f9c7bfd1c2ae72927db54c4816c97217d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-TW/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-TW/firefox-86.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "025c04100a427e231db031aa43694a51191ded2c31f22913bcd694c734bd516d"; + sha256 = "5fb11410c30a813fd0db58c928fb07c488405776308eacf64b238daa0fbffbc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ach/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ach/firefox-86.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9f770cc6655b31ee907f949e0ba2f197d0d6fb3ae33ec1fcab311ffb7b109fb2"; + sha256 = "06d2dbe0f799d22e98b715528b54566b167a22db4d16d3ad60d84a6e6a8b9e5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/af/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/af/firefox-86.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7ecd58201a5f3eb6fce474bdcbb0f672c8f492f30de3ec4f8f3cc48c2c967313"; + sha256 = "536fdd221aa5f872cc8028f39fcfa7b9eecfe09a215da3d50fbfa9e256a1394d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/an/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/an/firefox-86.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "362d8bf290f67ea40c93fa058813c073a51911940b916595c0a8f1599ef46713"; + sha256 = "ba6eff6a355361862fc78879264965f5f1c0adebefe934d1b6d51994023d3bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ar/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ar/firefox-86.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6b66c3f25eeea055e42a74ce6c327f09e8fe4f18acb1f947deee351d2cdda1da"; + sha256 = "0b465097dcfd4f2a50eba984b0bb30fedceb1a409e2a98f22c45709cdd1117ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ast/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ast/firefox-86.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0efef2406fe4d8093a1ce6bb56d1a54eaef5bb429b6fa560fff7373a7435cb3d"; + sha256 = "614241f31f38a71782faf76f0a31cd81d2520523ff85d8a5dfee32a77e48829b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/az/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/az/firefox-86.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "bb0dc33a53a2f871b9743f17a36f50fabed87c137521404675e69df69f121350"; + sha256 = "4fd682f83c0eee3031c6e452d1c7cde3e54d0e52bb8316b0e2224360665d4fc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/be/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/be/firefox-86.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7459818c037c45ff2969998b8d3f481eb8384802e5444e2f3c58340f316aec14"; + sha256 = "c15417c21f42212337bd921c869b05124a720c6d8730e4a16d30ddd9c10aca97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bg/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bg/firefox-86.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "55f10b4a5cc1d06dcb81aca68c59a0aa64d7934e01c3f5f3dbcc27dd7497e3a5"; + sha256 = "fda51760d2dfa07d559673605120a34706f8a6546dc4e673dab55b71cbc501ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bn/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bn/firefox-86.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "6491efbf19bdf11b877d04dc22707864c07e9b52452408cf386bcb7bda3cf840"; + sha256 = "f61419c6dd7b20cbdc48cb0faf51cc831fa90f37a721a162bf32753d85a40aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/br/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/br/firefox-86.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4ae74e5843edbb01d35b7564b1e998f58fc1c50d849fca9a9e97e540abe6f140"; + sha256 = "7d60c5f6be2270e9b40612dfb1072ab5d29bd02d070f463f1df915f8d13873d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bs/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bs/firefox-86.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "c796121189e7bcf5ec5a90218db35fb34393d4e70ab7100567b3f7aa43daaea4"; + sha256 = "4707568c61df2d2050e3f1c18d3a2dee1c5bcfd091f32bd615f2e75ed06949fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca-valencia/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca-valencia/firefox-86.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a2097281cb1d5191992399686c26754a57d0a3bf241961374e335c225c4f7324"; + sha256 = "fe52cf8f5f531143ef28e728753610b442443de53f34a4a8d6318d5124a10caf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca/firefox-86.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "4135f8421b6594a468dad1057d2684cc8c5e3fee1b095653d42c86c6b4b62ab2"; + sha256 = "8e6baa8ac94878448f65598042d47b9789352fba55d4e4f91cbe319f9676780e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cak/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cak/firefox-86.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "93799eaee71f6e1914c9161d075163bbc7c42d85b196301eb6891bb7c3debba6"; + sha256 = "006a887bfaea07c40ee0f67ebccb1aa538f56e28f625cf2b085242c26ebe7bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cs/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cs/firefox-86.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "25678ecf83437174adca71c682ff36145b0f68e45cdaec515fda671907c21133"; + sha256 = "27f1c5634e101d3681885a8d2d572b73f8c9db2215e4836a6cd71fbcd0a5b8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cy/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cy/firefox-86.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "85b571e0fe4f0bdedb8b433f8363a7649a1c5fdfeba40b35f069ef1518a28600"; + sha256 = "9e56e8f88baae2a4c99ae12041ed9c766dedc99b7ffd75bffbba92a7c19d98b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/da/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/da/firefox-86.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d998daa0d89d7d4a632c576f9d81d5fe7af3c0e54332968d593d88e5f81fa246"; + sha256 = "eb317f12d74ac8b636c87dfe9c1cb0ce267a15ffeedb79956e1c15e971d1b7e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/de/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/de/firefox-86.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a84adef78975397d45941ced4b17abfacc2a26a0b758336c99eb174b33f51c89"; + sha256 = "8a736a3a9c257f2b4509e3ec2f74259f655369159981cfedf8468de9cb1fb22a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/dsb/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/dsb/firefox-86.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6647771748299fe56d9f023e612de6c3dfcd1b711cdcde74ea39bafb957deb5c"; + sha256 = "a8fbd4dd6d1172f67744e9283efb6cb644421cb07e3568cae0d3c68c479d653b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/el/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/el/firefox-86.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "73a7a168b65362901a4b198200e2a5167244e886131203543bcf83f2998261cc"; + sha256 = "59baec30ea1d8e30982f52279003b6e1be0148c02f38fdf283325c53ad900ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-CA/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-CA/firefox-86.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d47e5707ab2ea2e369adffaaa49c52f461d3c01b6b28b31b0876bc5284d2de66"; + sha256 = "a4e0ea60acf339a61c19272170d2efdb4f519325bf2f71bcbf82af70ca304af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-GB/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-GB/firefox-86.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6a50517b8ecd2fdbb897dca8de5a948214180fcb25ba3654faee7bb563d049d9"; + sha256 = "6c82da02a7560977faad1ca3d4c3973d08583fc0ce75e1de6e5aee2c9d372b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-US/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-US/firefox-86.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "83ace0384a14e383e65716ef9305d72e39832b855ebecf2035e6267b4c9a97a5"; + sha256 = "eeec3b446c30c65d4af72d04d58c6d5ddb04c13e871a5351921a737f7e1cf234"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eo/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eo/firefox-86.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "2e8b25943115edae1dda4265aa3fd1edd8683318e47aa3b11f9e2f3d6f89a372"; + sha256 = "4cbb1144cadfd901082829f8e67e311c51df96ecd08aa2082772421d6445f2fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-AR/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-AR/firefox-86.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "559b0de8d0d846f58e15675e31e0db57ba00ad2b98d3a042c1d6d25a9727e1a0"; + sha256 = "c875473caefc7e18a4f7a0a3e7d44ce659a2271fc1b21d435a70c921092b8af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-CL/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-CL/firefox-86.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "3297f38424fc6cdf2ddefa72732f977cb1ba1b309dbd3d845b63a038d748359c"; + sha256 = "d1bf9c2a1df028b5d6eca5b41c975afc6378701c6f33d888b46511da5ce5e498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-ES/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-ES/firefox-86.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "614e69e978f0e814b54150a013872081d6365d9e5bb03ee1147c5310d6315dff"; + sha256 = "5ee1967bc61259869441f61061fec2f24ee3a4179c64b245768387e94acafdce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-MX/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-MX/firefox-86.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "765d1ca2685a462f173d7ba1863a2263008cba71738548dcdab83f6c010b7dc9"; + sha256 = "6b4669581f26a18fbd0bda8d605b9d22b3aa98eb193ea81f7ebce1db4d39a263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/et/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/et/firefox-86.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "1465b6447bd476f98060321562ec0ab47b117f1271dc97f9924da573c77b5a3d"; + sha256 = "0c41ec2c1df4cbd295d349a7b6ad7a7e974662319d4a1d458e9f6bd31c4830c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eu/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eu/firefox-86.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "4f25ccef829ad465d62676aec9c6daff9e5910cdb5447c0d9b5befee89b7e4f7"; + sha256 = "e7bb380e013f5cf35edba5b698a5e3fafd7af63593c663e0029e2754f6854b4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fa/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fa/firefox-86.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c2bed62b36d648133edd1541799b231dbfb1c0c5fb6213ac28c3abc0a38ee66d"; + sha256 = "d2601f3b84b31d9852a3f2ec35ae8b43f8640da18976f5f4c8a77cf7ad360a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ff/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ff/firefox-86.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "527591e25cd83c6ba7fe443dd40ad6963dd1b7f69a693e76cd1e18a2bf74c082"; + sha256 = "a13ee0463fc23cff51f88072d527a6b758fd313276cc7e5f3c8a0c4c8d5f5404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fi/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fi/firefox-86.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3c89fb2c42b854fa800c47e5c91d19defe56be5f6474c500bab309eb84df0a74"; + sha256 = "76a153c9e398eb259c69b30d15782b7d7a9ebd156283f1034c20182cd72e13f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fr/firefox-86.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a7b033c9df0e11abb6dae08f62dbfb34f740fb9d849e0bd8a027ecf0461ff5ac"; + sha256 = "6f5d6e07251f75d6355f52558f2734d2788bb87e1e53ccfb800e03173094f765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fy-NL/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fy-NL/firefox-86.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d162a3c113182178a7de0c5f3dab907badf9625ab50e8a922ceb4c34c4616c31"; + sha256 = "785a30a785e55158c7251e623683350ed4840bb4b6f002d34cdee82d91b33d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ga-IE/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ga-IE/firefox-86.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "637d65856d46474d51cff1da13b9b1e74984cb646cc5a6a643fcbc7fc1ec37fe"; + sha256 = "f32f8a0e5f0b5fd2a1dd147b32880605186a4b9435e39a53fc87f42eb8706979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gd/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gd/firefox-86.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "aab2f06d6ed6108fe48350ce0275d3d244f175e6c2427f54b403d6bd6ddc18cd"; + sha256 = "2893dd13353b3504a00e02f65f0b2a0a72dd43771148d45cca271aa752a0c520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gl/firefox-86.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a5945bf732fc6e3edddb0e7bb9067c591f4fc347f56a35c8622311706d8c135b"; + sha256 = "b5bcf0eff53f6bda0e394be3e483c3f314d962a919473492a7d1005b6976b861"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gn/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gn/firefox-86.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6036a369187f5e30322d140e1add09cc0a51e5d092693a5acb65176c872bf53b"; + sha256 = "c979d766174b2e4df72de6a375084b509e879f11a13c1972c97b5ba0accb67d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gu-IN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gu-IN/firefox-86.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "2b6d3c13a44b1234f591536c8f7f3cf5d1b56af53f366150e0565a36d4fa678e"; + sha256 = "0e053f93d56a8fd9c07bfef4e93f1f338f951f519be669f5ff18157ca4216025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/he/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/he/firefox-86.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c3d01e14f24de5635a9c0d3c7625fcb9b84129ce9505d2601390f2d40fff5a3a"; + sha256 = "05435889024f622f69d82a0007c19b50b1842f2cfa558748b39859a94a7addaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hi-IN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hi-IN/firefox-86.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "23f1dd3a9603d797abf6a1411c7b6e44d4fb2dc7b26294670ce4c63cb859e42f"; + sha256 = "7fb87408064c024305295c38938c42b34a0c627b177cacb00ed9e79a0ff974c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hr/firefox-86.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e30d8a599b28b05a3f83692dbadeb9185829b1a87c84ab5449f142ad1a7a8a44"; + sha256 = "924141a867793aa4fb3d2b87b75c1d60cc39bb3a3591eaaf6ee3381fcf28fcc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hsb/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hsb/firefox-86.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "1a6cb70573e9e0356e18a18d1a0a4d2f7188549c19cbed7e28d3b801915c22ca"; + sha256 = "7ce0f09c144462f9c94dc6805165543d12afbf0e44e327dae4554fecf272601e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hu/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hu/firefox-86.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c2cc048b05e197e028606535fdeb62a205c037eb5823560f187ec4152be41d97"; + sha256 = "8997e6d5620e0f565939cd8f127c4e86da0c46828c66fab7333073c3cbb8054e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hy-AM/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hy-AM/firefox-86.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a4b6b0d0f05ce86d13dbf08448724106278891cb79387e29f9ba3874c1aa6ec7"; + sha256 = "aeff6c4b8c7d164b63bf22808ea234236f893e6da2b3d9142f95d89e9ec7178e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ia/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ia/firefox-86.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f7d761ea9ee5d6037886a9aa8eb93747ae9f943957a296cdcca0dbbb0e7a2b38"; + sha256 = "0590e0469ac2e562325d786dcb68e2ca2111aa8ae1ff3717ef8db2259e6ec149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/id/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/id/firefox-86.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1599cd0ea460ee1280753bea5d5c84419506f72f8d87818114665ced3237407f"; + sha256 = "ef8dc62e52df3e6b1d37aea5f9b9a214a26e51ef9fd378f56ac8b2245de54613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/is/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/is/firefox-86.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ec9b790cc55ed72fcd79afb6502db207906f89aff4053d62efa12a37bbe85b93"; + sha256 = "aeabfd51aa160ba259850b7fac88829f81bcc0dd8ccc9168c7add07ce0d4efc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/it/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/it/firefox-86.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "97c625e01e9a565ef10079ae980cd2ee45761f428594158f6c05fb4a3f1142c9"; + sha256 = "c6069c0a86344af00150be03cb0f2c26984b713ad386352f5a10b39b79b13cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ja/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ja/firefox-86.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "625dc84ed56bb46032eae0087ae96d17127594efd99e4aeea410d4c8bef93819"; + sha256 = "9be7b40e66723583b17657ea805919955dda703957ba21d541baa22390a1befe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ka/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ka/firefox-86.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "45a00fe06fc302d59744b8c9dfc9d7a4e27ed4ac3727848f52597208020ce16a"; + sha256 = "2e8a57b44b3bec627793f46df84f7f25ab0aedd0f8b1f08202c75cc58d7e14c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kab/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kab/firefox-86.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "32b8ce9f195ecc610e3327402953609eb8621cbe116e22bba76131c9dd1b9738"; + sha256 = "5777a6b5eb3055ab2c93f98bc597343f13bff7d0a846809d24c97e9ba1a0ca7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kk/firefox-86.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "651f3c7314b919af1348771ef7c5ea986fe3d9d7e42e056172fa55d675e17e3e"; + sha256 = "84a8fbf2a859d81aae2aae6bc95f12a8e2982cff77090072a01d28daccbf21f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/km/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/km/firefox-86.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "1a62be10235639a7c2256521838fee8637ebd575cee39c5744a65ef057afe1b8"; + sha256 = "55982f15b467ddea6203fbcf98081496d0e313d3cd281f807d2bb75b4e79077e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kn/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kn/firefox-86.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1cdb648165896ccda8da7ef6862605723089cbd8e3c9e6b8692ffeb2d28f9593"; + sha256 = "18aedab4f324448da412ddebd1da9b01be51edcd5052c9455672a763ae1f673b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ko/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ko/firefox-86.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "70781041791a7c64e518de27955cf2b57ce3d3ee7afad36737f62783b5255d64"; + sha256 = "5baa361fb97a76d12bfbf5b87c092cbe8079d34dd08842dae9def133383f587a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lij/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lij/firefox-86.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "ea44fdf528da53d7f2ba9d447c70079873f802647ee708f6580447af6adc1834"; + sha256 = "35bf3aeba596135231b1ddff2e2550ab2a3e0c5bc796d7b628c5f78ac46ce40f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lt/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lt/firefox-86.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ffca3845c97f4d87e0d601c483e2bde8fa8f7f59b44ee85259fc70b1dcfb727f"; + sha256 = "eedf7ba2cf4634ab18c2f2926266845a29c9bce8ba747554d413b276445b9eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lv/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lv/firefox-86.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b513e100141d1df78de9f05dac72da91c6cf65a8fcc22b9091ec00e6c6ee21ef"; + sha256 = "a1c5f04c16f6d50a0797e466d6a8836de40219567f04928cda7f64d967d8afa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mk/firefox-86.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c65febe8a9f9b59ecdc61880a5c1a5b2b29fc53ffbc8d968f1773fe60adb082e"; + sha256 = "8de29502640b51ac9f586ae7713903612911cf01cd7aecb6d74175a816cce6a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mr/firefox-86.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "b4d3b6758c67f72e8f8c9dbb0e32fcd7b527b701e41d3d492e3e7ba7817cc544"; + sha256 = "f4cb4ddcac3b5ede422e54c69c05902506be788b45a79cfee6e21a0b7b8c3ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ms/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ms/firefox-86.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2fe81086a7a15bb29b909987063c058c1826bee6c0c645cae1e7a0907207d1ae"; + sha256 = "aa09b472e21b453f6875e25dc7922ca062934527a306f3b338cd32636076c021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/my/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/my/firefox-86.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "40661cc4fa51c2782bd0da0d6f460c3a5fbfaab72e91b15c77f9b7b537484ab8"; + sha256 = "4a4ad99aac0614aa25fd77c4c740c49f509db2333c37f797018362b15f38d1d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nb-NO/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nb-NO/firefox-86.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9ce253d8bc316fb976c4f64135f7767060aed90111b54dac687011a772e650ab"; + sha256 = "45814c2d731cd8435a92c31e9311c333d4357dc38e9196fbc24358289004df8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ne-NP/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ne-NP/firefox-86.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "7fb96857d5da6726e68038a9659ac7c18b8e746d0dd5e4823655c8fd093238a4"; + sha256 = "008ecc3d7bf7932a320b6ec12404a5259032930539a65e60f8aa2f98f9018524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nl/firefox-86.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1d03b2eb31dca3cfbfb38af4e59d3eb84845b8fdaf488b76949a98f744253935"; + sha256 = "0202adc844602502b48d078a665b1e9012c65172deda406ac9db972e05456fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nn-NO/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nn-NO/firefox-86.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "64fdf6e8e8086c04c53c84f792382c32579b43548f9410dc074b2aff95165d88"; + sha256 = "28f34c957628178a112ad6a7c16d9dd20e58bc3a9068fb1e59ef5e656ac8f02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/oc/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/oc/firefox-86.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6db5c30ca7d449534289f5b84e328484edd5d04512cde11f097f28f5ffb986bb"; + sha256 = "4645cc6de115ff73444dfa4165a82b3ba1b0adbe3c4eff6fd854c9ec594a7bbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pa-IN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pa-IN/firefox-86.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "102ac2026af2d21f27502f190dfeb0f39b148ce39324e480f653f6868df770d3"; + sha256 = "3fbe8e5c7b4fb420a6a6c62475bd01fead342d7431578b96f391a829cf184be4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pl/firefox-86.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f0a03e6a95a67af8e6949f5b6ad32179f7bf4978f050ca3c453287bdfaca6252"; + sha256 = "6850d14c02c152fb6252b08a111ff6bccbaee6a6ff76a99c018b497a8a014ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-BR/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-BR/firefox-86.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7177392c8f0c049ad685676aa6aab258274b7d5871c06467f7e87292779b7575"; + sha256 = "a0aac09a39302df30a48c54e64ae422166eb781ef349dbc58927e077310fae5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-PT/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-PT/firefox-86.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1fcae4be8cb31d30b1187b7d94fde71c41eb95c858467136af32fd7ad1117147"; + sha256 = "e577444bd6ef376b0277cc2181bf50bc1ac3e377bed171f30616f536fa2d516b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/rm/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/rm/firefox-86.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "86f801260baccff9e8d9036dae46b0796edc8d90c9a2238da1e1547ac2684da9"; + sha256 = "2a4f5f35caa3ec5b9f20c1160dd038ce3d689593650771c3e63246cc53b23cfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ro/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ro/firefox-86.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c1b02e43cc649acef6cdc9498814a4582b46b42de96dc48fcbac4d83b44ba35b"; + sha256 = "c68f195f10bcd7d19aa76084450419008068ee5d30c34acc02d7621ea250211a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ru/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ru/firefox-86.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c067538578c2891f062716f56f3ae057ef8db2814a03ec7f1eb8855b95f9ace0"; + sha256 = "e6e7dcc74dac1c331d3202a141df71dbe2e5a398e2b97c9da1358707823d76b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/si/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/si/firefox-86.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8131b12c390e31c06752115abf62426565433261e73ffa37a8389b102ccd06bf"; + sha256 = "1bf321805bd46e0214568921b89eaf5ea4d394e43fb1d475ee61c7de8439d997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sk/firefox-86.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "f45f32063d34930b7e0ba4c087e97a78af642a59270c62fbea86b0bd87e06171"; + sha256 = "221667dd6eead982d13e911e0ee9d6fb0e6288d689c59c7adc403e8eeab6fd4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sl/firefox-86.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "df8602e60a895887170ff2d18aae487730ef8e0bcfe08010fbe0da30f05af91e"; + sha256 = "5df6f40394d0c2561c5103cb0600d3566b2bf42dca4d6a3194bee725577f1dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/son/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/son/firefox-86.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3dd3bb220c4cfeee6ecd79977e1a619470a2504a4597f314286497164984cd9f"; + sha256 = "8ce2f3d67ea7e1889fce2f534e90320403350b27bd63e97263a9c14544d7f212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sq/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sq/firefox-86.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "cc04ff65bb4fbc714e21a416af26256d4b203f327e5678c71378fa507242ec6e"; + sha256 = "a4f403eefa8da37d7308bda7a10cf62dbe9ff74f848e9e3603d9b787c1629b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sr/firefox-86.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "abb30a4c0eb7ea9910b21c0f10cace395f9d413ce39051494c97ddd1e18e2c10"; + sha256 = "7f3d5fb8cb77c2405403f9899257d41f4e9fcdb45a1af945e337228d7648f79d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sv-SE/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sv-SE/firefox-86.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "76ae51342d5b8a93ae5f3927a69b9b1a6cd4877b98a7a103f8250bbe105ecf6a"; + sha256 = "261886fc3f3c9c40123a6b6ae0040fffb281d90cbc34506f85bcd73cb94276f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ta/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ta/firefox-86.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1e9866ac793705555c15ae4d0e16753e90e8deae19e6694ce9f85e8dfa6ee476"; + sha256 = "3df7b4c5eb395b123d8c9a67d58e2eda268bd931394e38941545cded144b97e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/te/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/te/firefox-86.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "66dcd400f89054f194f1a794c8731c7344b04f97209023559bfcd0f008e005c8"; + sha256 = "b27fe9f6d6e4920e5714a74f439900238900e164cce584f1a1548a02105caa10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/th/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/th/firefox-86.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "adef4cf7769510a8b47628eff5ee0f3b00c23862634fd8f6975daf599cf7b056"; + sha256 = "e4eadb2885d09a082c40e27eb41e5a8f721ddd45ef79ed0ccba02f18d7fc3d6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tl/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tl/firefox-86.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "465d089eb0c68d8279e3cc7f8ceb5c08527fc48b0292cc8ce523879c4643fbb1"; + sha256 = "392368f316cf89668e2ff9a42e0b170b55bfc610c84b0a605866914a39273fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tr/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tr/firefox-86.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "00d75ff3605672f6704fb600208872e536f76907ed25a4f90325cabc1924f991"; + sha256 = "e9c7f55b656860dc6d2b28fcca66dbc6e7290d2f418da238ca06ccfe68fdd579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/trs/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/trs/firefox-86.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "299be659a464911dd27d92c36f567f675a26aa6d92af63deb002e172ba6b40e0"; + sha256 = "9cd24da9a1dbc0665b589ea8d1f5e5a3546a8b7babbd0f9f2f27641d5c81eeaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uk/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uk/firefox-86.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "49c2084ec32c03fd2821c8f1220bbbf954b98705e44a6a7fa65ec6f1abb12c02"; + sha256 = "0bbd4c03dd422901bf2ff1a6e000ec4c6ed798bfa66ade8db03551f5509efc40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ur/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ur/firefox-86.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d703344d8f03186b0fb246108892432f137cc033ae66bef395e7216cfa7bbdd3"; + sha256 = "c0f807c2c7365f281d921fd347a173ce2538fce79b1e74beedf928f392422236"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uz/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uz/firefox-86.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "02379c1fd1766eb15d9e99f8a6f08074df943c49ecf6b50a6b29ae8e922bf347"; + sha256 = "f561501fdf1a0edf9f58289fe608b9d47c00ef666c7f980972f0f3112470ad27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/vi/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/vi/firefox-86.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0577b4c2891ba646a67a93b4d6373095b98466e32b95993abc79e7bfd240f7d5"; + sha256 = "12ce7eae83ef3100039871e82784ba7a63742ef8f132c48ceccac22641074c1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/xh/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/xh/firefox-86.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "83e40e1b33b2782d5dc68d32286da290188e8b5c3d689e5352d53411f95bed4c"; + sha256 = "9def9420b6e6e252839268167e978cc357add46e54e77a0f5bf8e03a2183a855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-CN/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-CN/firefox-86.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "695e647135b911a5e60374595197cd096b7bc180e63ee3069e4550a612354369"; + sha256 = "03cea12f34a9eb22e730d6b28f294bc2a1578e9c357a15bcf189ab1fb925e337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-TW/firefox-85.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-TW/firefox-86.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5dcc5aa463f3c2325dcc7f4f768580dca6adf66e052470ec932bfabe9b3f8f29"; + sha256 = "cf5e5cdf7230bf231f63750b3747b625d64026194c29b36c3d00ff9851960745"; } ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index bbc3f7308f9..86d91d21e3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.7.1esr"; + ffversion = "78.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm"; + sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 96a4e15adf8..ed88bf587d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -51,27 +51,6 @@ let alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; - # FIXME: This should probably be an assertion now? - plugins = - let - removed = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - in if removed != [] then - throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." - else - [] - ; - nativeMessagingHosts = ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) @@ -164,7 +143,24 @@ let # # ############################# - in stdenv.mkDerivation { + # TODO: remove this after the next release (21.03) + configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ + "enableAdobeFlash" + "enableAdobeReader" + "enableBluejeans" + "enableDjvu" + "enableFriBIDPlugin" + "enableGoogleTalkPlugin" + "enableMPlayer" + "enableVLC" + "icedtea" + "jre" + ]; + pluginsError = + "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; + + in if configPlugins != [] then throw pluginsError else + (stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -262,12 +258,9 @@ let makeWrapper "$oldExe" \ "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ - --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ - --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix PATH ':' "${xdg-utils}/bin" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ @@ -351,9 +344,6 @@ let preferLocalBuild = true; - # Let each plugin tell us (through its `mozillaPlugin') attribute - # where to find the plugin in its tree. - plugins = map (x: x + x.mozillaPlugin) plugins; libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; gtk_modules = map (x: x + x.gtkModule) gtk_modules; @@ -362,14 +352,9 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = - browser.meta.description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)) - + ")"; + description = browser.meta.description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }; -in - lib.makeOverridable wrapper + }); +in lib.makeOverridable wrapper diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 64f4c27c96c..78eef775558 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "0c7w4a19cwx3bkmbhc9c1wx0zmqd3a1grrj4ffifdic95wdihv7x"; + sha256 = "sha256-EN0fQ5Scwrd7Tv31upQVbuqoNCoYudtruwtPR1IKTzE="; fetchSubmodules = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix index 917da034c30..8656b4aaa27 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index b4bec6ead3f..861b5a15ee0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, lispPackages, sbcl +{ stdenv, lib, lispPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo , mime-types, pango, gtk3 diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 9b0a9078ee5..6517203eeeb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.9"; + version = "10.0.12"; 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 = "0i5g997kgn7n6ji7pxbyvkx33nqfi2s1val680fp5hh1zz31yvfv"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "GZywFEX/5Br+Zu1w6pegoNOTrSIVQNE2LINsa3Vdlxs="; + sha256 = "16915fvvq3d16v1bzclnb52sa6yyaalihk3gv93jcnph9vsz8ags"; }; }; in diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index ab894e7b7f0..495c2bb15d6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "3.1.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "jelmerro"; repo = pname; rev = version; - sha256 = "10l36q75nmqv0azxhmwms6hjicbgyvpk8k6ljrh9d7zxryd3xwz0"; + sha256 = "0h5yzmvs9zhhpg9l7rrgwd4rqd9n00n2ifwqf05kpymzliy6xsnk"; }; packageJSON = ./package.json; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json index a03478bcd82..cf04c6892c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json @@ -1,14 +1,9 @@ { "name": "vieb", "productName": "Vieb", - "version": "3.1.0", + "version": "3.4.0", "description": "Vim Inspired Electron Browser", "main": "app/index.js", - "babel": { - "plugins": [ - "@babel/plugin-proposal-optional-chaining" - ] - }, "scripts": { "test": "jest -u && eslint .", "start": "electron app", @@ -29,16 +24,15 @@ "email": "Jelmerro@users.noreply.github.com", "license": "GPL-3.0+", "devDependencies": { - "@babel/plugin-proposal-optional-chaining": "^7.12.7", - "archiver": "^5.0.2", - "electron": "^11.0.3", - "electron-builder": "^22.9.1", - "eslint": "^7.15.0", + "archiver": "^5.2.0", + "electron": "^11.2.1", + "electron-builder": "^22.10.4", + "eslint": "^7.19.0", "jest": "^26.6.3" }, "dependencies": { - "@cliqz/adblocker-electron": "^1.18.8", - "darkreader": "^4.9.26", + "@cliqz/adblocker-electron": "^1.20.0", + "darkreader": "^4.9.27", "is-svg": "^4.2.1", "rimraf": "^3.0.2" } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock index a9266f10513..45858ae2b28 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -7,26 +7,33 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" - integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + dependencies: + "@babel/highlight" "^7.12.13" + "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" - integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.10" + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" + integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.15" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helpers" "^7.12.13" + "@babel/parser" "^7.12.16" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -35,139 +42,123 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460" - integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww== +"@babel/generator@^7.12.13", "@babel/generator@^7.12.15": + version "7.12.15" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" + integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.13" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" - integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== - dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/helper-get-function-arity@^7.10.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" - integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== - dependencies: - "@babel/types" "^7.12.10" - -"@babel/helper-member-expression-to-functions@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" - integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== - dependencies: - "@babel/types" "^7.12.7" - -"@babel/helper-module-imports@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== - dependencies: - "@babel/types" "^7.12.5" - -"@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" +"@babel/helper-function-name@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" + integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== + dependencies: + "@babel/helper-get-function-arity" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-get-function-arity@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" + integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-member-expression-to-functions@^7.12.13": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" + integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-module-imports@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" + integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-module-transforms@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" + integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" lodash "^4.17.19" -"@babel/helper-optimise-call-expression@^7.10.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" - integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== +"@babel/helper-optimise-call-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" + integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== dependencies: - "@babel/types" "^7.12.10" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + "@babel/types" "^7.12.13" -"@babel/helper-replace-supers@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" - integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" + integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== -"@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== +"@babel/helper-replace-supers@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" + integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== dependencies: - "@babel/types" "^7.12.1" + "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" - integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== +"@babel/helper-simple-access@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" + integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.13" -"@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" - integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== +"@babel/helper-split-export-declaration@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" + integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== dependencies: - "@babel/types" "^7.11.0" + "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" - integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== +"@babel/helper-validator-identifier@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helpers@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== +"@babel/helpers@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" + integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" + integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81" - integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA== - -"@babel/plugin-proposal-optional-chaining@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" - integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" + integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -184,11 +175,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" - integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -239,7 +230,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": +"@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -247,42 +238,42 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" - integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" - integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.10" - "@babel/types" "^7.12.10" + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" + integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/template@^7.12.13", "@babel/template@^7.3.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" + integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" + integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260" - integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" + integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" to-fast-properties "^2.0.0" @@ -291,36 +282,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz#96473f14c098a20091298d34a6addcd430aceebd" - integrity sha512-YZ1xYBVG3LmxsdTYvTs/Bc7pzCw/Dy4HFo6N+oIuGP+Le/0aGSkACUl3ue5I2+Cx0WmL0Z8I4QonTKDc06HR+A== +"@cliqz/adblocker-content@^1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.0.tgz#fcfa2845a577ba8d9af282afbae2fc437b3f1c70" + integrity sha512-KcokmK2B+tAnVMi7nGHgzXUVf78wAODG1Uk+K3tBPf9VAo3mwldYZ472uTj6LUfZv5oeTwe4PwfmPWXWZy3Eew== + dependencies: + "@cliqz/adblocker-extended-selectors" "^1.20.0" -"@cliqz/adblocker-electron-preload@^1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz#c2058647e015b6f61c222e7d58040347324c63b0" - integrity sha512-/FAzyhNUj+8fwqSGth7ndaC+8huEANvVquYkDVmjM38uryxFgcJJI6Bij1l1zABIbskAaSN4G4RI3oERyd9/KQ== +"@cliqz/adblocker-electron-preload@^1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.0.tgz#997b694fbb1b1206e04b1fd570690234cc7ef630" + integrity sha512-brNQFjIoGTMClmFphtoK0EnjOlbqfxr6sA3CrOZiHfG0e07Id5GoU95re8+s8xA+/nd1GrJl/k5/b4aks+S9Gw== dependencies: - "@cliqz/adblocker-content" "^1.18.8" + "@cliqz/adblocker-content" "^1.20.0" -"@cliqz/adblocker-electron@^1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz#5f697c5dc65cd936b3908078a6e4516ec995567a" - integrity sha512-CrsFjSwenWQogsAg4sHFaXZbu7hzs9dMdsZM5wxb+5QfZ3MSH3PBYAeAUnsmP3UOTZ423+6ErOUE1vzj3UrK9w== +"@cliqz/adblocker-electron@^1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.0.tgz#bacfb9feaf1d3dab339b992e3defa111a4b5ed3c" + integrity sha512-zD881g+YxxO4BM6NB5qZtSevg9Cj7QtlCJ4tkcKZnD9MDQsNXQVIFFEWwqhd00kLkTUS0+jT0px9b81cigAPNg== dependencies: - "@cliqz/adblocker" "^1.18.8" - "@cliqz/adblocker-electron-preload" "^1.18.8" + "@cliqz/adblocker" "^1.20.0" + "@cliqz/adblocker-electron-preload" "^1.20.0" tldts-experimental "^5.6.21" -"@cliqz/adblocker@^1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz#f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9" - integrity sha512-19m0GhlOcdSvQ/BqVuaMgbYkgQ4ys8koBRW4K7Ua4V5fFWL0t8ckdcZ/gBOqwECS2m8agXSpEbbyJjNmHBHpMQ== +"@cliqz/adblocker-extended-selectors@^1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.0.tgz#95ede657b670f627b39f92d85a97093cecee6ffe" + integrity sha512-dnBPIngGe1eDWvYX49eP2yyCE2AY1QD5E+8SaXW6lslnjS0GQnkcXCAkkGR2am4Qdk78HAiWTXL65Zt9hdkupA== + +"@cliqz/adblocker@^1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.0.tgz#514746e9ee72fcd886f1e2e1aaf13b28fc63f232" + integrity sha512-lkEj0Pj1ikwMURrvoFv0YnLfaXFuJI+jexI7zdh4fDmlwRppzDDgOhPXgCczoAlYacJk5x2mf7pan6JybRD9Kw== dependencies: + "@cliqz/adblocker-content" "^1.20.0" + "@cliqz/adblocker-extended-selectors" "^1.20.0" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.126" + "@types/chrome" "^0.0.128" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -341,25 +341,36 @@ ajv-keywords "^3.4.1" "@electron/get@^1.0.1": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3" - integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg== + version "1.12.4" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" + integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" got "^9.6.0" progress "^2.0.3" - sanitize-filename "^1.6.2" + semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@eslint/eslintrc@^0.2.2": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" - integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ== +"@electron/universal@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" + integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.0.3" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + +"@eslint/eslintrc@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" + integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -368,7 +379,7 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.19" + lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" @@ -384,9 +395,9 @@ resolve-from "^5.0.0" "@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/console@^26.6.2": version "26.6.2" @@ -559,40 +570,47 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + "@remusao/guess-url-type@^1.1.2": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.0.tgz#fb1402b4c47266161501704d74427b8d49e4b3e4" - integrity sha512-alnTonifD/Ii/0pI9EA5nVgdk/eOihU4OOYMIXq4U4cS0NocnaYCozqV4OVkmArPPnz9s4ap4GM1ODftBpBW0w== + version "1.2.1" + resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz#b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57" + integrity sha512-rbOqre2jW8STjheOsOaQHLgYBaBZ9Owbdt8NO7WvNZftJlaG3y/K9oOkl8ZUpuFBisIhmBuMEW6c+YrQl5inRA== "@remusao/small@^1.1.2": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.0.tgz#1f56d59418d4c121cd8814e4bea5ed95dcf4b7a9" - integrity sha512-18Bwa/EjqQ5WfdERqmG3YgOohO7J2sS8+v31JgmYnEg3wAtcAOPVBRkD24IzVS0eJOQk1P2Yd++aP0ldirk7MQ== + version "1.2.1" + resolved "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.1.tgz#63bfe4548832289f94ac868a0c305970c9a0e5f9" + integrity sha512-7MjoGt0TJMVw1GPKgWq6SJPws1SLsUXQRa43Umht+nkyw2jnpy3WpiLNqGdwo5rHr5Wp9B2W/Pm5RQp656UJdw== -"@remusao/smaz-compress@^1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.0.tgz#ec79c87f5780865da616cd214b3b8978807d1e9a" - integrity sha512-PAze3aYCcUfX+a6E6sVMoxVtUkeQgX+oiY6DqbiRkNtUqzjtcl9JVyEAWGbBEgOuv2jdEATAlyIf0W18NKDEnw== +"@remusao/smaz-compress@^1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.1.tgz#fc75eaf9bcac2d58bc4c3d518183a7cb9612d275" + integrity sha512-E2f48TwloQu3r6BdLOGF2aczeH7bJ/32oJGqvzT9SKur0cuUnLcZ7ZXP874E2fwmdE+cXzfC7bKzp79cDnmeyw== dependencies: - "@remusao/trie" "^1.4.0" + "@remusao/trie" "^1.4.1" -"@remusao/smaz-decompress@^1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.0.tgz#9b3fba7c8e0c2045de63fd0ad0e5b37b447bb7cf" - integrity sha512-7uXEX8cSMWy+ai7j8sJpVQuY+CHj2e5D+PjxY//4wbAJlw1a/X+CYPt7BuxLBzpVoioB5Y7++1USjCkrw0pl8g== +"@remusao/smaz-decompress@^1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.1.tgz#8094f997e8fb591a678cda9cf08c209c825eba5b" + integrity sha512-TfjKKprYe3n47od8auhvJ/Ikj9kQTbDTe71ynKlxslrvvUhlIV3VQSuwYuMWMbdz1fIs0H/fxCN1Z8/H3km6/A== "@remusao/smaz@^1.7.1": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.0.tgz#d02c2fb007483d4b4d050fb2fdaf523fcef08d40" - integrity sha512-HMMPam5jLhP0ymtMUQ8sm2p9zwDJwHD09krORXN/l/TR+NlSCdU2gSAoVNr9idD9OmMGfeXPFQYCofEUZfjbTQ== + version "1.9.1" + resolved "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.1.tgz#a2b9b045385f81e1615a68d932b7cc8b04c9db8d" + integrity sha512-e6BLuP8oaXCZ9+v46Is4ilAZ/Vq6YLgmBP204Ixgk1qTjXmqvFYG7+AS7v9nsZdGOy96r9DWGFbbDVgMxwu1rA== dependencies: - "@remusao/smaz-compress" "^1.9.0" - "@remusao/smaz-decompress" "^1.9.0" + "@remusao/smaz-compress" "^1.9.1" + "@remusao/smaz-decompress" "^1.9.1" -"@remusao/trie@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.0.tgz#b439210445339f0ca95ff200d98b898d431a4ce1" - integrity sha512-mIr0m4/xj6qxHtJjAFb4I8tXXmjTniUYTB2Hv+xK5hXf/YWocEPlJ+V31bv5HJwo6ly64DUnZDBeBxolT3WE7w== +"@remusao/trie@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz#755d09f8a007476334e611f42719b2d581f00720" + integrity sha512-yvwa+aCyYI/UjeD39BnpMypG8N06l86wIDW1/PAc6ihBRnodIfZDwccxQN3n1t74wduzaz74m4ZMHZnB06567Q== "@sindresorhus/is@^0.14.0": version "0.14.0" @@ -600,9 +618,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sinonjs/commons@^1.7.0": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" - integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== + version "1.8.2" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" + integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== dependencies: type-detect "4.0.8" @@ -653,10 +671,10 @@ dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.126": - version "0.0.126" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.126.tgz#f9f3436712f0c7c12ea9798abc9b95575ad7b23a" - integrity sha512-191z7uoyfbGU+z7/m45j9XbWugWqVHVPMM4hJV5cZ+3YzGCT9wFjMUHO3Wr3Xvo8aVodvRNu28u7lvEaAnfbzg== +"@types/chrome@^0.0.128": + version "0.0.128" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.128.tgz#5dbd8b2539a367353fbe4386f119b510105f8b6a" + integrity sha512-eGc599TDtersMBW1cSnExHm0IHrXrO5xdk6Sa2Dq30ED+hR1rpT1ez0NNcCgvGO52nmktGfyvd3Uyquzv3LL4g== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -683,17 +701,25 @@ resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== -"@types/fs-extra@^9.0.1": - version "9.0.5" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.5.tgz#2afb76a43a4bef80a363b94b314d0ca1694fc4f8" - integrity sha512-wr3t7wIW1c0A2BIJtdVp4EflriVaVVAsCAIHVzzh8B+GiFv9X1xeJjCs4upRXtzp7kQ6lP5xvskjoD4awJ1ZeA== +"@types/fs-extra@^9.0.5": + version "9.0.7" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" + integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== + dependencies: + "@types/node" "*" + +"@types/glob@^7.1.1": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== dependencies: + "@types/minimatch" "*" "@types/node" "*" "@types/graceful-fs@^4.1.2": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753" - integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg== + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== dependencies: "@types/node" "*" @@ -721,40 +747,58 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + "@types/node@*": - version "14.14.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz#9e425079799322113ae8477297ae6ef51b8e0cdf" - integrity sha512-vbxr0VZ8exFMMAjCW8rJwaya0dMCDyYW2ZRdTyjtrCvJoENMpdUHOT/eTzvgyA5ZnqRZ/sI0NwqAxNHKYokLJQ== + version "14.14.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.27.tgz#c7127f8da0498993e13b1a42faf1303d3110d2f2" + integrity sha512-Ecfmo4YDQPwuqTCl1yBxLV5ihKfRlkBmzUEDcfIRvDxOTGQEeikr317Ln7Gcv0tjA8dVgKI3rniqW2G1OyKDng== "@types/node@^12.0.12": - version "12.19.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" - integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q== + version "12.20.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.0.tgz#692dfdecd6c97f5380c42dd50f19261f9f604deb" + integrity sha512-0/41wHcurotvSOTHQUFkgL702c3pyWR1mToSrrX3pGPvGfpHTv3Ksx0M4UVuU5VJfjVb62Eyr1eKO1tWNUCg2Q== "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/plist@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" + integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + "@types/prettier@^2.0.0": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00" - integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ== + version "2.2.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd" + integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw== "@types/stack-utils@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== +"@types/verror@^1.10.3": + version "1.10.4" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz#805c0612b3a0c124cf99f517364142946b74ba3b" + integrity sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg== + "@types/yargs-parser@*": - version "15.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + version "20.2.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" + integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.0", "@types/yargs@^15.0.5": - version "15.0.11" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz#361d7579ecdac1527687bcebf9946621c12ab78c" - integrity sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA== +"@types/yargs@^15.0.0", "@types/yargs@^15.0.12": + version "15.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" + integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" @@ -791,7 +835,7 @@ ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: +ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -801,6 +845,16 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^7.0.2: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz#f982ea7933dc7f1012eae9eec5a86687d805421b" + integrity sha512-svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-align@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" @@ -820,6 +874,11 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.11.0" +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" @@ -830,7 +889,7 @@ ansi-regex@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -860,37 +919,38 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.10: - version "3.5.10" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d" - integrity sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ== +app-builder-bin@3.5.12: + version "3.5.12" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" + integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== -app-builder-lib@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c" - integrity sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A== +app-builder-lib@22.10.4: + version "22.10.4" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz#3fc70821b76beb9c8279d9de22960ef2174da153" + integrity sha512-q7B1cr8Ry4a7o08EKShLfwsnIVf5By7YhVwcoqgEwPKxtoj1qF0kB4wyBP79rJylYi0Zj2cSkJJ/gD/ef9xhoQ== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.0.4" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.10.4" + builder-util-runtime "8.7.3" chromium-pickle-js "^0.2.0" - debug "^4.3.0" + debug "^4.3.1" ejs "^3.1.5" - electron-publish "22.9.1" + electron-publish "22.10.4" fs-extra "^9.0.1" - hosted-git-info "^3.0.5" + hosted-git-info "^3.0.7" is-ci "^2.0.0" isbinaryfile "^4.0.6" - js-yaml "^3.14.0" + js-yaml "^3.14.1" lazy-val "^1.0.4" minimatch "^3.0.4" - normalize-package-data "^2.5.0" + normalize-package-data "^3.0.0" read-config-file "6.0.0" sanitize-filename "^1.6.3" - semver "^7.3.2" + semver "^7.3.4" temp-file "^3.3.7" archiver-utils@^2.1.0: @@ -909,10 +969,10 @@ archiver-utils@^2.1.0: normalize-path "^3.0.0" readable-stream "^2.0.0" -archiver@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz#05b0f6f7836f3e6356a0532763d2bb91017a7e37" - integrity sha512-iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA== +archiver@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz#25aa1b3d9febf7aec5b0f296e77e69960c26db94" + integrity sha512-QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ== dependencies: archiver-utils "^2.1.0" async "^3.2.0" @@ -949,6 +1009,18 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +asar@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b" + integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -966,10 +1038,10 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async-exit-hook@^2.0.1: version "2.0.1" @@ -1047,9 +1119,9 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__traverse" "^7.0.6" babel-preset-current-node-syntax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77" - integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q== + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" @@ -1077,7 +1149,7 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64-js@^1.3.1: +base64-js@^1.2.3, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -1103,9 +1175,9 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== dependencies: buffer "^5.5.0" inherits "^2.0.4" @@ -1128,19 +1200,19 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== -boxen@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" - integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== +boxen@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz#64fe9b16066af815f51057adcc800c3730120854" + integrity sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA== dependencies: ansi-align "^3.0.0" - camelcase "^5.3.1" - chalk "^3.0.0" - cli-boxes "^2.2.0" - string-width "^4.1.0" - term-size "^2.1.0" - type-fest "^0.8.1" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.0" + type-fest "^0.20.2" widest-line "^3.1.0" + wrap-ansi "^7.0.0" brace-expansion@^1.1.7: version "1.1.11" @@ -1190,12 +1262,17 @@ buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -buffer@^5.5.0: +buffer@^5.1.0, buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -1203,30 +1280,30 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.2: - version "8.7.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72" - integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA== +builder-util-runtime@8.7.3: + version "8.7.3" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" + integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== dependencies: - debug "^4.1.1" + debug "^4.3.2" sax "^1.2.4" -builder-util@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af" - integrity sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw== +builder-util@22.10.4: + version "22.10.4" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz#54e8be83dd0dec28073d866ff087cee8e7ce6cf6" + integrity sha512-XdcbFG3otEkNRKxW2wS1npNviCb/IrzusEQ55lMB+6YEHxBOfTbf8vnPt0pDumfwmxls9xczABU+mfqN/W4uDw== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.1" - app-builder-bin "3.5.10" + "@types/fs-extra" "^9.0.5" + app-builder-bin "3.5.12" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.2" + builder-util-runtime "8.7.3" chalk "^4.1.0" - debug "^4.3.0" + debug "^4.3.1" fs-extra "^9.0.1" is-ci "^2.0.0" - js-yaml "^3.14.0" + js-yaml "^3.14.1" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.3.7" @@ -1269,7 +1346,7 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: +camelcase@^6.0.0, camelcase@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -1295,14 +1372,6 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" @@ -1341,11 +1410,19 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -cli-boxes@^2.2.0: +cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +cli-truncate@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" + integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== + dependencies: + slice-ansi "^1.0.0" + string-width "^2.0.0" + cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -1413,6 +1490,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -1420,6 +1502,18 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -1483,9 +1577,9 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js@^3.6.5: - version "3.8.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47" - integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg== + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" + integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1501,13 +1595,20 @@ crc-32@^1.2.0: printj "~1.1.0" crc32-stream@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067" - integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" + integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== dependencies: crc-32 "^1.2.0" readable-stream "^3.4.0" +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1519,7 +1620,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.2: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1550,10 +1651,10 @@ cssstyle@^2.2.0: dependencies: cssom "~0.3.6" -darkreader@^4.9.26: - version "4.9.26" - resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.26.tgz#ad92139742f22fc406ae14d12ec6e5672a7eedde" - integrity sha512-8Mixd/u3VTXEjld7dl+Rtz6NvHkCDpp9JweZemLsxtS9o00YxRDLTH+lkJTGg2jD+qOQblh7ahyLvEby5JBNDw== +darkreader@^4.9.27: + version "4.9.27" + resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.27.tgz#69b641d6a3c22b07fb0424406dfd9a3661b37197" + integrity sha512-DG8zsicuCbAYKaKvLUaiikeei5jN5dIpe0jyaPw4kDa2L5zVnWc/ZxNUYOFriKVAmicwqE5gH5EOfyI0MVt3KA== dashdash@^1.12.0: version "1.14.1" @@ -1578,13 +1679,20 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0: +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" +debug@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1676,17 +1784,44 @@ diff-sequences@^26.6.2: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== -dmg-builder@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f" - integrity sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ== +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + +dmg-builder@22.10.4: + version "22.10.4" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.4.tgz#8dab30754346791eb728091359558fd4a8dbb45f" + integrity sha512-+28HZgKAuyCQnQwLSAwkHUqtMB/egHF5ACUABCB4Nev02/ZfjFPUTF/WloTaEbue34zLLUGxPXh+BJF8Xw26ow== dependencies: - app-builder-lib "22.9.1" - builder-util "22.9.1" + app-builder-lib "22.10.4" + builder-util "22.10.4" fs-extra "^9.0.1" iconv-lite "^0.6.2" - js-yaml "^3.14.0" + js-yaml "^3.14.1" sanitize-filename "^1.6.3" + optionalDependencies: + dmg-license "^1.0.8" + +dmg-license@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.8.tgz#d52e234815f1a07a59706e5f2a2fea71991cf784" + integrity sha512-47GOb6b4yVzpovXC34heXElpH++ICg9GuWBeOTaokUNLAoAdWpE4VehudYEEtu96j2jXsgQWYf78nW7r+0Y3eg== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + cli-truncate "^1.1.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.5" + plist "^3.0.1" + smart-buffer "^4.0.2" + verror "^1.10.0" doctrine@^3.0.0: version "3.0.0" @@ -1733,50 +1868,50 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" ejs@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" - integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-builder@^22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60" - integrity sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA== +electron-builder@^22.10.4: + version "22.10.4" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.4.tgz#e1f400cf41ebb632fbf79aa86c5e0ab1ea1ed7e5" + integrity sha512-V+JtiizJd3kt24TT+0OHG7+oPAzjhhjmQVn9G6OC2WE7VBJxrDuD6lMVRgo6WlU8uvDCh7fTRUsdh0Tnu0GeQA== dependencies: - "@types/yargs" "^15.0.5" - app-builder-lib "22.9.1" + "@types/yargs" "^15.0.12" + app-builder-lib "22.10.4" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.10.4" + builder-util-runtime "8.7.3" chalk "^4.1.0" - dmg-builder "22.9.1" + dmg-builder "22.10.4" fs-extra "^9.0.1" is-ci "^2.0.0" lazy-val "^1.0.4" read-config-file "6.0.0" sanitize-filename "^1.6.3" - update-notifier "^4.1.1" - yargs "^16.0.3" + update-notifier "^5.0.1" + yargs "^16.2.0" -electron-publish@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e" - integrity sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w== +electron-publish@22.10.4: + version "22.10.4" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz#944b00aa6a7746c31ce900ffd8106d243326dca8" + integrity sha512-cjVM0+9DQoV4TWfH8lVWoelJ89O2i5yDARVp5GCMHrB43XEU0Nr5eKYysgsbOSnZk5W8z1vfGpFWHj+AeAEDYg== dependencies: - "@types/fs-extra" "^9.0.1" + "@types/fs-extra" "^9.0.5" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.10.4" + builder-util-runtime "8.7.3" chalk "^4.1.0" fs-extra "^9.0.1" lazy-val "^1.0.4" - mime "^2.4.6" + mime "^2.4.7" -electron@^11.0.3: - version "11.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz#8dfdf579d1eb79feef3e3d2937fc022e72129c90" - integrity sha512-RFAhR/852VMaRd9NSe7jprwSoG9dLc6u1GwnqRWg+/3cy/8Zrwt1Betw1lXiZH7hGuB9K2cqju83Xv5Pq5ZSGA== +electron@^11.2.1: + version "11.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" + integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -1895,13 +2030,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.15.0: - version "7.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7" - integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA== +eslint@^7.19.0: + version "7.20.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" + integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.2.2" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.3.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1912,7 +2047,7 @@ eslint@^7.15.0: eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" - esquery "^1.2.0" + esquery "^1.4.0" esutils "^2.0.2" file-entry-cache "^6.0.0" functional-red-black-tree "^1.0.1" @@ -1925,7 +2060,7 @@ eslint@^7.15.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.19" + lodash "^4.17.20" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -1934,7 +2069,7 @@ eslint@^7.15.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^5.2.3" + table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -1952,10 +2087,10 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" @@ -2140,9 +2275,9 @@ file-entry-cache@^6.0.0: flat-cache "^3.0.4" filelist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" - integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== dependencies: minimatch "^3.0.4" @@ -2180,9 +2315,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" - integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== for-in@^1.0.2: version "1.0.2" @@ -2225,14 +2360,14 @@ fs-extra@^8.1.0: universalify "^0.1.0" fs-extra@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^1.0.0" + universalify "^2.0.0" fs.realpath@^1.0.0: version "1.0.0" @@ -2240,9 +2375,9 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^2.1.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d" - integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== function-bind@^1.1.1: version "1.1.1" @@ -2302,7 +2437,7 @@ glob-parent@^5.0.0: dependencies: is-glob "^4.0.1" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2327,12 +2462,12 @@ global-agent@^2.0.2: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201" - integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A== +global-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== dependencies: - ini "^1.3.5" + ini "2.0.0" global-tunnel-ng@^2.7.1: version "2.7.1" @@ -2381,9 +2516,14 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= growly@^1.3.0: version "1.3.0" @@ -2461,10 +2601,10 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== -hosted-git-info@^3.0.5: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== +hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: + version "3.0.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" + integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" @@ -2504,6 +2644,14 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +iconv-corefoundation@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.5.tgz#90596d444a579aeb109f5ca113f6bb665a41be2b" + integrity sha512-hI4m7udfV04OcjleOmDaR4gwXnH4xumxN+ZmywHDiKf2CmAzsT9SVYe7Y4pdnQbyZfXwAQyrElykbE5PrPRfmQ== + dependencies: + cli-truncate "^1.1.0" + node-addon-api "^1.6.3" + iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -2529,9 +2677,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" - integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -2567,7 +2715,12 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -2608,7 +2761,7 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.1.0: +is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== @@ -2691,18 +2844,18 @@ is-glob@^4.0.0, is-glob@^4.0.1: dependencies: is-extglob "^2.1.1" -is-installed-globally@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" - integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== dependencies: - global-dirs "^2.0.1" - is-path-inside "^3.0.1" + global-dirs "^3.0.0" + is-path-inside "^3.0.2" -is-npm@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" - integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== is-number@^3.0.0: version "3.0.0" @@ -2721,7 +2874,7 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-path-inside@^3.0.1: +is-path-inside@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== @@ -3238,7 +3391,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@^3.14.0: +js-yaml@^3.13.1, js-yaml@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -3303,6 +3456,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -3319,9 +3477,9 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" @@ -3387,7 +3545,7 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -latest-version@^5.0.0: +latest-version@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== @@ -3469,7 +3627,7 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= -lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19: +lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.20: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -3556,22 +3714,22 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.0.5" -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== +mime-db@1.45.0: + version "1.45.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" + integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + version "2.1.28" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" + integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== dependencies: - mime-db "1.44.0" + mime-db "1.45.0" -mime@^2.4.6: - version "2.4.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" - integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== +mime@^2.4.7: + version "2.5.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" + integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== mimic-fn@^2.1.0: version "2.1.0" @@ -3583,7 +3741,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -3647,6 +3805,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -3658,9 +3821,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620" - integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA== + version "8.0.1" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" + integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -3679,6 +3842,16 @@ normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a" + integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw== + dependencies: + hosted-git-info "^3.0.6" + resolve "^1.17.0" + semver "^7.3.2" + validate-npm-package-license "^3.0.1" + normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -3846,9 +4019,9 @@ parent-module@^1.0.0: callsites "^3.0.0" parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" @@ -3924,6 +4097,15 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +plist@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" + integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ== + dependencies: + base64-js "^1.2.3" + xmlbuilder "^9.0.7" + xmldom "0.1.x" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -4000,7 +4182,7 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.0.1: +pupa@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== @@ -4175,6 +4357,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -4202,12 +4389,12 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.18.1: - version "1.19.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" - integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== +resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: - is-core-module "^2.1.0" + is-core-module "^2.2.0" path-parse "^1.0.6" responselike@^1.0.2: @@ -4283,7 +4470,7 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: +sanitize-filename@^1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== @@ -4324,7 +4511,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== @@ -4397,15 +4584,27 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== +slice-ansi@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" + integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +smart-buffer@^4.0.2: + version "4.1.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" + integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -4456,9 +4655,9 @@ source-map-support@^0.5.19, source-map-support@^0.5.6: source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" @@ -4566,6 +4765,14 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" +string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string-width@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -4598,6 +4805,13 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + strip-ansi@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -4671,20 +4885,20 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== +table@^6.0.4: + version "6.0.7" + resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" + integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + ajv "^7.0.2" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" tar-stream@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" - integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== dependencies: bl "^4.0.3" end-of-stream "^1.4.1" @@ -4700,11 +4914,6 @@ temp-file@^3.3.7: async-exit-hook "^2.0.1" fs-extra "^8.1.0" -term-size@^2.1.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" - integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== - terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" @@ -4732,17 +4941,17 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -tldts-core@^5.6.64: - version "5.6.64" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.64.tgz#0f80d0c9607d7583acc477a10dae7e62e7c08063" - integrity sha512-uzVHDyya5Qy7VtMaaWYdNxvBBp8PKhRMt6FrzB5lDJiFtUIma4JdxRCxGxbyOoJig1DOmqcQDjnH3+C2etvyaA== +tldts-core@^5.7.6: + version "5.7.6" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.6.tgz#af99b4ab79761dfa6c44d1d61a3f76bb5c3def8b" + integrity sha512-VfRarBs7nbY9Af3In4O1A3d7T6eZh+w/IjRPpBo8VgRHAo7LJ+GrzCVo1yoOPmm3tdO1vUXtwBnchWN0dpL6lQ== tldts-experimental@^5.6.21: - version "5.6.64" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.64.tgz#f867449964d94c6a17a499335658f42a9fbdc7d3" - integrity sha512-PaA3Lau6l7PsxvMd9Ptocalu/K9RA3Ia5QovHTuLdJZfaJJNFrC3FEQpzYqxQ4bGqB7bpPeFXZDLisA/d4KWKg== + version "5.7.6" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.6.tgz#10c255872af89ab68659c3a345c7a65015920024" + integrity sha512-FRpjSRsxsa46/PRc2erEx8B9uZQYsdBQPG/s3B7IGhWxi1VG6GOwTJWGyfFBy3LWfge7Kw3Yrh89ZS01tUKMIQ== dependencies: - tldts-core "^5.6.64" + tldts-core "^5.7.6" tmpl@1.0.x: version "1.0.4" @@ -4868,6 +5077,11 @@ type-fest@^0.13.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -4912,11 +5126,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -4930,29 +5139,30 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -update-notifier@^4.1.1: - version "4.1.3" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" - integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== +update-notifier@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== dependencies: - boxen "^4.2.0" - chalk "^3.0.0" + boxen "^5.0.0" + chalk "^4.1.0" configstore "^5.0.1" has-yarn "^2.1.0" import-lazy "^2.1.0" is-ci "^2.0.0" - is-installed-globally "^0.3.1" - is-npm "^4.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" is-yarn-global "^0.3.0" - latest-version "^5.0.0" - pupa "^2.0.1" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" semver-diff "^3.1.1" xdg-basedir "^4.0.0" uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" - integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" @@ -4999,9 +5209,9 @@ v8-compile-cache@^2.0.3: integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== v8-to-istanbul@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc" - integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA== + version "7.1.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" + integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5015,7 +5225,7 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -verror@1.10.0: +verror@1.10.0, verror@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= @@ -5141,9 +5351,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.2.3: - version "7.4.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" - integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== + version "7.4.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" + integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== xdg-basedir@^4.0.0: version "4.0.0" @@ -5155,11 +5365,26 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +xmlbuilder@>=11.0.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xmldom@0.1.x: + version "0.1.31" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" + integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== + y18n@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" @@ -5205,7 +5430,7 @@ yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.3: +yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix index 6f92c3a385c..e4bfdf72617 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -10,155 +10,147 @@ }; } { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; }; } { - name = "_babel_core___core_7.12.10.tgz"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { - name = "_babel_core___core_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz"; - sha1 = "b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } { - name = "_babel_generator___generator_7.12.10.tgz"; + name = "_babel_core___core_7.12.16.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz"; - sha1 = "2b188fc329fb8e4f762181703beffc0fe6df3460"; + name = "_babel_core___core_7.12.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz"; + sha1 = "8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + name = "_babel_generator___generator_7.12.15.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + name = "_babel_generator___generator_7.12.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz"; + sha1 = "4617b5d0b25cc572474cc1aafee1edeaf9b5368f"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.10.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; - sha1 = "b158817a3165b5faa2047825dfa61970ddcc16cf"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.7.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; - sha1 = "aa77bd0396ec8114e5e30787efa78599d874a855"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.16.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz"; + sha1 = "41e0916b99f8d5f43da4f05d85f4930fa3d62b22"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; + name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; + sha1 = "ec67e4404f41750463e455cc3203f6a32e93fcb0"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.10.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; - sha1 = "94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; + sha1 = "01afb052dcad2044289b7b20beb3fa8bd0265bea"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha1 = "2f75a831269d4f677de49986dff59927533cf375"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; - sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; + sha1 = "174254d0f2424d8aefb4dd48057511247b0a9eeb"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; + sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121"; }; } { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; + name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; + sha1 = "8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; }; } { - name = "_babel_helpers___helpers_7.12.5.tgz"; + name = "_babel_helpers___helpers_7.12.13.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; - sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; + name = "_babel_helpers___helpers_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz"; + sha1 = "3c75e993632e4dadc0274eae219c73eb7645ba47"; }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; + name = "_babel_highlight___highlight_7.12.13.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + name = "_babel_highlight___highlight_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz"; + sha1 = "8ab538393e00370b26271b01fa08f7f27f2e795c"; }; } { - name = "_babel_parser___parser_7.12.10.tgz"; + name = "_babel_parser___parser_7.12.16.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz"; - sha1 = "824600d59e96aea26a5a2af5a9d812af05c3ae81"; - }; - } - { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; - sha1 = "e02f0ea1b5dc59d401ec16fb824679f683d3303c"; + name = "_babel_parser___parser_7.12.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz"; + sha1 = "cc31257419d2c3189d394081635703f549fc1ed4"; }; } { @@ -178,11 +170,11 @@ }; } { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; }; } { @@ -250,35 +242,35 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; }; } { - name = "_babel_template___template_7.12.7.tgz"; + name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { - name = "_babel_template___template_7.12.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz"; - sha1 = "c817233696018e39fbb6c491d2fb684e05ed43bc"; + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; }; } { - name = "_babel_traverse___traverse_7.12.10.tgz"; + name = "_babel_traverse___traverse_7.12.13.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz"; - sha1 = "2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"; + name = "_babel_traverse___traverse_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz"; + sha1 = "689f0e4b4c08587ad26622832632735fb8c4e0c0"; }; } { - name = "_babel_types___types_7.12.10.tgz"; + name = "_babel_types___types_7.12.13.tgz"; path = fetchurl { - name = "_babel_types___types_7.12.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz"; - sha1 = "7965e4a7260b26f09c56bcfcb0498af1f6d9b260"; + name = "_babel_types___types_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz"; + sha1 = "8be1aa8f2c876da11a9cf650c0ecf656913ad611"; }; } { @@ -290,35 +282,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.18.8.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.20.0.tgz"; + path = fetchurl { + name = "_cliqz_adblocker_content___adblocker_content_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.0.tgz"; + sha1 = "fcfa2845a577ba8d9af282afbae2fc437b3f1c70"; + }; + } + { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.0.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.18.8.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz"; - sha1 = "96473f14c098a20091298d34a6addcd430aceebd"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.0.tgz"; + sha1 = "997b694fbb1b1206e04b1fd570690234cc7ef630"; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.18.8.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.20.0.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.18.8.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz"; - sha1 = "c2058647e015b6f61c222e7d58040347324c63b0"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.0.tgz"; + sha1 = "bacfb9feaf1d3dab339b992e3defa111a4b5ed3c"; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.18.8.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.0.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.18.8.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz"; - sha1 = "5f697c5dc65cd936b3908078a6e4516ec995567a"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.0.tgz"; + sha1 = "95ede657b670f627b39f92d85a97093cecee6ffe"; }; } { - name = "_cliqz_adblocker___adblocker_1.18.8.tgz"; + name = "_cliqz_adblocker___adblocker_1.20.0.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.18.8.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz"; - sha1 = "f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9"; + name = "_cliqz_adblocker___adblocker_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.0.tgz"; + sha1 = "514746e9ee72fcd886f1e2e1aaf13b28fc63f232"; }; } { @@ -338,19 +338,27 @@ }; } { - name = "_electron_get___get_1.12.2.tgz"; + name = "_electron_get___get_1.12.4.tgz"; + path = fetchurl { + name = "_electron_get___get_1.12.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz"; + sha1 = "a5971113fc1bf8fa12a8789dc20152a7359f06ab"; + }; + } + { + name = "_electron_universal___universal_1.0.4.tgz"; path = fetchurl { - name = "_electron_get___get_1.12.2.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz"; - sha1 = "6442066afb99be08cefb9a281e4b4692b33764f3"; + name = "_electron_universal___universal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz"; + sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5"; }; } { - name = "_eslint_eslintrc___eslintrc_0.2.2.tgz"; + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz"; - sha1 = "d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"; + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; }; } { @@ -362,11 +370,11 @@ }; } { - name = "_istanbuljs_schema___schema_0.1.2.tgz"; + name = "_istanbuljs_schema___schema_0.1.3.tgz"; path = fetchurl { - name = "_istanbuljs_schema___schema_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; - sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; + name = "_istanbuljs_schema___schema_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz"; + sha1 = "e45e384e4b8ec16bce2fd903af78450f6bf7ec98"; }; } { @@ -458,51 +466,59 @@ }; } { - name = "_remusao_guess_url_type___guess_url_type_1.2.0.tgz"; + name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; + sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + }; + } + { + name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; path = fetchurl { - name = "_remusao_guess_url_type___guess_url_type_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.0.tgz"; - sha1 = "fb1402b4c47266161501704d74427b8d49e4b3e4"; + name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz"; + sha1 = "b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57"; }; } { - name = "_remusao_small___small_1.2.0.tgz"; + name = "_remusao_small___small_1.2.1.tgz"; path = fetchurl { - name = "_remusao_small___small_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.0.tgz"; - sha1 = "1f56d59418d4c121cd8814e4bea5ed95dcf4b7a9"; + name = "_remusao_small___small_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.1.tgz"; + sha1 = "63bfe4548832289f94ac868a0c305970c9a0e5f9"; }; } { - name = "_remusao_smaz_compress___smaz_compress_1.9.0.tgz"; + name = "_remusao_smaz_compress___smaz_compress_1.9.1.tgz"; path = fetchurl { - name = "_remusao_smaz_compress___smaz_compress_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.0.tgz"; - sha1 = "ec79c87f5780865da616cd214b3b8978807d1e9a"; + name = "_remusao_smaz_compress___smaz_compress_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.1.tgz"; + sha1 = "fc75eaf9bcac2d58bc4c3d518183a7cb9612d275"; }; } { - name = "_remusao_smaz_decompress___smaz_decompress_1.9.0.tgz"; + name = "_remusao_smaz_decompress___smaz_decompress_1.9.1.tgz"; path = fetchurl { - name = "_remusao_smaz_decompress___smaz_decompress_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.0.tgz"; - sha1 = "9b3fba7c8e0c2045de63fd0ad0e5b37b447bb7cf"; + name = "_remusao_smaz_decompress___smaz_decompress_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.1.tgz"; + sha1 = "8094f997e8fb591a678cda9cf08c209c825eba5b"; }; } { - name = "_remusao_smaz___smaz_1.9.0.tgz"; + name = "_remusao_smaz___smaz_1.9.1.tgz"; path = fetchurl { - name = "_remusao_smaz___smaz_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.0.tgz"; - sha1 = "d02c2fb007483d4b4d050fb2fdaf523fcef08d40"; + name = "_remusao_smaz___smaz_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.1.tgz"; + sha1 = "a2b9b045385f81e1615a68d932b7cc8b04c9db8d"; }; } { - name = "_remusao_trie___trie_1.4.0.tgz"; + name = "_remusao_trie___trie_1.4.1.tgz"; path = fetchurl { - name = "_remusao_trie___trie_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.0.tgz"; - sha1 = "b439210445339f0ca95ff200d98b898d431a4ce1"; + name = "_remusao_trie___trie_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz"; + sha1 = "755d09f8a007476334e611f42719b2d581f00720"; }; } { @@ -514,11 +530,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.1.tgz"; + name = "_sinonjs_commons___commons_1.8.2.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + name = "_sinonjs_commons___commons_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz"; + sha1 = "858f5c4b48d80778fde4b9d541f27edc0d56488b"; }; } { @@ -570,11 +586,11 @@ }; } { - name = "_types_chrome___chrome_0.0.126.tgz"; + name = "_types_chrome___chrome_0.0.128.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.126.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.126.tgz"; - sha1 = "f9f3436712f0c7c12ea9798abc9b95575ad7b23a"; + name = "_types_chrome___chrome_0.0.128.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.128.tgz"; + sha1 = "5dbd8b2539a367353fbe4386f119b510105f8b6a"; }; } { @@ -610,19 +626,27 @@ }; } { - name = "_types_fs_extra___fs_extra_9.0.5.tgz"; + name = "_types_fs_extra___fs_extra_9.0.7.tgz"; + path = fetchurl { + name = "_types_fs_extra___fs_extra_9.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz"; + sha1 = "a9ef2ffdab043def080c5bec94c03402f793577f"; + }; + } + { + name = "_types_glob___glob_7.1.3.tgz"; path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.5.tgz"; - sha1 = "2afb76a43a4bef80a363b94b314d0ca1694fc4f8"; + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } { - name = "_types_graceful_fs___graceful_fs_4.1.4.tgz"; + name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; path = fetchurl { - name = "_types_graceful_fs___graceful_fs_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"; - sha1 = "4ff9f641a7c6d1a3508ff88bc3141b152772e753"; + name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; + sha1 = "21ffba0d98da4350db64891f92a9e5db3cdb4e15"; }; } { @@ -658,19 +682,27 @@ }; } { - name = "_types_node___node_14.14.13.tgz"; + name = "_types_minimatch___minimatch_3.0.3.tgz"; path = fetchurl { - name = "_types_node___node_14.14.13.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz"; - sha1 = "9e425079799322113ae8477297ae6ef51b8e0cdf"; + name = "_types_minimatch___minimatch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; }; } { - name = "_types_node___node_12.19.9.tgz"; + name = "_types_node___node_14.14.27.tgz"; path = fetchurl { - name = "_types_node___node_12.19.9.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz"; - sha1 = "990ad687ad8b26ef6dcc34a4f69c33d40c95b679"; + name = "_types_node___node_14.14.27.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.27.tgz"; + sha1 = "c7127f8da0498993e13b1a42faf1303d3110d2f2"; + }; + } + { + name = "_types_node___node_12.20.0.tgz"; + path = fetchurl { + name = "_types_node___node_12.20.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.0.tgz"; + sha1 = "692dfdecd6c97f5380c42dd50f19261f9f604deb"; }; } { @@ -682,11 +714,19 @@ }; } { - name = "_types_prettier___prettier_2.1.5.tgz"; + name = "_types_plist___plist_3.0.2.tgz"; + path = fetchurl { + name = "_types_plist___plist_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; + sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + }; + } + { + name = "_types_prettier___prettier_2.2.1.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz"; - sha1 = "b6ab3bba29e16b821d84e09ecfaded462b816b00"; + name = "_types_prettier___prettier_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz"; + sha1 = "374e31645d58cb18a07b3ecd8e9dede4deb2cccd"; }; } { @@ -698,19 +738,27 @@ }; } { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + name = "_types_verror___verror_1.10.4.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + name = "_types_verror___verror_1.10.4.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz"; + sha1 = "805c0612b3a0c124cf99f517364142946b74ba3b"; }; } { - name = "_types_yargs___yargs_15.0.11.tgz"; + name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz"; - sha1 = "361d7579ecdac1527687bcebf9946621c12ab78c"; + name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha1 = "dd3e6699ba3237f0348cd085e4698780204842f9"; + }; + } + { + name = "_types_yargs___yargs_15.0.13.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_15.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz"; + sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; }; } { @@ -769,6 +817,14 @@ sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } + { + name = "ajv___ajv_7.1.0.tgz"; + path = fetchurl { + name = "ajv___ajv_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz"; + sha1 = "f982ea7933dc7f1012eae9eec5a86687d805421b"; + }; + } { name = "ansi_align___ansi_align_3.0.0.tgz"; path = fetchurl { @@ -793,6 +849,14 @@ sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; }; } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } { name = "ansi_regex___ansi_regex_4.1.0.tgz"; path = fetchurl { @@ -842,19 +906,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; + name = "app_builder_bin___app_builder_bin_3.5.12.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz"; - sha1 = "4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"; + name = "app_builder_bin___app_builder_bin_3.5.12.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz"; + sha1 = "bbe174972cc1f481f73d6d92ad47a8b4c7eb4530"; }; } { - name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; + name = "app_builder_lib___app_builder_lib_22.10.4.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz"; - sha1 = "ccb8f1a02b628514a5dfab9401fa2a976689415c"; + name = "app_builder_lib___app_builder_lib_22.10.4.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz"; + sha1 = "3fc70821b76beb9c8279d9de22960ef2174da153"; }; } { @@ -866,11 +930,11 @@ }; } { - name = "archiver___archiver_5.1.0.tgz"; + name = "archiver___archiver_5.2.0.tgz"; path = fetchurl { - name = "archiver___archiver_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz"; - sha1 = "05b0f6f7836f3e6356a0532763d2bb91017a7e37"; + name = "archiver___archiver_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; + sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; }; } { @@ -913,6 +977,14 @@ sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; } + { + name = "asar___asar_3.0.3.tgz"; + path = fetchurl { + name = "asar___asar_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz"; + sha1 = "1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"; + }; + } { name = "asn1___asn1_0.2.4.tgz"; path = fetchurl { @@ -938,11 +1010,11 @@ }; } { - name = "astral_regex___astral_regex_1.0.0.tgz"; + name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; }; } { @@ -1034,11 +1106,11 @@ }; } { - name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.1.tgz"; path = fetchurl { - name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; - sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77"; + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"; + sha1 = "b4399239b89b2a011f9ddbe3e4f401fc40cff73b"; }; } { @@ -1082,11 +1154,11 @@ }; } { - name = "bl___bl_4.0.3.tgz"; + name = "bl___bl_4.1.0.tgz"; path = fetchurl { - name = "bl___bl_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; - sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; }; } { @@ -1114,11 +1186,11 @@ }; } { - name = "boxen___boxen_4.2.0.tgz"; + name = "boxen___boxen_5.0.0.tgz"; path = fetchurl { - name = "boxen___boxen_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz"; - sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64"; + name = "boxen___boxen_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz"; + sha1 = "64fe9b16066af815f51057adcc800c3730120854"; }; } { @@ -1169,6 +1241,14 @@ sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; } + { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; + sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + }; + } { name = "buffer_from___buffer_from_1.1.1.tgz"; path = fetchurl { @@ -1186,19 +1266,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz"; - sha1 = "d93afc71428a12789b437e13850e1fa7da956d72"; + name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz"; + sha1 = "0aaafa52d25295c939496f62231ca9ff06c30e40"; }; } { - name = "builder_util___builder_util_22.9.1.tgz"; + name = "builder_util___builder_util_22.10.4.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.9.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz"; - sha1 = "b7087a5cde477f90d718ca5d7fafb6ae261b16af"; + name = "builder_util___builder_util_22.10.4.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz"; + sha1 = "54e8be83dd0dec28073d866ff087cee8e7ce6cf6"; }; } { @@ -1265,14 +1345,6 @@ sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } - { - name = "chalk___chalk_3.0.0.tgz"; - path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; - }; - } { name = "chalk___chalk_4.1.0.tgz"; path = fetchurl { @@ -1329,6 +1401,14 @@ sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; }; } + { + name = "cli_truncate___cli_truncate_1.1.0.tgz"; + path = fetchurl { + name = "cli_truncate___cli_truncate_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + }; + } { name = "cliui___cliui_6.0.0.tgz"; path = fetchurl { @@ -1409,6 +1489,14 @@ sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; }; } + { + name = "colors___colors_1.0.3.tgz"; + path = fetchurl { + name = "colors___colors_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + } { name = "combined_stream___combined_stream_1.0.8.tgz"; path = fetchurl { @@ -1417,6 +1505,22 @@ sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; }; } + { + name = "commander___commander_2.9.0.tgz"; + path = fetchurl { + name = "commander___commander_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + } + { + name = "commander___commander_5.1.0.tgz"; + path = fetchurl { + name = "commander___commander_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; + sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + }; + } { name = "component_emitter___component_emitter_1.3.0.tgz"; path = fetchurl { @@ -1482,11 +1586,11 @@ }; } { - name = "core_js___core_js_3.8.1.tgz"; + name = "core_js___core_js_3.8.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz"; - sha1 = "f51523668ac8a294d1285c3b9db44025fda66d47"; + name = "core_js___core_js_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz"; + sha1 = "c21906e1f14f3689f93abcc6e26883550dd92dd0"; }; } { @@ -1506,11 +1610,19 @@ }; } { - name = "crc32_stream___crc32_stream_4.0.1.tgz"; + name = "crc32_stream___crc32_stream_4.0.2.tgz"; path = fetchurl { - name = "crc32_stream___crc32_stream_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz"; - sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; + name = "crc32_stream___crc32_stream_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz"; + sha1 = "c922ad22b38395abe9d3870f02fa8134ed709007"; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; }; } { @@ -1562,11 +1674,11 @@ }; } { - name = "darkreader___darkreader_4.9.26.tgz"; + name = "darkreader___darkreader_4.9.27.tgz"; path = fetchurl { - name = "darkreader___darkreader_4.9.26.tgz"; - url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.26.tgz"; - sha1 = "ad92139742f22fc406ae14d12ec6e5672a7eedde"; + name = "darkreader___darkreader_4.9.27.tgz"; + url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.27.tgz"; + sha1 = "69b641d6a3c22b07fb0424406dfd9a3661b37197"; }; } { @@ -1601,6 +1713,14 @@ sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; }; } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } { name = "decamelize___decamelize_1.2.0.tgz"; path = fetchurl { @@ -1730,11 +1850,27 @@ }; } { - name = "dmg_builder___dmg_builder_22.9.1.tgz"; + name = "dir_compare___dir_compare_2.4.0.tgz"; + path = fetchurl { + name = "dir_compare___dir_compare_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; + sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + }; + } + { + name = "dmg_builder___dmg_builder_22.10.4.tgz"; + path = fetchurl { + name = "dmg_builder___dmg_builder_22.10.4.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.4.tgz"; + sha1 = "8dab30754346791eb728091359558fd4a8dbb45f"; + }; + } + { + name = "dmg_license___dmg_license_1.0.8.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.9.1.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz"; - sha1 = "64647224f37ee47fc9bd01947c21cc010a30511f"; + name = "dmg_license___dmg_license_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.8.tgz"; + sha1 = "d52e234815f1a07a59706e5f2a2fea71991cf784"; }; } { @@ -1794,35 +1930,35 @@ }; } { - name = "ejs___ejs_3.1.5.tgz"; + name = "ejs___ejs_3.1.6.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; - sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; + name = "ejs___ejs_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; + sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; }; } { - name = "electron_builder___electron_builder_22.9.1.tgz"; + name = "electron_builder___electron_builder_22.10.4.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.9.1.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz"; - sha1 = "a2962db6f2757bc01d02489f38fafe0809f68f60"; + name = "electron_builder___electron_builder_22.10.4.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.4.tgz"; + sha1 = "e1f400cf41ebb632fbf79aa86c5e0ab1ea1ed7e5"; }; } { - name = "electron_publish___electron_publish_22.9.1.tgz"; + name = "electron_publish___electron_publish_22.10.4.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.9.1.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz"; - sha1 = "7cc76ac4cc53efd29ee31c1e5facb9724329068e"; + name = "electron_publish___electron_publish_22.10.4.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz"; + sha1 = "944b00aa6a7746c31ce900ffd8106d243326dca8"; }; } { - name = "electron___electron_11.1.0.tgz"; + name = "electron___electron_11.2.3.tgz"; path = fetchurl { - name = "electron___electron_11.1.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz"; - sha1 = "8dfdf579d1eb79feef3e3d2937fc022e72129c90"; + name = "electron___electron_11.2.3.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz"; + sha1 = "8ad1d9858436cfca0e2e5ea7fea326794ae58ebb"; }; } { @@ -1978,11 +2114,11 @@ }; } { - name = "eslint___eslint_7.15.0.tgz"; + name = "eslint___eslint_7.20.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.15.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz"; - sha1 = "eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"; + name = "eslint___eslint_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz"; + sha1 = "db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7"; }; } { @@ -2002,11 +2138,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -2202,11 +2338,11 @@ }; } { - name = "filelist___filelist_1.0.1.tgz"; + name = "filelist___filelist_1.0.2.tgz"; path = fetchurl { - name = "filelist___filelist_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz"; - sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; + name = "filelist___filelist_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; + sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; }; } { @@ -2242,11 +2378,11 @@ }; } { - name = "flatted___flatted_3.1.0.tgz"; + name = "flatted___flatted_3.1.1.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; - sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; }; } { @@ -2298,11 +2434,11 @@ }; } { - name = "fs_extra___fs_extra_9.0.1.tgz"; + name = "fs_extra___fs_extra_9.1.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz"; - sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc"; + name = "fs_extra___fs_extra_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; + sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; }; } { @@ -2314,11 +2450,11 @@ }; } { - name = "fsevents___fsevents_2.2.1.tgz"; + name = "fsevents___fsevents_2.3.2.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz"; - sha1 = "1fb02ded2036a8ac288d507a65962bd87b97628d"; + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; }; } { @@ -2418,11 +2554,11 @@ }; } { - name = "global_dirs___global_dirs_2.0.1.tgz"; + name = "global_dirs___global_dirs_3.0.0.tgz"; path = fetchurl { - name = "global_dirs___global_dirs_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz"; - sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; + name = "global_dirs___global_dirs_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; + sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; }; } { @@ -2466,11 +2602,19 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + }; + } + { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; } { @@ -2570,11 +2714,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; + name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; - sha1 = "a30727385ea85acfcee94e0aad9e368c792e036c"; + name = "hosted_git_info___hosted_git_info_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; + sha1 = "6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"; }; } { @@ -2625,6 +2769,14 @@ sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; }; } + { + name = "iconv_corefoundation___iconv_corefoundation_1.1.5.tgz"; + path = fetchurl { + name = "iconv_corefoundation___iconv_corefoundation_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.5.tgz"; + sha1 = "90596d444a579aeb109f5ca113f6bb665a41be2b"; + }; + } { name = "iconv_lite___iconv_lite_0.4.24.tgz"; path = fetchurl { @@ -2658,11 +2810,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.2.tgz"; + name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; - sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; }; } { @@ -2705,6 +2857,14 @@ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; }; } + { + name = "ini___ini_2.0.0.tgz"; + path = fetchurl { + name = "ini___ini_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; + sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + }; + } { name = "ini___ini_1.3.8.tgz"; path = fetchurl { @@ -2866,19 +3026,19 @@ }; } { - name = "is_installed_globally___is_installed_globally_0.3.2.tgz"; + name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; - sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141"; + name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; + sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; }; } { - name = "is_npm___is_npm_4.0.0.tgz"; + name = "is_npm___is_npm_5.0.0.tgz"; path = fetchurl { - name = "is_npm___is_npm_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz"; - sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d"; + name = "is_npm___is_npm_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; + sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; }; } { @@ -3369,6 +3529,14 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { @@ -3394,11 +3562,11 @@ }; } { - name = "json5___json5_2.1.3.tgz"; + name = "json5___json5_2.2.0.tgz"; path = fetchurl { - name = "json5___json5_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; }; } { @@ -3682,27 +3850,27 @@ }; } { - name = "mime_db___mime_db_1.44.0.tgz"; + name = "mime_db___mime_db_1.45.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + name = "mime_db___mime_db_1.45.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; + sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; }; } { - name = "mime_types___mime_types_2.1.27.tgz"; + name = "mime_types___mime_types_2.1.28.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + name = "mime_types___mime_types_2.1.28.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz"; + sha1 = "1160c4757eab2c5363888e005273ecf79d2a0ecd"; }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.5.0.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz"; + sha1 = "2b4af934401779806ee98026bb42e8c1ae1876b1"; }; } { @@ -3793,6 +3961,14 @@ sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; }; } + { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; + sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + }; + } { name = "node_int64___node_int64_0.4.0.tgz"; path = fetchurl { @@ -3810,11 +3986,11 @@ }; } { - name = "node_notifier___node_notifier_8.0.0.tgz"; + name = "node_notifier___node_notifier_8.0.1.tgz"; path = fetchurl { - name = "node_notifier___node_notifier_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz"; - sha1 = "a7eee2d51da6d0f7ff5094bc7108c911240c1620"; + name = "node_notifier___node_notifier_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; + sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; }; } { @@ -3825,6 +4001,14 @@ sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; }; } + { + name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz"; + sha1 = "1f8a7c423b3d2e85eb36985eaf81de381d01301a"; + }; + } { name = "normalize_path___normalize_path_2.1.1.tgz"; path = fetchurl { @@ -4018,11 +4202,11 @@ }; } { - name = "parse_json___parse_json_5.1.0.tgz"; + name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; - sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; }; } { @@ -4129,6 +4313,14 @@ sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; }; } + { + name = "plist___plist_3.0.1.tgz"; + path = fetchurl { + name = "plist___plist_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz"; + sha1 = "a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"; + }; + } { name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; path = fetchurl { @@ -4401,6 +4593,14 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } { name = "require_main_filename___require_main_filename_2.0.0.tgz"; path = fetchurl { @@ -4442,11 +4642,11 @@ }; } { - name = "resolve___resolve_1.19.0.tgz"; + name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; - sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; }; } { @@ -4682,11 +4882,27 @@ }; } { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; + name = "slice_ansi___slice_ansi_1.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; + sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + }; + } + { + name = "smart_buffer___smart_buffer_4.1.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + name = "smart_buffer___smart_buffer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz"; + sha1 = "91605c25d91652f4661ea69ccf45f1b331ca21ba"; }; } { @@ -4730,11 +4946,11 @@ }; } { - name = "source_map_url___source_map_url_0.4.0.tgz"; + name = "source_map_url___source_map_url_0.4.1.tgz"; path = fetchurl { - name = "source_map_url___source_map_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; }; } { @@ -4865,6 +5081,14 @@ sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; }; } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } { name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { @@ -4897,6 +5121,14 @@ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; }; } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } { name = "strip_ansi___strip_ansi_5.2.0.tgz"; path = fetchurl { @@ -4994,19 +5226,19 @@ }; } { - name = "table___table_5.4.6.tgz"; + name = "table___table_6.0.7.tgz"; path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + name = "table___table_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; + sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; }; } { - name = "tar_stream___tar_stream_2.1.4.tgz"; + name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; - sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { @@ -5017,14 +5249,6 @@ sha1 = "686885d635f872748e384e871855958470aeb18a"; }; } - { - name = "term_size___term_size_2.2.1.tgz"; - path = fetchurl { - name = "term_size___term_size_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz"; - sha1 = "2a6a54840432c2fb6320fea0f415531e90189f54"; - }; - } { name = "terminal_link___terminal_link_2.1.1.tgz"; path = fetchurl { @@ -5058,19 +5282,19 @@ }; } { - name = "tldts_core___tldts_core_5.6.64.tgz"; + name = "tldts_core___tldts_core_5.7.6.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.6.64.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.64.tgz"; - sha1 = "0f80d0c9607d7583acc477a10dae7e62e7c08063"; + name = "tldts_core___tldts_core_5.7.6.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.6.tgz"; + sha1 = "af99b4ab79761dfa6c44d1d61a3f76bb5c3def8b"; }; } { - name = "tldts_experimental___tldts_experimental_5.6.64.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.6.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.6.64.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.64.tgz"; - sha1 = "f867449964d94c6a17a499335658f42a9fbdc7d3"; + name = "tldts_experimental___tldts_experimental_5.7.6.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.6.tgz"; + sha1 = "10c255872af89ab68659c3a345c7a65015920024"; }; } { @@ -5225,6 +5449,14 @@ sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; }; } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } { name = "type_fest___type_fest_0.6.0.tgz"; path = fetchurl { @@ -5281,14 +5513,6 @@ sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; }; } - { - name = "universalify___universalify_1.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz"; - sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d"; - }; - } { name = "universalify___universalify_2.0.0.tgz"; path = fetchurl { @@ -5306,19 +5530,19 @@ }; } { - name = "update_notifier___update_notifier_4.1.3.tgz"; + name = "update_notifier___update_notifier_5.1.0.tgz"; path = fetchurl { - name = "update_notifier___update_notifier_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz"; - sha1 = "be86ee13e8ce48fb50043ff72057b5bd598e1ea3"; + name = "update_notifier___update_notifier_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; + sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; }; } { - name = "uri_js___uri_js_4.4.0.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -5386,11 +5610,11 @@ }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; - sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz"; + sha1 = "5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"; }; } { @@ -5546,11 +5770,11 @@ }; } { - name = "ws___ws_7.4.1.tgz"; + name = "ws___ws_7.4.3.tgz"; path = fetchurl { - name = "ws___ws_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz"; - sha1 = "a333be02696bd0e54cea0434e21dcc8a9ac294bb"; + name = "ws___ws_7.4.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz"; + sha1 = "1f9643de34a543b8edb124bdcbc457ae55a6e5cd"; }; } { @@ -5569,6 +5793,22 @@ sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; }; } + { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; + sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + }; + } + { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + } { name = "xmlchars___xmlchars_2.2.0.tgz"; path = fetchurl { @@ -5577,6 +5817,14 @@ sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; }; } + { + name = "xmldom___xmldom_0.1.31.tgz"; + path = fetchurl { + name = "xmldom___xmldom_0.1.31.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz"; + sha1 = "b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"; + }; + } { name = "y18n___y18n_4.0.1.tgz"; path = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 2fe27c16720..57a4155e179 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.5.2115.87-1"; + version = "3.6.2165.36-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0m0w2sj6kdd2b67f3kfcf4qyyxhqnmi2qzjwmqpmns9a485s6bn0"; + sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08"; }; unpackPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/calls/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/calls/default.nix index 01797397f4e..fcd27eceaa8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -19,9 +19,7 @@ , dbus , vala , wrapGAppsHook -, xorg , xvfb_run -, libxml2 }: stdenv.mkDerivation rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/charles/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/charles/default.nix index 03d1911333e..1dd0b408a13 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 8460322f05b..effd1eae490 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.12.7"; + version = "2.12.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-bMbfFAI4oGZc7FOlU8LczbjAq1cYmJg5WTXkQKS9vgo="; + sha256 = "sha256-WfyP48qOdFZfQ0+8AZDYokw7WK7lSx5di7z07gsRPZk="; }; vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE="; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index c3e9a774fa9..f1c98e0ed84 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "1.8.3"; - commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; + version = "1.8.6"; + commit = "28aea3dfdede00443b52cc584814d80e8f896200"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-do5DAxaQ1gBdvNN/YGKAkmkFcJ+j/ojBaWPwrXXQko0="; + sha256 = "sha256-kJ3/1owK5T+FbcvjmK2CO+i/KwmVZRSGzF6fCt8J9E8="; }; - vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4="; + vendorSha256 = "sha256-rZ/ox180h9scocheYtMmKkoHY2/jH+I++vYX8R0fdlA="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index 728e23ff380..dcb6b823667 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-1sak6CaqFhiBIoaa7kERXLHsgn24oMgBlOJaQDuF61E="; + sha256 = "sha256-D549pInoK8ispgcn8LYdix19Hp7wO6w2/d2Y1L/9Px8="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index de032cc60e9..a251886ebdd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index a45f3553b92..d82c6b45742 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; + sha256 = "1yrjgjagh7jfzgvnj9wr71mk34x7yf66fwyby73f1pfi2cg49nhp"; }; - vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; + vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr"; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 4a8f42e3cc7..e0ae7636f60 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-/go8V1EjY/iL3csoNpPyeWORvWCf0WnnaSOgiZ8UFQ8="; + sha256 = "sha256-pI/LGAjTWFXiDKSV+dZl0wXK/TZmN9DuWf5Nu8EYNYc="; }; - vendorSha256 = "sha256-GEU0Q2Elhiel20xvup+i1DSXCjQdA9s7cWykcbKR5KA="; + vendorSha256 = "sha256-Q8gIhJSZqdjBXrIcJfCd25BniDScwVzUwZ9Vc8p/z3c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 4f3dfcfc03f..659e8ee4170 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix new file mode 100644 index 00000000000..edd19a25f9b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix new file mode 100644 index 00000000000..ce6491bfba4 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix new file mode 100644 index 00000000000..661048a0c72 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix new file mode 100644 index 00000000000..d53abe3569c --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix new file mode 100644 index 00000000000..edad7fa1bc9 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 72fcc2f9c35..5ac152c849b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index a7d99fc5bd5..1c7a39d91bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix new file mode 100644 index 00000000000..78cbaca80ab --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kube-capacity"; + version = "0.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "robscott"; + repo = pname; + sha256 = "127583hmpj04y522wir76a39frm6zg9z7mb4ny5lxxjqhn0q0cd5"; + }; + + vendorSha256 = "sha256-EgLWZs282IV1euCUCc5ucf267E2Z7GF9SgoImiGvuVM="; + + meta = with lib; { + description = + "A simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster"; + homepage = "https://github.com/robscott/kube-capacity"; + changelog = "https://github.com/robscott/kube-capacity/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index 8e20093f5b2..586fc6cf806 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "1.1.0"; + version = "1.1.1"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "0nsd371w667qhgiygxcg4kmynwldb0pbip6x03rc7j854hg8l7k0"; + sha256 = "sha256-U7vjWtVXmyEPYFS1fAPOgV3WILGPhWsmoawV7B0pZaE="; }; buildFlagsArray = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix new file mode 100644 index 00000000000..04677cb4277 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-example"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "seredot"; + repo = pname; + rev = "v${version}"; + sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq"; + }; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with lib; { + description = "kubectl plugin for retrieving resource example YAMLs"; + homepage = "https://github.com/seredot/kubectl-example"; + changelog = "https://github.com/seredot/kubectl-example/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index f2071494f16..cf0c8451427 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-sUeXzmgSOkpqzqrX9+wNGj2X7gcf5QSpavXK4MJe8qE="; + sha256 = "sha256-wzaNFM/4V2mWqhkqeT70ieQuhgNK79U2b7PhxKqn/X0="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 81ca2283d20..66ff583e8c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 28f7b540722..b16d0448cad 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -4,26 +4,21 @@ , makeWrapper , buildkit , cni-plugins -, extraPackages ? [] +, extraPackages ? [ ] }: -let - binPath = lib.makeBinPath ([ - buildkit - ] ++ extraPackages); -in buildGoModule rec { pname = "nerdctl"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw="; + sha256 = "sha256-zexvTPEQw7iW1d3ahHmqTn+UaT/bJMlr1sVlWErc2ck="; }; - vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM="; + vendorSha256 = "sha256-bX1GfKbAbdEAnW3kPNsbF/cJWufxvuhm//G88qJ3u08="; nativeBuildInputs = [ makeWrapper ]; @@ -35,17 +30,33 @@ buildGoModule rec { "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision=" ]; + # Many checks require a containerd socket and running nerdctl after it's built + doCheck = false; + postInstall = '' wrapProgram $out/bin/nerdctl \ - --prefix PATH : "${binPath}" \ + --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ --prefix CNI_PATH : "${cni-plugins}/bin" ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + # nerdctl expects XDG_RUNTIME_DIR to be set + export XDG_RUNTIME_DIR=$TMPDIR + + $out/bin/nerdctl --help + # --version will error without containerd.sock access + $out/bin/nerdctl --help | grep "${version}" + runHook postInstallCheck + ''; + meta = with lib; { + homepage = "https://github.com/AkihiroSuda/nerdctl/"; + changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}"; description = "A Docker-compatible CLI for containerd"; - homepage = src.meta.homepage; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ jk ]; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index 3885278f1f1..6515885fd8e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -2,7 +2,6 @@ , poetry2nix , lib , overrides ? (self: super: {}) -, stdenv }: let diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index ffc682ca4d9..e53a9c39ea7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index 6ae59033835..99c43aeeee4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index ebf3cb417d6..453c1406fd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -1,38 +1,53 @@ -{ lib, stdenv, fetchurl }: -let - version = "0.16.3"; +{ lib, stdenv, fetchzip }: - system = stdenv.hostPlatform.system; +let + inherit (stdenv.hostPlatform) system; suffix = { x86_64-linux = "Linux-64bit"; aarch64-linux = "Linux-arm64"; x86_64-darwin = "macOS-64bit"; }."${system}" or (throw "Unsupported system: ${system}"); - baseurl = "https://github.com/vmware-tanzu/octant/releases/download"; - fetchsrc = sha256: fetchurl { - url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; - sha256 = sha256."${system}"; - }; + fetchsrc = version: sha256: fetchzip { + url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; + sha256 = sha256."${system}"; + }; in stdenv.mkDerivation rec { pname = "octant"; - inherit version; + version = "0.17.0"; - src = fetchsrc { - x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x"; - aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs"; - x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz"; + src = fetchsrc version { + x86_64-linux = "sha256-kYS8o97HBjNgwmrG4fjsqFWxZy6ATFOhxt6j3KMZbEc="; + aarch64-linux = "sha256-/Tpna2Y8+PQt+SeOJ9NDweRWGiQXU/sN+Wh/vLYQPwM="; + x86_64-darwin = "sha256-aOUmnD+l/Cc5qTiHxFLBjCatszmPdUc4YYZ6Oy5DT3U="; }; - doCheck = false; + dontConfigure = true; + dontBuild = true; installPhase = '' - mkdir -p "$out/bin" - mv octant $out/bin + runHook preInstall + install -D octant $out/bin/octant + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/octant --help + $out/bin/octant version | grep "${version}" + runHook postInstallCheck ''; + dontPatchELF = true; + dontPatchShebangs = true; + + passthru.updateScript = ./update.sh; + meta = with lib; { + homepage = "https://octant.dev/"; + changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters."; longDescription = '' Octant is a tool for developers to understand how applications run on a Kubernetes cluster. @@ -40,9 +55,8 @@ stdenv.mkDerivation rec { Octant offers a combination of introspective tooling, cluster navigation, and object management along with a plugin system to further extend its capabilities. ''; - homepage = "https://octant.dev/"; license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jk ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index e956715d9b0..988b2d02df9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u+yxAGVVFsZpiexToNDUfQATsYOkKWHkYF9roK0OInY="; + sha256 = "sha256-wis2ECCVXQeD7GiCMJQai+wDM8QJ1j5dPnE5O/I3wpM="; }; - vendorSha256 = "sha256-c5sel3xs4npTENqRQu8d9hUOK1OFQodF3M0ZpUpr1po="; + vendorSha256 = "sha256-T0wDbAl5GXphZIBrM36OwRCojnJ/cbXNqsjtCzUDZ6s="; buildFlagsArray = [ "-ldflags=" "-s" "-w" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh new file mode 100755 index 00000000000..4ffe4aefb30 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/default.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find default.nix in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/octant_${VER}_${ARCH}.tar.gz" + nix-prefetch "{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = \"octant\"; version = \"${VER}\"; + src = fetchzip { url = \"$URL\"; }; +} +" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') + +OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") +OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") +OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") + +sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" + +replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" +replace_sha "x86_64-darwin" "$OCTANT_LINUX_AARCH64_SHA256" +replace_sha "aarch64-linux" "$OCTANT_DARWIN_X64_SHA256" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix index 071636ec443..76230b8e100 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index 928fb351c6a..b042f8ff15f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { "agent/cli-main" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { rev = version; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 163deb1bef8..4fdcdf1ea2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZIAdYuJ8LS8x2h+VXQrkgdmKkw9VKl7FcnOVZNSnXM0="; + sha256 = "sha256-w+xaZPEMmJYDPQG4MuAlWMhwhEyeVcpaeDwqsnIbIHA="; }; vendorSha256 = "sha256-aVKQcRZgxhIph+y28HhR15DUjwiz/4+t1bMrYXjPW7Q="; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index a5b6e7d2f5e..804659e084a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 198a05621a5..4ec886a34fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider index e1f1a0ef38a..f97bbce83fa 100755 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 317666a2c7c..4a6e95057a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/infra/libkookie/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/ @@ -157,8 +157,8 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.6"; - sha256 = "0ba3vd6lswy4pd0qywdbx8cf71j5z3p8p8kdjs9m4qbyrzsbq0fk"; + version = "0.14.7"; + sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la"; vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 9e2b9709afc..6bf2e476163 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.4"; + version = "0.28.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LilIwg3Zu7Zi7AhJeW0j2qUmSOGy1HHjvvB07FUcEeI="; + sha256 = "sha256-pM3R85gdP2eVoXx//2tKePNAi14eM8Ut+eXR+vB0Ukk="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; @@ -22,6 +22,14 @@ buildGoModule rec { "-X main.VERSION=v${version}" ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/terragrunt --help + $out/bin/terragrunt --version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://terragrunt.gruntwork.io"; changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 415a895e523..ccbe9d9a7ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.8"; + version = "0.18.10"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E="; + sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index 3d62a1dcf29..f28754005ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,29 +2,45 @@ buildGoModule rec { pname = "waypoint"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc="; + 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/infra/libkookie/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 55a16f42f16..1b8ff4622f2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I1PaDHPocQuoSOyfnxDWwIR+7S9l/odX4SCeAae/jv8="; + sha256 = "sha256-el94Iq7/+1FfGpqbhKEO6FGpaCxoueoc/+Se+WfT+G0="; }; - vendorSha256 = "sha256-H0i5MoVX5O0CgHOvefDEyzBWvBZvJZUrC9xBq9CHgeE="; + vendorSha256 = "sha256-MSHg1RWjbXm1pf6HTyJL4FcnLuacL9fO1F6zbouVkWg="; subPackages = [ "." ]; + buildFlagsArray = [ "-ldflags=-s -w" ]; + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix index dae9ad3bc33..51f62529e9c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/errbot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/errbot/default.nix index 642677a9add..f4a44275b69 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -1,75 +1,90 @@ -{ lib, fetchFromGitHub, python, glibcLocales }: +{ lib +, ansi +, buildPythonApplication +, colorlog +, daemonize +, deepmerge +, dulwich +, fetchFromGitHub +, flask +, glibcLocales +, hypchat +, irc +, jinja2 +, markdown +, mock +, pyasn1 +, pyasn1-modules +, pygments +, pygments-markdown-lexer +, pyopenssl +, pytestCheckHook +, requests +, slackclient +, sleekxmpp +, telegram +, webtest +}: -let - py = python.override { - packageOverrides = self: super: { - # errbot requires markdown<3, and is not compatible with it either. - markdown = super.markdown.overridePythonAttrs (oldAttrs: rec { - version = "2.6.11"; - src = super.fetchPypi { - pname = "Markdown"; - inherit version; - sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8"; - }; - }); - - # errbot requires slackclient 1.x, see https://github.com/errbotio/errbot/pull/1367 - # latest 1.x release would be 1.3.2, but it requires an older websocket_client than the one in nixpkgs - # so let's just vendor the known-working version until they've migrated to 2.x. - slackclient = super.slackclient.overridePythonAttrs (oldAttrs: rec { - version = "1.2.1"; - pname = "slackclient"; - src = fetchFromGitHub { - owner = "slackapi"; - repo = "python-slackclient"; - rev = version; - sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0"; - }; - - propagatedBuildInputs = with self; [ websocket_client requests six ]; - - checkInputs = with self; [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ]; - # test_server.py fails because it needs connection (I think); - checkPhase = '' - py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py - ''; - }); - }; - }; - -in -py.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "errbot"; - version = "6.1.1"; + version = "6.1.7"; src = fetchFromGitHub { owner = "errbotio"; repo = "errbot"; rev = version; - sha256 = "1s4dl1za5imwsv6j3y7m47dy91hmqd5n221kkqm9ni4mpzgpffz0"; + sha256 = "02h44qd3d91zy657hyqsw3gskgxg31848pw6zpb8dhd1x84z5y77"; }; LC_ALL = "en_US.utf8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with py.pkgs; [ - webtest requests jinja2 flask dulwich - pyopenssl colorlog markdown ansi pygments - daemonize pygments-markdown-lexer telegram irc slackclient - sleekxmpp pyasn1 pyasn1-modules hypchat + + propagatedBuildInputs = [ + ansi + colorlog + daemonize + deepmerge + dulwich + flask + hypchat + irc + jinja2 + markdown + pyasn1 + pyasn1-modules + pygments + pygments-markdown-lexer + pyopenssl + requests + slackclient + sleekxmpp + telegram + webtest + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + # Slack backend test has an import issue + pytestFlagsArray = [ "--ignore=tests/backend_tests/slack_test.py" ]; + + disabledTests = [ + "backup" + "broken_plugin" + "plugin_cycle" ]; - checkInputs = with py.pkgs; [ mock pytest ]; - # avoid tests that do network calls - checkPhase = '' - pytest tests -k 'not backup and not broken_plugin and not plugin_cycle' - ''; + pythonImportsCheck = [ "errbot" ]; meta = with lib; { description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; maintainers = with maintainers; [ fpletz globin ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix index d550a126547..c9339601a4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts -, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index e8a76b3d491..6c135439322 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitLab , meson @@ -17,25 +18,33 @@ , gst_all_1 }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd"; + hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8="; }; - cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA="; + }; patches = [ + # Post install tries to generate an icon cache & update the + # desktop database. The gtk setup hook drop-icon-theme-cache.sh + # would strip out the icon cache and the desktop database wouldn't + # be included in $out. They will generated by xdg.mime.enable & + # gtk.iconCache.enable instead. ./no-post-install.patch ]; postPatch = '' - chmod +x build-aux/cargo.sh patchShebangs . ''; @@ -50,7 +59,11 @@ rustPlatform.buildRustPackage rec { # Provides glib-compile-resources to compile gresources glib - ]; + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); buildInputs = [ gtk3 @@ -72,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/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index d0ce431be76..1438d61f999 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/flexget/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/flexget/default.nix index 2e5713627e4..b58c30aee5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/default.nix index 3d22dca36d9..b3d8a5b3fea 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.17"; + stableVersion = "2.2.18"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "0dfyxr983w6lmbcvaf32bnm9cz7y7fp9jfaz8zxp1dvr6dr06cmv"; - serverSrcHash = "0m5ajd2zkafx89hvp202m351h1dygfc3jssl3m7nd7r42csyi2vj"; + guiSrcHash = "118z6asl6hsv0777rld4plnrwzkbkh3gb9lg9i6bqrjs93p028fw"; + serverSrcHash = "0gd37zpvibhlvqqpflpwlrgg8g9rpbxwi9w9fsym00mfwf7sdd3b"; in { guiStable = mkGui { stable = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/gui.nix index 8eb688bcd56..f206c645ae2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/server.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/server.nix index 5ba6b57d5bd..c9fbe959fde 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -62,6 +62,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/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/snort/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/snort/default.nix index 17ace3021d8..714ca1c8990 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/snort/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index f7b526f29b5..a12e914097c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/infra/libkookie/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.3"; + version = "4.0.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr"; + 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/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix deleted file mode 100644 index 4c8bbcf22c0..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/ike/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/ike/default.nix index 7a8c3d395f6..5ed87334c47 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/ike/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 8023c70fe5f..95bf8c02662 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,6 +1,5 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, json-glib }: +{ lib, fetchFromGitHub, fetchpatch, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, json-glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-facebook"; version = "1.2.1"; @@ -12,6 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; }; + # TODO: This patch should be included with the next release after v1.2.1 + # these lines should be removed when this happens. + patches = [ + (fetchpatch { + name = "FB_ORCA_AGENT_version_bump.patch"; + url = "https://github.com/bitlbee/bitlbee-facebook/commit/49ea312d98b0578b9b2c1ff759e2cfa820a41f4d.patch"; + sha256 = "0nzyyg8pw4f2jcickcpxq7r2la5wgl7q6iz94lhzybrkhss5753d"; + } + ) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ bitlbee json-glib ]; @@ -21,11 +31,11 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "The Facebook protocol plugin for bitlbee"; - homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ toonn ]; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index e58e73fdc85..bb5776b65e3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -1,21 +1,26 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let pname = "deltachat-electron"; - version = "1.3.0"; + version = "1.15.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "1xyp8cg11px8rras12sncjmq85alyvz7ycw1v1py8w8rlz60wkij"; + sha256 = "sha256-lItI1aIFHYQ3wGRVn4Yw0nA7qgfhyHT/43kKbY/1cgI="; }; appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} install -m 444 -D \ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index a5f21f11dfe..caf80c2460f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/infra/libkookie/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.20", + "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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 7da0186022a..f147918cdc5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.20"; + version = "1.7.22"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-kQMswcEGsefQ8HCWxYPgvxOKP5cgvXx8oCl5Inh6sOg="; + sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 6ee48d53288..a75b02ef8a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/infra/libkookie/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.20"; + 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-8R7l/Pmymd5+/Fri7z2/TDj1h2FL0QgLICoXajePing="; + sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index a2d12124dbf..0fea57ea9cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,20 +13,21 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5"; + sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca"; }; - vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a"; + vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx"; doCheck = false; - buildInputs = [ makeWrapper olm ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ olm ]; # Upstream issue: https://github.com/tulir/gomuks/issues/260 patches = lib.optional stdenv.isLinux (substituteAll { @@ -54,8 +55,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; - license = licenses.gpl3; - maintainers = with maintainers; [ charvp emily ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ chvp emily ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix index f3736bfc64f..cbbe74481c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix index cd456b336dd..c0e0c80b459 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -3,8 +3,6 @@ , fetchFromGitLab , pkg-config , cmake -, qtbase -, qttools , qtquickcontrols2 , qtmultimedia , qtgraphicaleffects @@ -26,14 +24,14 @@ mkDerivation rec { pname = "neochat"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ="; + sha256 = "sha256-HvLPsU+fxlyPDP7i9OSnZ/C1RjouOQCp+4WCl6FlFJo="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 57db6a0750e..927f89c9493 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -23,6 +23,9 @@ , olm , pkg-config , nlohmann_json +, voipSupport ? true +, gst_all_1 +, libnice }: mkDerivation rec { @@ -59,12 +62,24 @@ mkDerivation rec { qtquickcontrols2 qtgraphicaleffects qtkeychain - ] ++ lib.optional stdenv.isDarwin qtmacextras; + ] ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optionals voipSupport (with gst_all_1; [ + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt5Support = true; }) + gst-plugins-bad + libnice + ]); cmakeFlags = [ "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; + preFixup = lib.optionalString voipSupport '' + # add gstreamer plugins path to the wrapper + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + meta = with lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2862e4df796..9845491f235 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" ]; - buildFlags = [ "CC=cc" ]; # fix build on darwin + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix build on darwin meta = with lib; { homepage = "https://github.com/matrix-org/purple-matrix"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix index e5221d861d3..6d6e70ff26a 100755 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 601489d4532..0ef024225f6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.7.4"; + version = "0.8.0"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n"; + sha256 = "sha256-0YzeGtdsCUG8N7Av/zzHoC9KKu1rqjQDToaOEXzuoJc="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 19e48bf88d6..e821e182cd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.6"; # Please backport all updates to the stable channel. + version = "1.40.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk"; + sha256 = "0k57r1x64w38n0295qdrf3p19d3z8m530h46ps0j2x0krhah47w7"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 44642ab8a93..8f09c37d25c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 693a01f5d89..566e62ae7f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -3,8 +3,9 @@ , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell -# TODO: Shouldn't be required: -, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst +# Transitive dependencies: +, pcre, xorg, util-linux, libselinux, libsepol, epoxy +, at-spi2-core, libXtst, libthai, libdatrie , xdg-utils }: @@ -22,12 +23,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.5.8"; + 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 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw"; + sha256 = "0wwb18wnh9sbfc6h7m8lj8qmc2n2p0zmp2977ddif6k2gi6qr1y7"; }; postPatch = '' @@ -48,8 +49,9 @@ in mkDerivation rec { dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell tg_owt - # TODO: Shouldn't be required: - pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst + # Transitive dependencies: + pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy + at-spi2-core libXtst libthai libdatrie ]; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index b5a6579db57..7efac01c55a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, xorg, libXtst }: let - rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de"; - sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc"; + rev = "a19877363082da634a3c851a4698376504d2eaee"; + sha256 = "03m6fkc3m2wbh821mr3ybsmd7sjllky44mizny96k4b249dkvzx7"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -23,6 +24,7 @@ in stdenv.mkDerivation { buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + xorg.libX11 libXtst ]; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index bc66d77e224..041ec5e7c5b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix index 668e614c474..e5a2c201d87 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index 4389ee153c5..0224edc652f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index c431b5d0ce6..efb913fca73 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index a177499154e..6b143abda3b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/insync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/insync/default.nix index b52a81932e4..380aad6c329 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/insync/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/ipfs/default.nix index c54b4428819..1b648108e78 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs"; - version = "0.7.0"; + version = "0.8.0"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3"; + sha256 = "sha256-uK3+Ekr5AM6mmGmjFSj1Rotm5pbH657BYUlP9B39WEw="; }; # tarball contains multiple files/directories diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/communi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/communi/default.nix index 030737848a9..0d0144fbf91 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/communi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/communi/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + preConfigure = '' export QMAKEFEATURES=${libcommuni}/features ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index 07e75903546..1042c2d1dee 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -1,8 +1,12 @@ -{ callPackage, luaPackages, python3Packages }: +{ callPackage, luaPackages, perlPackages, python3Packages }: { colorize_nicks = callPackage ./colorize_nicks { }; + multiline = callPackage ./multiline { + inherit (perlPackages) PodParser; + }; + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson luaffi; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix new file mode 100644 index 00000000000..447d415c163 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl, substituteAll, PodParser }: + +stdenv.mkDerivation { + pname = "multiline"; + version = "0.6.3"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl"; + sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4"; + }; + + dontUnpack = true; + prePatch = '' + cp $src multiline.pl + ''; + + patches = [ + # The script requires a special Perl environment. + (substituteAll { + src = ./libpath.patch; + env = PodParser; + }) + ]; + + passthru.scripts = [ "multiline.pl" ]; + + installPhase = '' + runHook preInstall + + install -D multiline.pl $out/share/multiline.pl + + runHook postInstall + ''; + + meta = with lib; { + description = "Multi-line edit box"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch new file mode 100644 index 00000000000..34299f20d8c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch @@ -0,0 +1,9 @@ +diff --git a/multiline.pl b/multiline.pl +index 54474d4..42fbef8 100644 +--- a/multiline.pl ++++ b/multiline.pl +@@ -1,3 +1,4 @@ ++use lib '@env@/lib/perl5/site_perl'; + use strict; use warnings; + $INC{'Encode/ConfigLocal.pm'}=1; + require Encode; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch new file mode 100644 index 00000000000..45e620db258 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 089271812a7..679e278c8a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch deleted file mode 100644 index 7413a9229ce..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/jnetmap/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/jnetmap/default.nix index bac0048cc28..e6332832e3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/jnetmap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index b568775481c..0929c745b21 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -6,18 +6,17 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.3.1"; + version = "1.4.2"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI="; + sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ="; }; propagatedBuildInputs = with python3.pkgs; [ - bugsnag click markdown2 maestral diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index b43e6bb093c..3124239b0d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, fetchurl -, go, ncurses, notmuch, scdoc -, python3, perl, w3m, dante -, fetchFromGitHub +, ncurses, notmuch, scdoc +, python3, w3m, dante }: buildGoModule rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 7eaefdd91c4..4a13cf68a88 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,52 +1,137 @@ -{ lib, config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook -, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo -, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkg-config, poppler, python, shared-mime-info -, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical -# Build options -# TODO: A flag to build the manual. -# TODO: Plugins that complain about their missing dependencies, even when -# provided: -# gdata requires libgdata -# geolocation requires libchamplain -, enableLdap ? false -, enableNetworkManager ? config.networking.networkmanager.enable or false +{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex +, curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info +, glib-networking, gsettings-desktop-schemas + +# Use the experimental gtk3 branch. +, useGtk3 ? false + +# Package compatibility: old parameters whose name were not directly derived , enablePgp ? true -, enablePluginArchive ? false -, enablePluginLitehtmlViewer ? false , enablePluginNotificationDialogs ? true , enablePluginNotificationSounds ? true -, enablePluginPdf ? false -, enablePluginPython ? false -, enablePluginRavatar ? false -, enablePluginRssyl ? false -, enablePluginSmime ? false -, enablePluginSpamassassin ? false -, enablePluginSpamReport ? false -, enablePluginVcalendar ? false -, enableSpellcheck ? false +, enablePluginPdf ? true +, enablePluginRavatar ? true +, enableSpellcheck ? true + +# Arguments to include external libraries +, enableLibSM ? true, libSM +, enableGnuTLS ? true, gnutls +, enableEnchant ? enableSpellcheck, enchant +, enableDbus ? true, dbus, dbus-glib +, enableLdap ? true, openldap +, enableNetworkManager ? true, networkmanager +, enableLibetpan ? true, libetpan +, enableValgrind ? true, valgrind +, enableSvg ? true, librsvg + +# Configure claws-mail's plugins +, enablePluginAcpiNotifier ? true +, enablePluginAddressKeeper ? true +, enablePluginArchive ? true, libarchive +, enablePluginAttRemover ? true +, enablePluginAttachWarner ? true +, enablePluginBogofilter ? true +, enablePluginBsfilter ? true +, enablePluginClamd ? true +, enablePluginDillo ? true +, enablePluginFancy ? useGtk3, libsoup, webkitgtk +, enablePluginFetchInfo ? true +, enablePluginLibravatar ? enablePluginRavatar +, enablePluginLitehtmlViewer ? true, gumbo +, enablePluginMailmbox ? true +, enablePluginManageSieve ? true +, enablePluginNewMail ? true +, enablePluginNotification ? (enablePluginNotificationDialogs || enablePluginNotificationSounds), libcanberra-gtk2, libcanberra-gtk3, libnotify +, enablePluginPdfViewer ? enablePluginPdf, poppler +, enablePluginPerl ? true, perl +, enablePluginPython ? true +, enablePluginPgp ? enablePgp, gnupg, gpgme +, enablePluginRssyl ? true, libxml2 +, enablePluginSmime ? true +, enablePluginSpamassassin ? true +, enablePluginSpamReport ? true +, enablePluginTnefParse ? true, libytnef +, enablePluginVcalendar ? true, libical }: with lib; -stdenv.mkDerivation rec { - pname = "claws-mail"; - version = "3.17.8"; +let + version = if useGtk3 then "3.99.0" else "3.17.8"; - src = fetchurl { - url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "sha256-zbeygUmV1vSpw7HwvBRn7Vw88qXg2hcwqqJaisyv3a8="; + # The official release uses gtk2 and contains the version tag. + gtk2src = { + sha256 = "0l4f8q11iyj8pi120lrapgq51k5j64xf0jlczkzbm99rym752ch5"; }; - outputs = [ "out" "dev" ]; + # The corresponding commit in the gtk3 branch. + gtk3src = { + sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; + }; + + python = if useGtk3 then python3 else python2; + pythonPkgs = if useGtk3 + then + with python.pkgs; [ python wrapPython pygobject3 ] + else + with python.pkgs; [ python wrapPython pygtk pygobject2 ]; - patches = [ - ./mime.patch + features = [ + { flags = [ "acpi_notifier-plugin" ]; enabled = enablePluginAcpiNotifier; } + { flags = [ "address_keeper-plugin" ]; enabled = enablePluginAddressKeeper; } + { flags = [ "archive-plugin" ]; enabled = enablePluginArchive; deps = [ libarchive ]; } + { flags = [ "att_remover-plugin" ]; enabled = enablePluginAttRemover; } + { flags = [ "attachwarner-plugin" ]; enabled = enablePluginAttachWarner; } + { flags = [ "bogofilter-plugin" ]; enabled = enablePluginBogofilter; } + { flags = [ "bsfilter-plugin" ]; enabled = enablePluginBsfilter; } + { flags = [ "clamd-plugin" ]; enabled = enablePluginClamd; } + { 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 ]; } + { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } + { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; } + { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; } + { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; } + { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; } + { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; } + { flags = [ "networkmanager" ]; enabled = enableNetworkManager; deps = [ networkmanager ]; } + { flags = [ "newmail-plugin" ]; enabled = enablePluginNewMail; } + { flags = [ "notification-plugin" ]; enabled = enablePluginNotification; deps = [ libnotify ] ++ [(if useGtk3 then libcanberra-gtk3 else libcanberra-gtk2)]; } + { flags = [ "pdf_viewer-plugin" ]; enabled = enablePluginPdfViewer; deps = [ poppler ]; } + { flags = [ "perl-plugin" ]; enabled = enablePluginPerl; deps = [ perl ]; } + { flags = [ "pgpcore-plugin" "pgpinline-plugin" "pgpmime-plugin" ]; enabled = enablePluginPgp; deps = [ gnupg gpgme ]; } + { flags = [ "python-plugin" ]; enabled = enablePluginPython; } + { flags = [ "rssyl-plugin" ]; enabled = enablePluginRssyl; deps = [ libxml2 ]; } + { flags = [ "smime-plugin" ]; enabled = enablePluginSmime; } + { flags = [ "spam_report-plugin" ]; enabled = enablePluginSpamReport; } + { flags = [ "spamassassin-plugin" ]; enabled = enablePluginSpamassassin; } + { flags = [ "svg" ]; enabled = enableSvg; deps = [ librsvg ]; } + { flags = [ "tnef_parse-plugin" ]; enabled = enablePluginTnefParse; deps = [ libytnef ]; } + { flags = [ "valgrind" ]; enabled = enableValgrind; deps = [ valgrind ]; } + { flags = [ "vcalendar-plugin" ]; enabled = enablePluginVcalendar; deps = [ libical ]; } ]; +in stdenv.mkDerivation rec { + pname = "claws-mail"; + inherit version; + + src = fetchgit ({ + rev = version; + url = "git://git.claws-mail.org/claws.git"; + } // (if useGtk3 then gtk3src else gtk2src)); + + outputs = [ "out" "dev" ]; + + patches = [ ./mime.patch ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib + # generate version without .git + [ -e version ] || echo "echo ${version}" > version ''; postPatch = '' @@ -54,51 +139,29 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook python.pkgs.wrapPython ]; - propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config bison flex wrapGAppsHook ]; + propagatedBuildInputs = pythonPkgs; buildInputs = - [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas - libetpan perl glib-networking libSM libytnef - ] - ++ optional enableSpellcheck enchant - ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] - ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra-gtk2 - ++ optional enablePluginNotificationDialogs libnotify - ++ optional enablePluginLitehtmlViewer gumbo - ++ optional enablePluginRssyl libxml2 - ++ optional enableNetworkManager networkmanager - ++ optional enableLdap openldap - ++ optional enablePluginPdf poppler - ++ optional enablePluginVcalendar libical; + [ curl gsettings-desktop-schemas glib-networking ] + ++ [(if useGtk3 then gtk3 else gtk2)] + ++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features) + ; configureFlags = - optional (!enableLdap) "--disable-ldap" - ++ optional (!enableNetworkManager) "--disable-networkmanager" - ++ optionals (!enablePgp) [ - "--disable-pgpcore-plugin" - "--disable-pgpinline-plugin" - "--disable-pgpmime-plugin" - ] - ++ optional (!enablePluginArchive) "--disable-archive-plugin" - ++ optional (!enablePluginLitehtmlViewer) "--disable-litehtml_viewer-plugin" - ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" - ++ optional (!enablePluginPython) "--disable-python-plugin" - ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" - ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" - ++ optional (!enablePluginSmime) "--disable-smime-plugin" - ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" - ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" - ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" - ++ optional (!enableSpellcheck) "--disable-enchant"; + [ + "--disable-manual" # Missing docbook-tools, e.g., docbook2html + "--disable-compface" # Missing compface library + "--disable-jpilot" # Missing jpilot library - enableParallelBuilding = true; + "--disable-gdata-plugin" # Complains about missing libgdata, even when provided + ] ++ + (map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features); - pythonPath = with python.pkgs; [ pygobject2 pygtk ]; + enableParallelBuilding = true; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $pythonPkgs" gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") ''; @@ -110,8 +173,8 @@ 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 ]; + maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix deleted file mode 100644 index d5223092446..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib, config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex -, curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme -, libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkg-config, poppler, python, shared-mime-info, webkitgtk -, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical -# Build options -# TODO: A flag to build the manual. -# TODO: Plugins that complain about their missing dependencies, even when -# provided: -# gdata requires libgdata -# geolocation requires libchamplain -, enableLdap ? false -, enableNetworkManager ? config.networking.networkmanager.enable or false -, enablePgp ? true -, enablePluginArchive ? false -, enablePluginFancy ? true -, enablePluginNotificationDialogs ? true -, enablePluginNotificationSounds ? true -, enablePluginPdf ? false -, enablePluginPython ? false -, enablePluginRavatar ? false -, enablePluginRssyl ? false -, enablePluginSmime ? false -, enablePluginSpamassassin ? false -, enablePluginSpamReport ? false -, enablePluginVcalendar ? false -, enableSpellcheck ? false -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "claws-mail-gtk3"; - version = "3.99.0"; - - src = fetchgit { - url = "git://git.claws-mail.org/claws.git"; - rev = version; - sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ ./mime.patch ]; - - preConfigure = '' - # autotools check tries to dlopen libpython as a requirement for the python plugin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib - # generate version without .git - [ -e version ] || echo "echo ${version}" > version - ''; - - postPatch = '' - substituteInPlace src/procmime.c \ - --subst-var-by MIMEROOTDIR ${shared-mime-info}/share - ''; - - nativeBuildInputs = [ autoreconfHook bison flex pkg-config wrapGAppsHook python.pkgs.wrapPython ]; - propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; - - buildInputs = - [ curl dbus dbus-glib gtk3 gnutls gsettings-desktop-schemas - libetpan perl glib-networking libSM libytnef - ] - ++ optional enableSpellcheck enchant - ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] - ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra-gtk3 - ++ optional enablePluginNotificationDialogs libnotify - ++ optional enablePluginFancy libsoup - ++ optional enablePluginRssyl libxml2 - ++ optional enableNetworkManager networkmanager - ++ optional enableLdap openldap - ++ optional enablePluginPdf poppler - ++ optional enablePluginFancy webkitgtk - ++ optional enablePluginVcalendar libical; - - configureFlags = - optional (!enableLdap) "--disable-ldap" - ++ optional (!enableNetworkManager) "--disable-networkmanager" - ++ optionals (!enablePgp) [ - "--disable-pgpcore-plugin" - "--disable-pgpinline-plugin" - "--disable-pgpmime-plugin" - ] - ++ optional (!enablePluginArchive) "--disable-archive-plugin" - ++ optional (!enablePluginFancy) "--disable-fancy-plugin" - ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" - ++ optional (!enablePluginPython) "--disable-python-plugin" - ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" - ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" - ++ optional (!enablePluginSmime) "--disable-smime-plugin" - ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" - ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" - ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" - ++ optional (!enableSpellcheck) "--disable-enchant"; - - enableParallelBuilding = true; - - pythonPath = with python.pkgs; [ pygobject2 pygtk ]; - - preFixup = '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") - ''; - - postInstall = '' - mkdir -p $out/share/applications - cp claws-mail.desktop $out/share/applications - ''; - - NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ]; - - meta = { - description = "The user-friendly, lightweight, and fast email client"; - homepage = "https://www.claws-mail.org/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index b8aaabca0fb..f6bea3c8357 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.3"; + version = "3.38.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfshljvkpbh965rjlyy1qjjm0ic3rdxisyy9c5jjvv2qlk65b3z"; + sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 050082c6f93..ea3f09b8f4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix index 1fa9c66c8ff..9a2bd563fc8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , fetchFromGitHub , gettext , xorg # for lndir @@ -24,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "mailnag"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pulb"; repo = "mailnag"; rev = "v${version}"; - sha256 = "08jqs3v01a9gkjca9xgjidhdgvnlm4541z9bwh9m3k5p2g76sz96"; + sha256 = "0m1cyzwzm7z4p2v31dx098a1iar7dbilwyjcxiqnjx05nlmiqvgf"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix index 1d1dc030c31..cab43750a56 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index c0ebb3d8078..0c02f512dad 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib -, glibcLocales -, fetchpatch +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index ddffe074706..6919e31342e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.31.3"; + version = "0.31.4"; pname = "notmuch"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v"; + sha256 = "sha256-M+LEf257OcDlHOCYYxzEVQpop+i2gzO/QJPdajz/CRM="; rev = version; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index b1905359cd3..f9027285c13 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -63,12 +63,11 @@ let defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; - - name = "thunderbird-bin-${version}"; in stdenv.mkDerivation { - inherit name; + pname = "thunderbird-bin"; + inherit version; src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; @@ -169,7 +168,8 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit name writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + name = "thunderbird-bin-${version}"; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index e86e847e8f3..5c129803ce6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index d91239c3a6e..78a9ef0dbb3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix index da36589aeec..2723f342043 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix @@ -10,7 +10,6 @@ , itstool , libayatana-appindicator-gtk3 , perlPackages -, glibcLocales , meson , ninja }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 82140f2d77d..9267d8d231c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.1"; + version = "2021.2"; src = fetchurl { - url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "1ksa327zaiwmcmzv4n4ycfzc4sqhj2492c5ir0mqlx7x2nnhx6q7"; + url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; + sha256 = "sha256-nNZK11MckiQ+z8NDgDc7aJ6yrXWI1hPOvMZkrGwDDgU="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/mumble/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/mumble/default.nix index 2eeb151bebe..4432d9ddeec 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -1,22 +1,15 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python3 , rnnoise -, jackSupport ? false, libjack2 ? null -, speechdSupport ? false, speechd ? null -, pulseSupport ? false, libpulseaudio ? null -, iceSupport ? false, zeroc-ice ? null -, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null +, jackSupport ? false, libjack2 +, speechdSupport ? false, speechd +, pulseSupport ? false, libpulseaudio +, iceSupport ? false, zeroc-ice +, grpcSupport ? false, grpc, c-ares, abseil-cpp, which , nixosTests }: -assert jackSupport -> libjack2 != null; -assert speechdSupport -> speechd != null; -assert pulseSupport -> libpulseaudio != null; -assert iceSupport -> zeroc-ice != null; -assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); - -with lib; let generic = overrides: source: qt5.mkDerivation (source // overrides // { pname = overrides.type; @@ -42,8 +35,8 @@ let "CONFIG+=no-bundled-opus" "CONFIG+=no-bundled-speex" "DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble" - ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" - ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" + ] ++ lib.optional (!speechdSupport) "CONFIG+=no-speechd" + ++ lib.optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -64,11 +57,9 @@ let runHook postInstall ''; - enableParallelBuilding = true; - passthru.tests.connectivity = nixosTests.mumble; - meta = { + meta = with lib; { description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; @@ -82,16 +73,16 @@ let nativeBuildInputs = [ qt5.qttools ]; buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ optional stdenv.isLinux alsaLib - ++ optional jackSupport libjack2 - ++ optional speechdSupport speechd - ++ optional pulseSupport libpulseaudio; + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional jackSupport libjack2 + ++ lib.optional speechdSupport speechd + ++ lib.optional pulseSupport libpulseaudio; configureFlags = [ "CONFIG+=no-server" ]; - NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher"; installPhase = '' # bin stuff @@ -113,18 +104,18 @@ let server = source: generic { type = "murmur"; - postPatch = optional iceSupport '' + postPatch = lib.optional iceSupport '' grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' ''; configureFlags = [ "CONFIG+=no-client" - ] ++ optional (!iceSupport) "CONFIG+=no-ice" - ++ optional grpcSupport "CONFIG+=grpc"; + ] ++ lib.optional (!iceSupport) "CONFIG+=no-ice" + ++ lib.optional grpcSupport "CONFIG+=grpc"; buildInputs = [ libcap ] - ++ optional iceSupport zeroc-ice - ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; + ++ lib.optional iceSupport zeroc-ice + ++ lib.optionals grpcSupport [ grpc c-ares abseil-cpp which ]; installPhase = '' # bin stuff diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/ncgopher/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/ncgopher/default.nix index 2e5e840d50d..69f214cc571 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/ncgopher/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/ncgopher/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ncgopher"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jansc"; repo = "ncgopher"; rev = "v${version}"; - sha256 = "1mv89sanmr49b9za95jl5slpq960b246j2054r8xfafzqmbp44af"; + sha256 = "sha256-Yny5zZe5x7/pWda839HcFkHFuL/jl1Q7ykTZzKy871I="; }; - cargoSha256 = "12r4vgrg2bkr3p61yxcsg02kppg84vn956l0v1vb08i94rxzc8zk"; + cargoSha256 = "sha256-IsRaDhnRamMSbtXG1r1j0jZYjFiSjRdwOaUVyqy4ZJw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 42486458b2c..163faf02af0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -12,6 +12,7 @@ , qtkeychain , qttools , qtwebengine +, qtwebsockets , qtquickcontrols2 , qtgraphicaleffects , sqlite @@ -19,16 +20,17 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.0.3"; + version = "3.1.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "0idh8i71jivdjjs2y62l22yl3qxwgcr0hf53dad587bzgkkkr223"; + sha256 = "sha256-8Ql6tOvWOjAvMJA87WlT9TbpnbciBsjDxRuYlMVi/m8="; }; patches = [ + # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`. ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch ]; @@ -40,6 +42,7 @@ mkDerivation rec { buildInputs = [ inotify-tools libcloudproviders + libsecret openssl pcre qtbase @@ -48,13 +51,10 @@ mkDerivation rec { qtwebengine qtquickcontrols2 qtgraphicaleffects + qtwebsockets sqlite ]; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" - ]; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit @@ -63,7 +63,7 @@ mkDerivation rec { meta = with lib; { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ caugner ]; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 77d08692f62..124ee9a20ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/infra/libkookie/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; - +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; + }) + ]; disable = !isPy3k; propagatedBuildInputs = [ flask flask-httpauth + flask-socketio stem - pyqt5 + psutil pycrypto - pysocks requests + unidecode ]; + buildInputs = [ tor obfs4 ]; + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # Tests use the home directory + export HOME="$(mktemp -d)" + ''; + }; + + onionshare-gui = buildPythonApplication { + pname = "onionshare"; + inherit version meta; + src = "${src}/desktop/src"; patches = [ + # hardcode store paths of dependencies (substituteAll { - src = ./fix-paths.patch; + src = ./fix-paths-gui.patch; inherit tor obfs4; inherit (tor) geoip; }) ]; - postPatch = "substituteInPlace onionshare/common.py --subst-var-by common $out"; - doCheck = false; - }; -in -{ - onionshare = stdenv.mkDerivation { - pname = "onionshare"; - inherit version meta; + disable = !isPy3k; + propagatedBuildInputs = [ + onionshare + pyqt5 + pyside2 + psutil + qrcode + ]; - dontUnpack = true; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - inherit common; - installPhase = '' - mkdir -p $out/bin - cp $common/bin/onionshare -t $out/bin + preFixup = '' + wrapQtApp $out/bin/onionshare ''; - }; - onionshare-gui = stdenv.mkDerivation { - pname = "onionshare-gui"; - inherit version meta; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - dontUnpack = true; + doCheck = false; - inherit common; - installPhase = '' - mkdir -p $out/bin - cp $common/bin/onionshare-gui -t $out/bin - wrapQtApp $out/bin/onionshare-gui - ''; + pythonImportsCheck = [ "onionshare" ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch new file mode 100644 index 00000000000..cdc2e3d47dd --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch index ddd0c75334b..a290dd88410 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index c7a05f37ca8..3e1d5073f5f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index b4efd89441e..af290fc1cc5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.13.2"; + version = "0.14.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "0b4a6bxwhpmj274d281vhny7i5rwydrdmab76xk6ji8vf0p705dn"; + sha256 = "sha256-2u9gO9Mu0dM1yixcaqOnZcDfGcp69dc5CH5tkl6vRas="; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix index 85a5217ff69..a39b4aab837 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix index 36b7451e441..6e2533621e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper -, enablePlayer ? true, libvlc ? null, qt5, lib }: +{ stdenv, fetchurl, python3Packages, makeWrapper +, enablePlayer ? true, libvlc, qt5, lib }: stdenv.mkDerivation rec { pname = "tribler"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix index 557914439a9..fe8743ee1cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 0437a108d89..35faeb20b75 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 04f2efd5b07..10b3f2d175a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index a9ddf48bae6..f52373f2624 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index b4f6f96e587..3e5a23a3f38 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.24"; + version = "2.27"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-nz45vCRhWhgVG2pMA6TZVUIS4d9qBWW7NtTHuEsn4pg="; + sha256 = "sha256-0KT/5seJs8GkatL4BsZ+r71t6AJrpHB6Q92sCvplKcQ="; }; - vendorSha256 = "sha256-v0wFlwODZt3LC+yTuNS1hAAkoedVPfTeEIvs6rUGUa4="; + vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4="; subPackages = [ "weed" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 7e7206883d9..7382e1aba4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "1vg236vc2v4g47lb68hb1vy3phamhsyb383fdbblh3vc4vf46j8a"; + sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x"; }; modRoot = "./agent"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/casync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/casync/default.nix index 0e82aa2dd85..5bc29832c5f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/casync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/casync/default.nix @@ -1,27 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, python3, sphinx -, acl, curl, fuse, libselinux, udev, xz, zstd +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, python3 +, sphinx +, acl +, curl +, fuse +, libselinux +, udev +, xz +, zstd , fuseSupport ? true , selinuxSupport ? true , udevSupport ? true -, glibcLocales, rsync +, glibcLocales +, rsync }: stdenv.mkDerivation { pname = "casync"; - version = "2-219-ga8f6c84"; + version = "2-226-gbd8898e"; src = fetchFromGitHub { - owner = "systemd"; - repo = "casync"; - rev = "a8f6c841ccfe59ca8c68aad64df170b64042dce8"; - sha256 = "1i3c9wmpabpmx2wfbcyabmwfa66vz92iq5dlbm89v5mvgavz7bws"; + owner = "systemd"; + repo = "casync"; + rev = "bd8898ed92685e12022dd33a04c87786b5262344"; + sha256 = "04ibglizjzyd7ih13q6m7ic78n0mzw9nfmb3zd1fcm9j62qlq11i"; }; buildInputs = [ acl curl xz zstd ] - ++ lib.optionals (fuseSupport) [ fuse ] - ++ lib.optionals (selinuxSupport) [ libselinux ] - ++ lib.optionals (udevSupport) [ udev ]; + ++ lib.optionals (fuseSupport) [ fuse ] + ++ lib.optionals (selinuxSupport) [ libselinux ] + ++ lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; @@ -34,8 +47,8 @@ stdenv.mkDerivation { PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' @@ -44,9 +57,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Content-Addressable Data Synchronizer"; - homepage = "https://github.com/systemd/casync"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/systemd/casync"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; maintainers = with maintainers; [ flokli ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 86126e86169..23bbd19b00e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/tsung/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/tsung/default.nix index 41bc6c64da8..346fd175257 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/tsung/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/networking/websocketd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/websocketd/default.nix index c287abb0de2..636443c9b85 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/websocketd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/websocketd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "websocketd"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "joewalnes"; repo = pname; rev = "v${version}"; - sha256 = "1qc4yi4kwy7bfi3fb17w58ff0i95yi6m4syldh8j79930syr5y8q"; + sha256 = "sha256-cp4iBSQ6Cd0+NPZ2i79Mulg1z17u//OCm3yoArbZEHs="; }; - vendorSha256 = "05k31z4h3b327mh940zh52im4xfk7kf5phb8b7xp4l9bgckhz4lb"; + vendorSha256 = "sha256-i5IPJ3srUXL7WWjBW9w803VSoyjwA5JgPWKsAckPYxY="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/wg-bond/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/wg-bond/default.nix index 32ffbde400b..bef44d42862 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/wg-bond/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/bookworm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/bookworm/default.nix index 8ea277e1af3..8bd1d8f974b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/bookworm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee +{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , appstream, desktop-file-utils }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/calligra/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/calligra/default.nix index a8ca37df36a..e54a3cbad4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/calligra/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/cb2bib/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/cb2bib/default.nix index e57d490f05c..b0a0fded80a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/cb2bib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/cb2bib/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + dontWrapQtApps = true; + meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/docear/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/docear/default.nix index 683e6681573..f8cd25ad784 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/docear/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/impressive/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/impressive/default.nix index 4614a543694..f46d893d894 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/impressive/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/ledger/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/ledger/default.nix index 7f543c9bbcc..5478382cbd8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/ledger/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/ledger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python +{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 , texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ - (boost.override { enablePython = usePython; }) - gmp mpfr libedit python gnused + (boost.override { enablePython = usePython; python = python3; }) + gmp mpfr libedit python3 gnused ]; nativeBuildInputs = [ cmake texinfo ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # however, that would write to a different nixstore path, pass our own sitePackages location prePatch = lib.optionalString usePython '' substituteInPlace src/CMakeLists.txt \ - --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python.sitePackages}"' + --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python3.sitePackages}"' ''; installTargets = [ "doc" "install" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/libreoffice/default.nix index c917c439691..c9b1099f8b9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext +{ stdenv, fetchurl, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/paperless/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/paperless/default.nix index 499078611fc..c2578696c68 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/paperless/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/portfolio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/portfolio/default.nix index 47cda051821..23dd03a1b7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.50.3"; + version = "0.50.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-8sFBxcs3tnIQQ4S39aF8r9SGm9VOHPpgQYyLkUaOscw="; + sha256 = "sha256-ZOw3Zyd6+fT/Z2tndRVqA8tVvgeq/TbdEdoAk9vSM0k="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/pympress/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/pympress/default.nix index b4307eb286e..ebc93edba6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/pympress/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/pympress/default.nix @@ -1,13 +1,10 @@ { lib , python3Packages , wrapGAppsHook -, xvfb_run , gtk3 , gobject-introspection , libcanberra-gtk3 -, dbus , poppler_gi -, python3 }: python3Packages.buildPythonApplication rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/skanlite/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/skanlite/default.nix index 89cf2add212..744240c9213 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/skanlite/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix index bdd90fecb8e..b1b24c3e6cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "980"; + version = "982"; edition = "2018"; - sha256 = "19pgil86aagiz6z4kx22gd4cxbbmrx42ix42arkfb6p6hav1plby"; + hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w="; } , ... } @ args: @@ -19,7 +19,7 @@ callPackage ./generic.nix (args // rec { suiteName = "FreeOffice"; src = fetchurl { - inherit (officeVersion) sha256; + inherit (officeVersion) hash; url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/generic.nix index a80eaa459c0..56a951919e3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems # Dynamic Libraries , curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix index d0eb2ffdc93..9228037e8bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix @@ -6,9 +6,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. , officeVersion ? { - version = "1020"; + version = "1030"; edition = "2021"; - sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5"; + hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE="; } , ... } @ args: @@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec { suiteName = "SoftMaker Office"; src = fetchurl { - inherit (officeVersion) sha256; + inherit (officeVersion) hash; url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/office/timeular/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/timeular/default.nix index 6c1068d4584..5bbfca23d6d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/timeular/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/treesheets/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/treesheets/default.nix index 552d28d1e95..1f084e182af 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index e0f156f06c9..fad87d44912 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/office/zotero/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/office/zotero/default.nix index 739b003bbef..91673ed146a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.89"; + version = "5.0.95"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl"; + sha256 = "16rahl14clgnl7gzpw7rxx23yxbw1nbrz219q051zkjkkw5ai8lv"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - patchPhase = '' + postPatch = '' sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js ''; @@ -103,33 +103,36 @@ stdenv.mkDerivation rec { mimeType = "text/plain"; }; - installPhase = - '' - mkdir -p "$prefix/usr/lib/zotero-bin-${version}" - cp -r * "$prefix/usr/lib/zotero-bin-${version}" - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" + installPhase = '' + runHook preInstall - # install desktop file and icons. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 16 32 48 256; do - install -Dm444 chrome/icons/default/default$size.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done + mkdir -p "$prefix/usr/lib/zotero-bin-${version}" + cp -r * "$prefix/usr/lib/zotero-bin-${version}" + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" - for executable in \ - zotero-bin plugin-container \ - updater minidump-analyzer - do - if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/zotero-bin-${version}/$executable" - fi - done - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/zotero-bin-${version}/{}" \; + # install desktop file and icons. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + for size in 16 32 48 256; do + install -Dm444 chrome/icons/default/default$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png + done + + for executable in \ + zotero-bin plugin-container \ + updater minidump-analyzer + do + if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/zotero-bin-${version}/$executable" + fi + done + find . -executable -type f -exec \ + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/zotero-bin-${version}/{}" \; + + runHook postInstall ''; preFixup = '' @@ -141,7 +144,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; + maintainers = with maintainers; [ i077 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/printing/pappl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/printing/pappl/default.nix index 4c7b60c125c..de0b9bada53 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/printing/pappl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/radio/cqrlog/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/radio/cqrlog/default.nix new file mode 100644 index 00000000000..d86a08f3a1b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/radio/cqrlog/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub +, fpc +, lazarus +, atk +, cairo +, gdk-pixbuf +, glib +, gtk2-x11 +, libX11 +, pango +, hamlib +, mysql57 +, tqsl +, xdg-utils +, xplanet +, autoPatchelfHook +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "cqrlog"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "ok2cqr"; + repo = "cqrlog"; + rev = "v${version}"; + sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb"; + }; + + # Adds the possiblity to change the lazarus directory, + # otherwise, we would get error : "directory lcl not found" + patches = [ ./fix-makefile-lazarusdir.patch ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace @Lazarusdir@ "${lazarus}/share/lazarus" \ + --replace /usr "" + substituteInPlace src/fTRXControl.pas \ + --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" + substituteInPlace src/fCallAttachment.pas \ + --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" + substituteInPlace src/fRotControl.pas \ + --replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" + substituteInPlace src/fPreferences.pas \ + --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" \ + --replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" \ + --replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" + substituteInPlace src/fLoTWExport.pas \ + --replace "/usr/bin/tqsl" "${tqsl}/bin/tqsl" + substituteInPlace src/dUtils.pas \ + --replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" \ + --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" + # Order is important + substituteInPlace src/dData.pas \ + --replace "/usr/bin/mysqld_safe" "${mysql57}/bin/mysqld_safe" \ + --replace "/usr/bin/mysqld" "${mysql57}/bin/mysqld" + + # To be fail when I need to patch a new hardcoded binary + ! grep -C src -RC0 "/usr" + ''; + + nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk2-x11 + libX11 + pango + ]; + propagatedBuildInputs = [ + hamlib + mysql57 + tqsl + xdg-utils + xplanet + ]; + + makeFlags = [ + "FPC=fpc" + "PP=fpc" + "DESTDIR=$(out)" + ]; + + postFixup = '' + libmysqlclient=$(find "${mysql57}/lib" -name "libmysqlclient.so.*" | tail -n1) + patchelf --add-needed "$libmysqlclient" "$out/bin/.cqrlog-wrapped" + ''; + + meta = with lib; { + description = "Linux logging program for amateur radio operators"; + homepage = "https://www.cqrlog.com/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch b/infra/libkookie/nixpkgs/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch new file mode 100644 index 00000000000..9170387966a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch @@ -0,0 +1,13 @@ +Seulement dans b: logs +diff --color -ur a/Makefile b/Makefile +--- a/Makefile 2021-02-15 17:07:14.333810200 +0100 ++++ b/Makefile 2021-02-15 17:19:18.599426984 +0100 +@@ -6,7 +6,7 @@ + tmpdir = /tmp + + cqrlog: src/cqrlog.lpi +- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi ++ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus --lazarusdir=@Lazarusdir@ src/cqrlog.lpi + $(ST) src/cqrlog + gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz + diff --git a/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 9223f160db3..9bc1511968b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -218,6 +218,7 @@ let passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; cmakeFlags = shared.cmakeFlags @@ -283,6 +284,7 @@ stdenv.mkDerivation rec { passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix b/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix index 1d5d84f4649..9b354d5b960 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix @@ -109,6 +109,7 @@ rec { }; # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; + dontWrapQtApps = true; # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order # for it to happen. doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/radio/pothos/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/radio/pothos/default.nix new file mode 100644 index 00000000000..64f5093c4b9 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/radio/pothos/spuce.patch b/infra/libkookie/nixpkgs/pkgs/applications/radio/pothos/spuce.patch new file mode 100644 index 00000000000..ed0377540a8 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/radio/unixcw/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/radio/unixcw/default.nix index 5e299cc5984..cdb84670c61 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/radio/unixcw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/radio/unixcw/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; + dontWrapQtApps = true; + meta = with lib; { description = "sound characters as Morse code on the soundcard or console speaker"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index 33f00979c97..47c69d7451f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -9,7 +9,7 @@ eigen, zlib, - cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib, stellarsolver + cfitsio, indi-full, xplanet, libnova, libraw, gsl, wcslib, stellarsolver }: mkDerivation rec { @@ -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/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix index 054a73dec7a..0e0ad06bbe9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix index cd78b644eb0..e51d181266a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix index f4e2db01fbc..e15cac60295 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "HSTDIR=${htslib}" "prefix=$(out)" - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" ]; preCheck = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix index 7eb3afd437a..b42fed8da28 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/biology/last/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/last/default.nix index 3a36a2194a1..0c5b81452fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1170"; + version = "1179"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "sha256-hBuG6QGXtBrvNrtaZU+i8gxu2ZQw+srFRkbuWoL5JHc="; + sha256 = "sha256-949oiE7ZNkCOJuOK/huPkCN0c4TlVaTskkBe0joc0HU="; }; nativeBuildInputs = [ unzip ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/platypus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/platypus/default.nix index 30bc68fb0e8..d602395b875 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/platypus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix index 22883cc522f..28a21522c6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/prodigal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "INSTALLDIR=$(out)/bin" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix index 32701af8392..b48e13ecf00 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/biology/star/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/star/default.nix index 34586384737..9ad53502cd7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/biology/varscan/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/varscan/default.nix index 65a19b83a70..2a232d64693 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/varscan/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index aa52fee0890..32e7e7e5d72 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.18"; + version = "14.31.24"; 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-86nDeKRXSNKrmYeo1rRLfziLVnmEmdIJRfIv6DFIxcs="; }; patchPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 6d70e9f984f..a348c51c281 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix index 70d07460a75..dac6713a495 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 2c5ee674a23..e84e9b7400e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, fmt, graphviz, llvmPackages ? null +, fmt, graphviz, llvmPackages, z3 }: stdenv.mkDerivation rec { - version = "3.1.9"; + version = "3.2.5"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "0yvvlx0hq73x20va4csa8kyx3x4z648s6l6qqirzjpmxa1w91xc6"; + sha256 = "0hc10wbngh4gfiiy9ndkf1y6dclcgy38x1n9k5wpvmf13vdah3zy"; }; # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 3ed6234b4f8..1a5c0de5fb7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -1,5 +1,5 @@ -{ lib, stdenv -, fetchFromGitLab +{ lib +, stdenv , cmake , libGLU , libGL @@ -18,9 +18,7 @@ , pcre , libpthreadstubs , libXdmcp -, fetchpatch , lndir -, callPackage , stable , baseName diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 88bb7978881..dcf51e657c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -15,19 +15,15 @@ , stable ? true , oceSupport ? false , withOCE ? false -, opencascade , withOCCT ? false , withOCC ? true -, opencascade-occt , ngspiceSupport ? false , withNgspice ? true , libngspice , scriptingSupport ? false , withScripting ? true -, swig , python3 , debug ? false -, valgrind , with3d ? true , withI18n ? true , srcs ? { } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index 394a1787615..53a67cea40b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -18,30 +18,25 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; qmakeFlags = ["-r"]; - enableParallelBuilding = true; - - 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 = '' + postPatch = '' substituteInPlace ./libs/librepcb/common/common.pro \ --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # ' ''; - preFixup = '' - wrapQtApp $out/bin/librepcb + postInstall = '' + mkdir -p $out/share/librepcb/fontobene + cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/ ''; 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/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix index f8fbdffc634..0eed8b1692a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "33"; + version = "34"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; + sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; }; nativeBuildInputs = [ flex bison ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix index 13364beed5c..1cf08741206 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/acgtk/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl, dune, ocamlPackages }: +{ lib, stdenv, fetchurl, dune_2, ocamlPackages }: stdenv.mkDerivation { pname = "acgtk"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz"; - sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1"; + url = "https://acg.loria.fr/software/acg-1.5.2-20201204.tar.gz"; + sha256 = "09yax7dyw8kgwzlb69r9d20y7rrymzwi3bbq2dh0qdq01vjz2xwq"; }; - buildInputs = [ dune ] ++ (with ocamlPackages; [ + buildInputs = [ dune_2 ] ++ (with ocamlPackages; [ ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir mtime yojson ]); - buildPhase = "dune build"; + buildPhase = "dune build --profile=release"; installPhase = '' dune install --prefix $out --libdir $OCAMLFIND_DESTDIR diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index 519b1f98138..dd72d148e29 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -9,20 +9,22 @@ let sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; }; + useDune2 = true; + nativeBuildInputs = [ which ]; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src nativeBuildInputs; + inherit version src useDune2 nativeBuildInputs; configureFlags = pname; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src nativeBuildInputs; + inherit version src useDune2 nativeBuildInputs; configureFlags = pname; buildInputs = with ocamlPackages; [ menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -30,7 +32,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src nativeBuildInputs; + inherit pname version src useDune2 nativeBuildInputs; configureFlags = pname; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 62600ea90c2..8713abe4bcf 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/hol/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/hol/default.nix index 6fc7286154a..569c455e653 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/hol/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/hol/default.nix @@ -3,14 +3,14 @@ let pname = "hol4"; - vnum = "10"; + vnum = "14"; in let version = "k.${vnum}"; longVersion = "kananaskis-${vnum}"; holsubdir = "hol-${longVersion}"; - kernelFlag = if experimentalKernel then "-expk" else "-stdknl"; + kernelFlag = if experimentalKernel then "--expk" else "--stdknl"; in let @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz"; - sha256 = "0x2wxksr305h1lrbklf6p42lp09rbhb4rsh74g0l70sgapyiac9b"; + sha256 = "6Mc/qsEjzxGqzt6yP6x/1Tmqpwc1UDGlwV1Gl+4pMsY="; }; buildInputs = [polymlEnableShared graphviz fontconfig liberation_ttf]; @@ -46,8 +46,8 @@ stdenv.mkDerivation { cd ${holsubdir} substituteInPlace tools/Holmake/Holmake_types.sml \ - --replace "\"/bin/mv\"" "\"mv\"" \ - --replace "\"/bin/cp\"" "\"cp\"" + --replace "\"/bin/" "\"" \ + for f in tools/buildutils.sml help/src-sml/DOT; do @@ -58,7 +58,7 @@ stdenv.mkDerivation { poly < tools/smart-configure.sml - bin/build ${kernelFlag} -symlink + bin/build ${kernelFlag} mkdir -p "$out/bin" ln -st $out/bin $out/src/${holsubdir}/bin/* @@ -81,8 +81,7 @@ stdenv.mkDerivation { ''; homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mudri ]; - platforms = with platforms; linux; - broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix index a0f81a543f1..600ae83ff91 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 7749f4fd72d..d57db0fd0d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/leo2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/leo2/default.nix index 520c47d7500..fc2c1e5cba4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/leo2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix index 56898f163b9..da9231efb81 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL qt5.qtbase boost ]; + dontWrapQtApps = true; + meta = with lib; { description = "A toolset for model-checking concurrent systems and protocols"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/sad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/sad/default.nix index 8e4d19973ef..fe0ca1b3017 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/sad/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/satallax/default.nix index dffb66b2fcf..8c88f47327e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/satallax/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix index c4ba334b85f..f002b808e0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index 1c33d923289..da8985818e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix index 3528dbd3a64..d4fdbfd6937 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix index cb0d668f536..7fb73419c07 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/logic/z3/default.nix index cfef5960bd9..e482a071bb4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/math/R/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/R/default.nix index 7cbff99bf47..331faa6b147 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/infra/libkookie/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; @@ -33,7 +34,10 @@ stdenv.mkDerivation rec { ]; prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" + substituteInPlace configure \ + --replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \ + --replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \ + --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" ''; dontDisableStatic = static; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/calc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/calc/default.nix index 81b7487bd27..456ce878e49 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,23 +3,24 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.7.6"; + version = "2.12.8.2"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-Pg8nvW+RDy1Vb+Xg+5tnDxZEVkD80VcQGyZVayq8zsk="; + sha256 = "sha256-yKe4PASm7qWH/nYv8BtYbi9m3xPpA0SZ02Hahj8DJC8="; }; - patchPhase = '' + postPatch = '' substituteInPlace Makefile \ --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ --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 = [ @@ -41,7 +42,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C-style arbitrary precision calculator"; homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; - license = licenses.lgpl21; + # The licensing situation depends on readline (see section 3 of the LGPL) + # If linked against readline then GPLv2 otherwise LGPLv2.1 + license = with licenses; if enableReadline then gpl2Only else lgpl21Only; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/cbc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/cbc/default.nix index b75f3d3f786..1909e4bb1d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/cbc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/cbc/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation rec { pname = "cbc"; - version = "2.10.3"; + version = "2.10.4"; + + # Note: Cbc 2.10.5 contains Clp 1.17.5 which hits this bug + # that breaks or-tools https://github.com/coin-or/Clp/issues/130 src = fetchurl { url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz"; - sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d"; + sha256 = "0zq66j1vvpslswhzi9yfgkv6vmg7yry4pdmfgqaqw2vhyqxnsy39"; }; - configureFlags = [ "-C" ]; + # or-tools has a hard dependency on Cbc static libraries, so we build both + configureFlags = [ "-C" "--enable-static" ]; enableParallelBuilding = true; @@ -24,7 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; - broken = stdenv.isAarch64; # Missing after 2.10.0 description = "A mixed integer programming solver"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/dap/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/dap/default.nix new file mode 100644 index 00000000000..ed3290f6c27 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/dap/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "dap"; + version = "3.10"; + + src = fetchurl { + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y="; + }; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://www.gnu.org/software/dap"; + description = "A small statistics and graphics package based on C"; + longDescription = '' + Dap is a small statistics and graphics package based on C. Version 3.0 and + later of Dap can read SBS programs (based on the utterly famous, industry + standard statistics system with similar initials - you know the one I + mean)! The user wishing to perform basic statistical analyses is now freed + from learning and using C syntax for straightforward tasks, while + retaining access to the C-style graphics and statistics features provided + by the original implementation. Dap provides core methods of data + management, analysis, and graphics that are commonly used in statistical + consulting practice (univariate statistics, correlations and regression, + ANOVA, categorical data analysis, logistic regression, and nonparametric + analyses). + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/gfan/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/gfan/default.nix index 587568f8c29..1a2835932c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/gfan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/gfan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" ''; - buildFlags = [ "CC=cc" "CXX=c++" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ]; installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ gmp mpir cddlib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/msieve/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/msieve/default.nix index 679b29cb062..588df51554a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/msieve/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/msieve/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ECM = if ecm == null then "0" else "1"; # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too - makeFlags = [ "CC=cc" "all" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "all" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/nasc/default.nix index 931e83defdc..b55e4047fe4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/nasc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/nasc/default.nix @@ -9,7 +9,6 @@ , gtk3 , glib , pantheon -, libsoup , gtksourceview , libgee , nix-update-script diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix index eed1c8e3fd4..14330b0f19b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch b/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch new file mode 100644 index 00000000000..374c7207919 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch b/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch new file mode 100644 index 00000000000..88cb66506b1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index b8fb4159660..ff8e53d4172 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/infra/libkookie/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,9 @@ 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 ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/math/weka/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/math/weka/default.nix index 179801da379..05b95140b1b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/math/weka/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix index c6bfd6361f2..0d827e2ad10 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix @@ -3,15 +3,16 @@ with lib; stdenv.mkDerivation { pname = "aliza"; - version = "1.98.32"; + version = "1.98.43"; src = fetchurl { # See https://www.aliza-dicom-viewer.com/download - url = "https://drive.google.com/uc?export=download&id=1nggavPhY_633T-AW9PdkcAgbWtzv3QKG"; - sha256 = "00vbgv8ca9ckgkicyyngrb01yhhcqc8hygg2bls7b44c47hcc8zz"; + url = "https://drive.google.com/uc?export=download&id=1HiDYUVN30oSWZWt3HBp7gNRBCLLtJM1I"; + sha256 = "0d70q67j2q0wdn4m2fxljqb97jwmscqgg3rm1rkb77fi2ik206ra"; name = "aliza.rpm"; }; - buildInputs = [ rpmextract makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ rpmextract ]; unpackCmd = "rpmextract $curSrc"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index db98e0db348..3ab7d57f95a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index 9a3af78240e..858064a8d22 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/programming/plm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/programming/plm/default.nix index dd61c3668cc..e56282b6863 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/programming/plm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 703048118f6..51389d20b7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.32"; + version = "1.8.34"; src = fetchPypi { inherit pname version; - sha256 = "f89ba880fe7351a13c68ba3f4c56acd6e246790b103f3ec79d9a527b5767b8f0"; + sha256 = "b922c9b6cf4719667e195a02d8364ccebbe7966a9c18666f8ac22eae9d9e7a2c"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/system/glances/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/system/glances/default.nix index 26ca10e3f3f..e41d9bee5b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/system/glances/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib +{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib , future, psutil, setuptools # Optional dependencies: , bottle, pysnmp diff --git a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 71986e6ec6f..a7dcd0959d3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0="; + sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc="; }; - cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM="; + cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM="; nativeBuildInputs = [ cmake @@ -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/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index 092d4a0e09e..7dd495f977a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index b03acb99530..5255d40b9ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix index 433e5c30618..82286289fba 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "1.92"; + version = "2.1.0"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; rev = "v${version}"; - sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; + sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { intltool gobject-introspection wrapGAppsHook + python3.pkgs.pytestrunner ]; buildInputs = [ @@ -47,19 +48,13 @@ python3.pkgs.buildPythonApplication rec { ]; postPatch = '' - patchShebangs run_tests tests po + patchShebangs tests po # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. # The wrapped terminator has the correct path added, so ignore this. substituteInPlace setup.py --replace "'dbus-python'," "" ''; - checkPhase = '' - runHook preCheck - - ./run_tests - - runHook postCheck - ''; + doCheck = false; meta = with lib; { description = "Terminal emulator with support for tiling and tabs"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix index 67c660275f5..87394241ef7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/bcompare/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/bcompare/default.nix index 61ea5a9ddd4..d90de1a526f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/bcompare/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/bcompare/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; + dontWrapQtApps = true; meta = with lib; { description = "GUI application that allows to quickly and easily compare files and folders"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix index ae1929565b6..af2b5cdc9a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index 2c5ddca5090..d23f2847049 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1"; + sha256 = "sha256-tqlJANxJl2r0ZxPb7d8KU9cRMQUFPUIm/zMp4zREGL0="; }; buildCommand = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 1ffc0653675..036eef1c9c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 5aea15769c0..565fe180ba1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 38413f990a0..153a948d8ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq"; + sha256 = "0ndi264rrssqin03qmv7n0fpzs3kasfqykidrlcyizw1ngyfgc1a"; }; - vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq"; + vendorSha256 = "0ywh5d41b1c5ivwngsgn46d6yb7s1wqyzl5b0j1x4mcvydi5yi98"; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index f56ce386e42..defad82d5a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 5e105ad9dd3..37c10bf2f98 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a"; + sha256 = "11186pdgaw5p4iv10dqcnynf5pws2v9nhqqqca7z5b7m20fpfjl7"; }; buildInputs = [ git gettext ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 08875dabd0f..f0184c66377 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index ac3de7cbc9e..8c7ecee0476 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,20 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gitMinimal, python2Packages }: +{ lib, stdenv, fetchFromGitHub, gitMinimal, docutils }: stdenv.mkDerivation rec { pname = "git-hub"; - version = "1.1.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "sociomantic-tsunami"; repo = "git-hub"; rev = "v${version}"; - sha256 = "0jkzg7vjvgb952qncndhki7n70714w61flbzf4mdcjc286lqjvwb"; + sha256 = "1df9l8fpbxjgcgi72fwaqxiay5kpfihyc63f0gj67mns9n9ic1i7"; }; - buildInputs = [ python2Packages.python ]; nativeBuildInputs = [ gitMinimal # Used during build to generate Bash completion. - python2Packages.docutils + docutils ]; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index 942a12e239b..7b8b5fed90f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 5e5bba3df72..c67a575172c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 2ecc5d872b8..1a1811b2f43 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 037de14658d..ec1c44b9613 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index eea7bed011b..3143d7ef9c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 87cb7452c75..add7bfc5526 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 90f6ba5ac5a..5d1589446be 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,4 @@ { fetchurl, lib, stdenv, buildPackages -, fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 @@ -8,6 +7,7 @@ , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true , nlsSupport ? true +, osxkeychainSupport ? stdenv.isDarwin , guiSupport , withManual ? true , pythonSupport ? true @@ -19,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 ]; @@ -35,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"; @@ -65,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 ] @@ -115,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 @@ -129,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 @@ -248,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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 08bf5eb6ba0..6572b9b7fc8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 81b2984087b..f980ea5d015 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index eae572530c3..7a23ec678a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JvHuOMpt62tw7ewDev7unAgZGV+ZSo6wDuiPhWap2v0="; + sha256 = "sha256-wOeWqgN0VYmTXPTU3z5Utau8diW18QKV7w/2y86R8U0="; }; - vendorSha256 = "sha256-0nnrH3GJhd4wlRETo9iSlFkXq358m30k7Fsb5haHlpQ="; + vendorSha256 = "sha256-Ge3nwI0cY2JxRTn3EZtlal5c6A6TIKfH/CkJnQ1C6PY="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 41c4e653a63..a9138fa0c87 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s"; + sha256 = "sha256-EQqbWM/4CInFNndfD+k7embPUFLXgxRT44e/+Ik2TDs="; }; subPackages = [ "." ]; - vendorSha256 = "07zl5xhzgrgr5skba6cds5nal58pllf10gak0ap62j1k9gk2ych2"; + vendorSha256 = "sha256-T6kGhje3K2HnR8xRuio6AsYbSwIdbWvAk3ZSnbm1NsA="; doCheck = false; @@ -33,6 +33,6 @@ buildGoModule rec { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; - maintainers = with maintainers; [ marsam dtzWill ]; + maintainers = with maintainers; [ marsam dtzWill SuperSandro2000 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 26f46066531..766cb417b74 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 8c73c00f00c..a40e959a50a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 69742b6d760..74f10a14288 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index aebd488fe30..3225744abc5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index f6250563fc9..72f6d67c2f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 566459afa18..00bc73c8541 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/infra/libkookie/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.3"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII="; + sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE="; }; unpackPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 7dd8ff43974..3c66456433a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/infra/libkookie/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.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1v89aza7iwph7k5phyld5m5856c5wbh8ncgg6lh7558v4xna0x57"; + sha256 = "sha256-7baWXv+SV1LX5p+eH6egp4QfTm1SXK8ITcOEj8yFAXg="; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 9ea6d241060..e0312cddd40 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.7.4", - "repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm", + "version": "13.8.4", + "repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.7.4-ee", + "rev": "v13.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.7.4", + "GITALY_SERVER_VERSION": "13.8.4", "GITLAB_PAGES_VERSION": "1.34.0", - "GITLAB_SHELL_VERSION": "13.14.0", - "GITLAB_WORKHORSE_VERSION": "8.58.2" + "GITLAB_SHELL_VERSION": "13.15.1", + "GITLAB_WORKHORSE_VERSION": "8.59.0" } } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index ee6c8201fa3..b9c352a4eac 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 0a7fcd7c260..1a9f3ea8fd6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.3.3' +gem 'activesupport', '~> 6.0.3.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index eb5c86946d7..acfc05c8747 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -86,7 +86,7 @@ GEM json (2.3.1) licensee (8.9.2) rugged (~> 0.24) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -96,12 +96,13 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (1.5.0) nokogiri opentracing (0.5.0) @@ -117,6 +118,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -177,7 +179,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (1.7.0) unparser (0.4.7) @@ -188,13 +190,13 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3.3) + activesupport (~> 6.0.3.4) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 1b96307457c..af879bc127e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,17 +33,17 @@ let }; }; in buildGoModule rec { - version = "13.7.4"; + version = "13.8.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg"; + sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w="; }; - vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; + vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM="; passthru = { inherit rubyEnv; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index b4a6b0e78eb..9159b62c8df 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -360,10 +360,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -414,12 +414,14 @@ version = "1.0.2"; }; 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" "development" "test"]; @@ -452,15 +454,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"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -538,6 +540,16 @@ }; version = "0.12.2"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; @@ -819,10 +831,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -850,9 +862,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index a1a9df57f04..dcd24bab3cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.14.0"; + version = "13.15.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0"; + sha256 = "sha256-wDZLcCBbWjG6wIcEj02eqwWVfAYy1TuAo/xvJB8tt+0="; }; buildInputs = [ ruby ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 3e292632d4c..8f004341440 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.58.2"; + version = "8.59.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp"; + sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8="; }; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index fcb954e3884..83e3d7fe141 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 49d0841be3c..c7ed1cd4d71 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,9 +4,6 @@ gem 'rails', '~> 6.0.3.1' gem 'bootsnap', '~> 1.4.6' -# Improves copy-on-write performance for MRI -gem 'nakayoshi_fork', '~> 0.0.4' - # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -19,10 +16,10 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.5' +gem 'grape-path-helpers', '~> 1.6.1' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.9.0' +gem 'marginalia', '~> 1.10.0' # Authentication libraries gem 'devise', '~> 4.7.2' @@ -57,7 +54,7 @@ gem 'gssapi', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 0.12.1' +gem 'invisible_captcha', '~> 1.1.0' # Two-factor authentication gem 'devise-two-factor', '~> 3.1.0' @@ -81,12 +78,10 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' -gem 'net-ldap' +gem 'net-ldap', '~> 0.16.3' # API -# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged -# Remove config/initializers/grape_patch.rb -gem 'grape', '= 1.4.0' +gem 'grape', '~> 1.5.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' @@ -115,7 +110,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.7' +gem 'fog-aws', '~> 3.8' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -145,7 +140,7 @@ gem 'aws-sdk-s3', '~> 1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.12' +gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' @@ -163,7 +158,7 @@ gem 'asciidoctor-kroki', '~> 0.2.2', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.9' +gem 'nokogiri', '~> 1.11.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -184,15 +179,15 @@ group :unicorn do end group :puma do - gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false - gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false + gem 'puma', '~> 5.1.1', require: false + gem 'puma_worker_killer', '~> 0.3.1', require: false end # State machine -gem 'state_machines-activerecord', '~> 0.6.0' +gem 'state_machines-activerecord', '~> 0.8.0' # Issue tags -gem 'acts-as-taggable-on', '~> 6.0' +gem 'acts-as-taggable-on', '~> 7.0' # Background jobs gem 'sidekiq', '~> 5.2.7' @@ -242,7 +237,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'hipchat', '~> 1.5.0' # Jira integration -gem 'jira-ruby', '~> 2.0.0' +gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration @@ -255,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '0.10.2' +gem 'asana', '~> 0.10.3' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -306,12 +301,12 @@ gem 'rack-attack', '~> 6.3.0' gem 'sentry-raven', '~> 3.0' # PostgreSQL query parsing -gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' +gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.13.3' +gem 'gitlab-labkit', '0.14.0' # I18n gem 'ruby_parser', '~> 3.15', require: false @@ -331,6 +326,7 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics group :metrics do gem 'method_source', '~> 1.0', require: false + gem 'webrick', '~> 1.6.1', require: false # Prometheus gem 'prometheus-client-mmap', '~> 0.12.0' @@ -353,14 +349,15 @@ end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'bullet', '~> 6.1.0' - gem 'pry-byebug', '~> 3.9.0', platform: :mri + gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext'] gem 'pry-rails', '~> 0.3.9' + gem 'pry-remote' gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 4.0.0' + gem 'factory_bot_rails', '~> 6.1.0' + gem 'rspec-rails', '~> 4.0.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -371,7 +368,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 5.3.0', require: false + gem 'gitlab-styles', '~> 6.0.0', require: false gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false @@ -409,7 +406,7 @@ group :test do gem 'rspec_profiling', '~> 0.0.6' gem 'rspec-parameterized', require: false - gem 'capybara', '~> 3.33.0' + gem 'capybara', '~> 3.34.0' gem 'capybara-screenshot', '~> 1.0.22' gem 'selenium-webdriver', '~> 3.142' @@ -465,7 +462,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.7.0.pre.rc1' +gem 'gitaly', '~> 13.8.0.pre.rc2' gem 'grpc', '~> 1.30.2' @@ -478,7 +475,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.4.4' +gem 'gitlab-experiment', '~> 0.4.5' # Structured logging gem 'lograge', '~> 0.5' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 1cd90080fd8..b370024b95b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -5,66 +5,66 @@ GEM abstract_type (0.0.7) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) + acts-as-taggable-on (7.0.0) + activerecord (>= 5.0, < 6.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -76,7 +76,7 @@ GEM apollo_upload_server (2.0.2) graphql (>= 1.8) rails (>= 4.2) - asana (0.10.2) + asana (0.10.3) faraday (~> 1.0) faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) @@ -115,13 +115,14 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) - azure-storage-blob (2.0.0) + azure-storage-blob (2.0.1) azure-storage-common (~> 2.0) - nokogiri (~> 1.10.4) - azure-storage-common (2.0.1) + nokogiri (~> 1.11.0.rc2) + azure-storage-common (2.0.2) faraday (~> 1.0) faraday_middleware (~> 1.0.0.rc1) - nokogiri (~> 1.10.4) + net-http-persistent (~> 4.0) + nokogiri (~> 1.11.0.rc2) babosa (1.0.2) base32 (0.3.2) batch-loader (1.4.0) @@ -151,7 +152,7 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (11.1.3) - capybara (3.33.0) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -228,17 +229,16 @@ GEM activerecord (>= 3.2.0, < 6.1) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (1.7.0) + derailed_benchmarks (1.8.1) benchmark-ips (~> 2) get_process_mem (~> 0) heapy (~> 0) memory_profiler (~> 0) - mini_histogram (~> 0) + mini_histogram (>= 0.2.1) rack (>= 1) rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) - unicode_plot (>= 0.0.4, < 1.0.0) device_detector (1.0.0) devise (4.7.3) bcrypt (~> 3.0) @@ -252,7 +252,7 @@ GEM devise (~> 4.0) railties (< 6.1) rotp (~> 2.0) - diff-lcs (1.3) + diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) discordrb-webhooks-blackst0ne (3.3.0) @@ -265,21 +265,19 @@ GEM doorkeeper-openid_connect (1.7.4) doorkeeper (>= 5.2, < 5.5) json-jwt (>= 1.11.0) - dry-configurable (0.11.5) + dry-configurable (0.12.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-core (0.5.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-logic (1.0.6) + dry-logic (1.1.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-types (1.4.0) concurrent-ruby (~> 1.0) dry-container (~> 0.3) @@ -309,7 +307,6 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - enumerable-statistics (2.0.1) equalizer (0.0.11) erubi (1.9.0) escape_utils (1.2.1) @@ -321,11 +318,11 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) - factory_bot (5.1.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.1.0) - factory_bot (~> 5.1.0) - railties (>= 4.2.0) + factory_bot (6.1.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.1.0) + factory_bot (~> 6.1.0) + railties (>= 5.0.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) @@ -363,7 +360,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.7.0) + fog-aws (3.8.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -420,12 +417,12 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.7.0.pre.rc1) + gitaly (13.8.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-experiment (0.4.4) + gitlab-experiment (0.4.5) activesupport (>= 3.0) scientist (~> 1.5, >= 1.5.0) gitlab-fog-azure-rm (1.0.0) @@ -435,9 +432,9 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.13.3) - actionpack (>= 5.0.0, < 6.1.0) - activesupport (>= 5.0.0, < 6.1.0) + gitlab-labkit (0.14.0) + actionpack (>= 5.0.0, < 7.0.0) + activesupport (>= 5.0.0, < 7.0.0) gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) @@ -447,19 +444,17 @@ GEM gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-pg_query (1.3.0) - gitlab-puma (4.3.5.gitlab.3) - nio4r (~> 2.0) - gitlab-puma_worker_killer (0.1.1.gitlab.1) - get_process_mem (~> 0.2) - gitlab-puma (>= 2.7, < 5) + gitlab-pg_query (1.3.1) + gitlab-pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (5.3.0) - rubocop (~> 0.89.1) - rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.8.1) - rubocop-rails (~> 2.8) + gitlab-styles (6.0.0) + rubocop (~> 0.91.1) + rubocop-gitlab-security (~> 0.1.1) + rubocop-performance (~> 1.9.2) + rubocop-rails (~> 2.9) rubocop-rspec (~> 1.44) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) @@ -497,7 +492,7 @@ GEM signet (~> 0.14) gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.4.0) + grape (1.5.1) activesupport builder dry-types (>= 1.1) @@ -507,10 +502,11 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.5.0) + grape-path-helpers (1.6.1) activesupport grape (~> 1.3) rake (> 12) + ruby2_keywords (~> 0.0.2) grape_logging (1.8.3) grape rack @@ -573,11 +569,12 @@ GEM hashie (>= 3.0) health_check (3.0.0) railties (>= 5.0) - heapy (0.1.4) + heapy (0.2.0) + thor hipchat (1.5.2) httparty mimemagic - html-pipeline (2.12.2) + html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -598,18 +595,18 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) ice_nine (0.11.2) - invisible_captcha (0.12.1) - rails (>= 3.2.0) + invisible_captcha (1.1.0) + rails (>= 4.2) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jira-ruby (2.0.0) + jira-ruby (2.1.4) activesupport atlassian-jwt multipart-post @@ -686,7 +683,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -695,7 +692,7 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - marginalia (1.9.0) + marginalia (1.10.0) actionpack (>= 2.3) activerecord (>= 2.3) memoist (0.16.2) @@ -707,10 +704,10 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mimemagic (0.3.5) - mini_histogram (0.1.3) + mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.11.3) ms_rest (0.7.6) concurrent-ruby (~> 1.0) @@ -730,17 +727,19 @@ GEM ruby2_keywords (~> 0.0.1) mustermann-grape (1.0.1) mustermann (>= 1.0.0) - nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) - net-ldap (0.16.2) + net-http-persistent (4.0.0) + connection_pool (~> 2.2) + net-ldap (0.16.3) net-ntp (2.1.3) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) notiffany (0.1.3) @@ -840,13 +839,14 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - parallel (1.19.2) - parser (2.7.2.0) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) + pg_query (1.3.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -866,14 +866,20 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) public_suffix (4.0.6) + puma (5.1.1) + nio4r (~> 2.0) + puma_worker_killer (0.3.1) + get_process_mem (~> 0.2) + puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) + racc (1.5.2) rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) @@ -894,20 +900,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3.3) + railties (= 6.0.3.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -921,15 +927,15 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.1) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -989,25 +995,25 @@ GEM chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.0) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-parameterized (0.4.2) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.0) + rspec-rails (4.0.1) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -1017,7 +1023,7 @@ GEM rspec-support (~> 3.9) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.9.2) + rspec-support (3.10.0) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) @@ -1025,26 +1031,26 @@ GEM pg rails sqlite3 - rubocop (0.89.1) + rubocop (0.91.1) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.3.0, < 1.0) + rubocop-ast (>= 0.4.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.8.0) parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) + rubocop (>= 0.90.0, < 2.0) rubocop-rspec (1.44.1) rubocop (~> 0.87) rubocop-ast (>= 0.7.1) @@ -1053,7 +1059,7 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (1.3.1) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby-statistics (2.1.2) @@ -1127,6 +1133,7 @@ GEM simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) + slop (3.6.0) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) spring (2.1.1) @@ -1143,12 +1150,12 @@ GEM sshkey (2.0.0) stackprof (0.2.15) state_machines (0.5.0) - state_machines-activemodel (0.7.1) - activemodel (>= 4.1) + state_machines-activemodel (0.8.0) + activemodel (>= 5.1) state_machines (>= 0.5.0) - state_machines-activerecord (0.6.0) - activerecord (>= 4.1) - state_machines-activemodel (>= 0.5.0) + state_machines-activerecord (0.8.0) + activerecord (>= 5.1) + state_machines-activemodel (>= 0.8.0) swd (1.1.2) activesupport (>= 3) attr_required (>= 0.0.5) @@ -1185,7 +1192,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1193,8 +1200,6 @@ GEM unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) - unicode_plot (0.0.4) - enumerable-statistics (>= 2.0.1) unicode_utils (1.4.0) unicorn (5.5.5) kgio (~> 2.6) @@ -1247,6 +1252,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.6.1) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -1259,7 +1265,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.1) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -1268,11 +1274,11 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) - acts-as-taggable-on (~> 6.0) + acts-as-taggable-on (~> 7.0) addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.2) - asana (= 0.10.2) + asana (~> 0.10.3) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-kroki (~> 0.2.2) @@ -1297,7 +1303,7 @@ DEPENDENCIES browser (~> 4.2) bullet (~> 6.1.0) bundler-audit (~> 0.6.1) - capybara (~> 3.33.0) + capybara (~> 3.34.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) @@ -1329,7 +1335,7 @@ DEPENDENCIES email_spec (~> 2.2.0) erubi (~> 1.9.0) escape_utils (~> 1.1) - factory_bot_rails (~> 5.1.0) + factory_bot_rails (~> 6.1.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank @@ -1339,7 +1345,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.7) + fog-aws (~> 3.8) fog-core (= 2.1.0) fog-google (~> 1.12) fog-local (~> 0.6) @@ -1351,30 +1357,28 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.7.0.pre.rc1) + gitaly (~> 13.8.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-experiment (~> 0.4.4) + gitlab-experiment (~> 0.4.5) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.13.3) + gitlab-labkit (= 0.14.0) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) - gitlab-pg_query (~> 1.3) - gitlab-puma (~> 4.3.3.gitlab.2) - gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) + gitlab-pry-byebug gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 5.3.0) + gitlab-styles (~> 6.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.33) google-protobuf (~> 3.12) gpgme (~> 2.0.19) - grape (= 1.4.0) + grape (~> 1.5.1) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.5) + grape-path-helpers (~> 1.6.1) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphlient (~> 0.4.0) @@ -1390,13 +1394,13 @@ DEPENDENCIES hashie-forbidden_attributes health_check (~> 3.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.12) + html-pipeline (~> 2.13.2) html2text httparty (~> 0.16.4) icalendar - invisible_captcha (~> 0.12.1) + invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - jira-ruby (~> 2.0.0) + jira-ruby (~> 2.1.4) js_regex (~> 3.4) json (~> 2.3.0) json-schema (~> 2.8.0) @@ -1414,18 +1418,17 @@ DEPENDENCIES loofah (~> 2.2) lru_redux mail (= 2.7.1) - marginalia (~> 1.9.0) + marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) mimemagic (~> 0.3.2) mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - nakayoshi_fork (~> 0.0.4) - net-ldap + net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.10.9) + nokogiri (~> 1.11.1) oauth2 (~> 1.4) octokit (~> 4.15) oj (~> 3.10.6) @@ -1451,11 +1454,14 @@ DEPENDENCIES parallel (~> 1.19) peek (~> 1.1) pg (~> 1.1) + pg_query (~> 1.3.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) - pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) + pry-remote + puma (~> 5.1.1) + puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) @@ -1481,7 +1487,7 @@ DEPENDENCIES rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.0) + rspec-rails (~> 4.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) @@ -1511,7 +1517,7 @@ DEPENDENCIES sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.15) - state_machines-activerecord (~> 0.6.0) + state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.1.6) terser (= 1.0.2) test-prof (~> 0.12.0) @@ -1530,6 +1536,7 @@ DEPENDENCIES vmstat (~> 2.3.0) webauthn (~> 2.3) webmock (~> 3.9.1) + webrick (~> 1.6.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.1) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index a4758f7418e..20857db2666 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpmxbprsqclna9xpa6b7sspjb89p6jqfxalasa9f984hx77dx27"; + sha256 = "0y3aa0965cdsqamxk8ac6brcvijl1zv4pvqils6xy3pbcrv0ljid"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smcxpn3glnmid3v2pk04sb3bdifbw7ad1c7fq6wfijkrpih8jiw"; + sha256 = "10vb9s4frq22h5j6gyw2598k1jc29lg2czm95hf284l3mi4qly6a"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -48,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1spq0dbfn0qkqg9sq0rsjn360b4j36zly8hawaivkrwr3rsvyz75"; + sha256 = "1ykn5qkwdlcv5aa1gjhhmrxpjccwa7df6n4amvkmvxv5lggyma52"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -59,10 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -70,10 +70,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ysfz9dwnncdx0g452by7jdr35yryz6lmcrbb4r5wgjm57b4n25"; + sha256 = "0r0j0m76ynjspmvj5qbzl06kl9i920v269iz62y62009xydv6rqz"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -81,10 +81,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w54ckvc229iaax879hkhyc93j7z8p0v7acp6mk3h8xjfvmwy5jp"; + sha256 = "0d0p8gjplrgym38dmchyzhv7lrrxngz0yrxl6xyvwxfxm1hgdk2k"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166jlx6kbby01vr37srh081a9fykgsz873yg5i9gl2ar3vw9gs56"; + sha256 = "00jj8namy5niq7grl5lrsr4y351rxpj1b69k1i9gvb1hnpghl099"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2a4ss6ld6yrhpcbcb3kjn5gj6zk9qklp2aq5rl1awl8vbdbdb7"; + sha256 = "06qvvp73z8kq9sd2mhw6p9124q5pfkswjga2fidz4c73zbr79r3g"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nvfjkq979m1h4mk1ys7m4irwpswn4l9arb9yi06ffqpi1lpfl31"; + sha256 = "0q734331wb7cfsh4jahj3lphpxvglzb17yvibwss1ml4g01xxm52"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -158,10 +158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga"; + sha256 = "09m7lvm6id8mm8y9qycjr54l9gyqfb43x6yjz23cggisjg0px1fv"; type = "gem"; }; - version = "6.5.0"; + version = "7.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8n8i3jb2q09l6rgcw0lb4sq85jzz6vywqlrd0ivq989zh3sq2l"; + sha256 = "14cs2k802hlvlmn0nwnx4k3g44944x0a8dsj3k14mjnbvcw1fkxh"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; asciidoctor = { groups = ["default"]; @@ -423,21 +423,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qpvjyaq8478hw4cxcf8lr303wn8g9mhrfmvihyzn3zn9hll4zvd"; + sha256 = "01psx005lkrfk3zm816z76fa2pv4hd8jk7hxrjyy4hbvgcqi6rfy"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; azure-storage-common = { - dependencies = ["faraday" "faraday_middleware" "nokogiri"]; + dependencies = ["faraday" "faraday_middleware" "net-http-persistent" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nhjw77r65xrkdn2h6cd76mglgx676hyr58igyfb9f7zbgvjp69s"; + sha256 = "0h5bwswc5768hblcxsschjz3y0lf9kvz3k7qqwypdhy8sr1lfxg8"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; babosa = { groups = ["default"]; @@ -635,10 +635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w"; + sha256 = "1i1bm7r8n67cafd9p3ck7vdmng921b41n9znvlfaz7cy8a3gsrgm"; type = "gem"; }; - version = "3.33.0"; + version = "3.34.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -1004,15 +1004,15 @@ version = "1.5.1"; }; derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"]; - groups = ["default"]; + dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03lrvzvdjy6wyrnb3nw7nqn9jbhn6lncach58pj6m4l76b2n6jpr"; + sha256 = "05nryqr18w61dyk9amajh7chn07zxardxnywayyis72kmd8f9q29"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; device_detector = { groups = ["default"]; @@ -1051,10 +1051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; type = "gem"; }; - version = "1.3"; + version = "1.4.4"; }; diff_match_patch = { groups = ["default"]; @@ -1131,15 +1131,15 @@ version = "1.7.4"; }; dry-configurable = { - dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + dependencies = ["concurrent-ruby" "dry-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033x4gvynfm33pchmpd5iw9n4c9q46j8vbwbcdmvb8b2r0gpzfdn"; + sha256 = "0rvwvxrvcygvgfc3xjrihvdvnr0dh2144s8x80zfgfnz0jd5gac7"; type = "gem"; }; - version = "0.11.5"; + version = "0.12.0"; }; dry-container = { dependencies = ["concurrent-ruby" "dry-configurable"]; @@ -1158,10 +1158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9ff2sr4ymiwzg4mchzv66mn6rdsgjlinm6s4x5x91yhd0h4vpk"; + sha256 = "14s45hxcqpp2mbvwlwzn018i8qhcjzgkirigdrv31jd741rpgy9s"; type = "gem"; }; - version = "0.4.9"; + version = "0.5.0"; }; dry-equalizer = { groups = ["default"]; @@ -1184,15 +1184,15 @@ version = "0.2.0"; }; dry-logic = { - dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + dependencies = ["concurrent-ruby" "dry-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqvylwv71sm9zrb0lpxmghn20zxnjswxwyhaj8y2wfniffyjgkc"; + sha256 = "17dnc3g9y2nj42rdx2bdvsvvms10vgw4qzjb2iw2gln9hj8b797c"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.0"; }; dry-types = { dependencies = ["concurrent-ruby" "dry-container" "dry-core" "dry-equalizer" "dry-inflector" "dry-logic"]; @@ -1311,16 +1311,6 @@ }; version = "3.0.0"; }; - enumerable-statistics = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ac2f5g4m58l6bmap1ak6vgqykz2hy9n3c8r6dmlr2xjybdryc1f"; - type = "gem"; - }; - version = "2.0.1"; - }; equalizer = { groups = ["default" "development" "test"]; platforms = []; @@ -1419,10 +1409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mvwcdh1056r79vq969vlncrcy53fkhw0iixpqvp8gnx5ajbsv6"; + sha256 = "11ij9s4hasy963qjqbrrf0m8lm9m9pxkh2vf4wrnafa6gw6r9qk8"; type = "gem"; }; - version = "5.1.0"; + version = "6.1.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1430,10 +1420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02q7lwfdilwahza2jz0p0kc2rragv617q9r2yy72syv6lfy923sx"; + sha256 = "0hfxkq6rarg0b8xfzqg200xyj176sn1xplqqqcrz5drhkqp30m14"; type = "gem"; }; - version = "5.1.0"; + version = "6.1.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -1612,10 +1602,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1764kvyzigaxwmxgfggpqq15qpplm77j2nmvhf8f0gybsm3vbrbn"; + sha256 = "1q7n8r03akjbdz3r2bgsl6wcjvdlf0k508z8bsd9zgs43qg14vc9"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1808,10 +1798,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al29diaj9zrkj1rxwrqd644f2winv81dmnjycvm0gsim0vvw2hq"; + sha256 = "0kns9lw8gdxm61vyvf3jin448zrl2h3qdx2ggilzxig28hdi0vha"; type = "gem"; }; - version = "13.7.0.pre.rc1"; + version = "13.8.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1840,10 +1830,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12ng0q49vl4k80m3hyx6bz915x1gmfmxjvgzdp3w0q77j4qv6nwi"; + sha256 = "1v8ygrc2c98rz72za59g313n1mmr18jdbzr965lkp2zv2rw7cs9n"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1862,10 +1852,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4d5dl60cfvvqj89b8blpsxa7lbbblqwdqy8kc1z51gira7i803"; + sha256 = "0l4sbvlk6qc0x8372rp1gc2ihmx3vp0afrm5cy55xhflq16y7sl1"; type = "gem"; }; - version = "0.13.3"; + version = "0.14.0"; }; gitlab-license = { groups = ["default"]; @@ -1912,32 +1902,25 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xvzs8gy6vbddzf9kin92lqb99vzwljikfgqvxbxqm7hzl16dilq"; + sha256 = "1rybirjyclavp641qdx27483xx0zpmc577wdzfgdnjd7753bya7g"; type = "gem"; }; - version = "1.3.0"; - }; - gitlab-puma = { - dependencies = ["nio4r"]; - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05hazn3cq079zynj0viagly6bgh4x7pb2vqki9rgf2k39ljwrmld"; - type = "gem"; - }; - version = "4.3.5.gitlab.3"; + version = "1.3.1"; }; - gitlab-puma_worker_killer = { - dependencies = ["get_process_mem" "gitlab-puma"]; - groups = ["puma"]; - platforms = []; + gitlab-pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iagbqh4djbxfd18srvfg9qcxn845ibs3kf0q1sd57k27lxj0har"; + sha256 = "0sp33vzzw8b7q9d8kb4pw8cl5fzlbffdpwz125x1g3kdiwz8xp3j"; type = "gem"; }; - version = "0.1.1.gitlab.1"; + version = "3.9.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1956,10 +1939,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14zg4mxj780ssk6lg8mvy4br3327cdlq17k5sds8zk2glng9vmsh"; + sha256 = "17d238cy031gnjmrk6wl3qyk5kqhqjxrb68813n4y9ia817xmwyp"; type = "gem"; }; - version = "5.3.0"; + version = "6.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2076,10 +2059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylzpn9mng9kwk472xbsfnqcbnm0qcjjlscp17hijvpvafd8a09"; + sha256 = "0lizcma35sygkd3q7zjv13mrr905ncn80f1ym6n305s75kc0pk9n"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2093,15 +2076,15 @@ version = "0.7.1"; }; grape-path-helpers = { - dependencies = ["activesupport" "grape" "rake"]; + dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131s6a0xa0fj7w5d6xb2p2z3404w6rxbc33v7fcg50jrjgqphrjz"; + sha256 = "1xdp7b5fnvm89szy8ghpl6wm125iq7f0qnhibj5bxqrvg3xyhc2m"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.1"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2318,14 +2301,15 @@ version = "3.0.0"; }; heapy = { - groups = ["default"]; + dependencies = ["thor"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw"; + sha256 = "1sl56ma851i82g3ax08igbn48igriiy152xzx30wgzv1bn21w53l"; type = "gem"; }; - version = "0.1.4"; + version = "0.2.0"; }; hipchat = { dependencies = ["httparty" "mimemagic"]; @@ -2344,10 +2328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2"; + sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; type = "gem"; }; - version = "2.12.2"; + version = "2.13.2"; }; html2text = { dependencies = ["nokogiri"]; @@ -2450,10 +2434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.7"; }; i18n_data = { groups = ["default"]; @@ -2491,10 +2475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88"; + sha256 = "1lmlx3g4z894vwsgbpxhpmkn63n74mynklbwy07l7ccak552jw1n"; type = "gem"; }; - version = "0.12.1"; + version = "1.1.0"; }; ipaddress = { groups = ["default"]; @@ -2523,10 +2507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bfqb5qkgbcjrspspa2lha2is0anjnby20x9gp7bfjr5j5j9my32"; + sha256 = "17nv98nz3jp7q5hbnniscavqh4xv53mnda1vxyg3ncn8raaw0rs2"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.4"; }; jmespath = { groups = ["default"]; @@ -2813,10 +2797,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; lru_redux = { groups = ["default"]; @@ -2866,10 +2850,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n870r50z859dkcjz6dqvbvm895rpzw047basvbbfv9gi22rlxlv"; + sha256 = "1003hf828anbd3pxwzs9ir9sclh64mgj971n4a7ilgj9xs8r0a38"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; memoist = { groups = ["default"]; @@ -2948,14 +2932,14 @@ version = "0.3.5"; }; mini_histogram = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127vmd85kwi85qjbb1431bi4j5gdy0pp6wrq1f88ja1pf3mlb50y"; + sha256 = "156xs8k7fqqcbk1fbf0ndz6gfw380fb2jrycfvhb06269r84n4ba"; type = "gem"; }; - version = "0.1.3"; + version = "0.3.1"; }; mini_magick = { groups = ["default"]; @@ -2982,10 +2966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["development" "test"]; @@ -3091,16 +3075,6 @@ }; version = "1.0.1"; }; - nakayoshi_fork = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg"; - type = "gem"; - }; - version = "0.0.4"; - }; nap = { groups = ["default" "development"]; platforms = []; @@ -3121,15 +3095,26 @@ }; version = "0.3.0"; }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sbdvkn7mzl883iykz74hgp14qj041gldf2vdk9g3gyqc843l2vr"; + type = "gem"; + }; + version = "4.0.0"; + }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; type = "gem"; }; - version = "0.16.2"; + version = "0.16.3"; }; net-ntp = { groups = ["default"]; @@ -3182,15 +3167,15 @@ version = "0.1.2"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3594,10 +3579,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.2"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -3605,10 +3590,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.2.0"; + version = "3.0.0.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3641,6 +3626,16 @@ }; version = "1.2.3"; }; + pg_query = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; + type = "gem"; + }; + version = "1.3.0"; + }; png_quantizator = { groups = ["development" "test"]; platforms = []; @@ -3730,31 +3725,27 @@ }; version = "0.13.1"; }; - pry-byebug = { - dependencies = ["byebug" "pry"]; + pry-rails = { + dependencies = ["pry"]; groups = ["development" "test"]; - platforms = [{ - engine = "maglev"; - } { - engine = "ruby"; - }]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; type = "gem"; }; - version = "3.9.0"; + version = "0.3.9"; }; - pry-rails = { - dependencies = ["pry"]; + pry-remote = { + dependencies = ["pry" "slop"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + sha256 = "10g1wrkcy5v5qyg9fpw1cag6g5rlcl1i66kn00r7kwqkzrdhd7nm"; type = "gem"; }; - version = "0.3.9"; + version = "0.1.8"; }; public_suffix = { groups = ["default" "development" "test"]; @@ -3766,6 +3757,28 @@ }; version = "4.0.6"; }; + puma = { + dependencies = ["nio4r"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + type = "gem"; + }; + version = "5.1.1"; + }; + puma_worker_killer = { + dependencies = ["get_process_mem" "puma"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jk1bhmx5px8y1ip4ky80cq5cwdaybdg4y55shd2vsdmjv938mcw"; + type = "gem"; + }; + version = "0.3.1"; + }; pyu-ruby-sasl = { groups = ["default"]; platforms = []; @@ -3786,6 +3799,16 @@ }; version = "1.1.6"; }; + racc = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default" "development" "kerberos" "test"]; platforms = []; @@ -3889,10 +3912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqsiwsb13sxkvxj54aybjhbxqi45fyiykaz5isc1y9frm2yyw64"; + sha256 = "0vs4kfgp5pr5032nnhdapq60ga6karann06ilq1yjx8qck87cfxg"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3944,10 +3967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05b79r0ms8jrs91zml1190qfxmnmks90g0sd820ks9msyr8xdp7j"; + sha256 = "0x28620cvfja8r06lk6f90pw5lvijz9qi4bjsa4z1d1rkr3v4r3w"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3974,10 +3997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -4305,10 +4328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -4316,10 +4339,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd"; + sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4327,10 +4350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjbwvq7qaz6h3sh1bs9q2qiy4zwcrc8f7xwv82dx2bc09dmqzhd"; + sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4338,10 +4361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -4360,10 +4383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01cyd449g4lsgrlck7nn3ynn8c8vwfhjb913y05wil56y77wsfkl"; + sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4381,10 +4404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3"; + sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.0"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4414,10 +4437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yh71v5d7aw6jz7505d2sv0n0ldf3wh0ly3lphdanjl0n8b42y9h"; + sha256 = "19nmdwz6mc5ah0xqlj1j58ylcp9zsckb1xm7p1z51abnqhcq5c06"; type = "gem"; }; - version = "0.89.1"; + version = "0.91.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4447,10 +4470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13v66wi5l56bvp97nlmyxscq8ipkzfha1g7nlhcrbikvmrm3h5kf"; + sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.2"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4458,10 +4481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh"; + sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4511,10 +4534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; ruby-saml = { dependencies = ["nokogiri"]; @@ -4885,6 +4908,16 @@ }; version = "2.3.4"; }; + slop = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; snowplow-tracker = { dependencies = ["contracts"]; groups = ["default"]; @@ -4985,10 +5018,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd"; + sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; @@ -4996,10 +5029,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511"; + sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; @@ -5226,10 +5259,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.8"; + version = "1.2.9"; }; u2f = { groups = ["default"]; @@ -5282,17 +5315,6 @@ }; version = "1.7.0"; }; - unicode_plot = { - dependencies = ["enumerable-statistics"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09cv90pi414ns1knbi0zjbn59071qjgym974jpsgj7yjh70dpj0g"; - type = "gem"; - }; - version = "0.0.4"; - }; unicode_utils = { groups = ["default"]; platforms = []; @@ -5475,6 +5497,16 @@ }; version = "3.9.1"; }; + webrick = { + groups = ["metrics"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6nv626lzfl7wx407l5x5688layh9qd82k97hrm6pwgj6miwk8b"; + type = "gem"; + }; + version = "1.6.1"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default" "test"]; @@ -5553,9 +5585,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix index ba24888d952..74d4020f22d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -778,19 +778,27 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz"; - sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319"; + name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz"; + sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256"; }; } { - name = "_gitlab_svgs___svgs_1.177.0.tgz"; + name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.177.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz"; - sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5"; + name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/favicon-overlay/-/favicon-overlay-2.0.0.tgz"; + sha1 = "2f32d0b6a4d5b8ac44e2927083d9ab478a78c984"; + }; + } + { + name = "_gitlab_svgs___svgs_1.178.0.tgz"; + path = fetchurl { + name = "_gitlab_svgs___svgs_1.178.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz"; + sha1 = "069edb8abb4c7137d48f527592476655f066538b"; }; } { @@ -802,11 +810,11 @@ }; } { - name = "_gitlab_ui___ui_24.8.1.tgz"; + name = "_gitlab_ui___ui_25.11.3.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_24.8.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz"; - sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7"; + name = "_gitlab_ui___ui_25.11.3.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz"; + sha1 = "54719d1276f417e66904f9f951671633f1647006"; }; } { @@ -970,19 +978,19 @@ }; } { - name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; + name = "_rails_actioncable___actioncable_6.1.0.tgz"; path = fetchurl { - name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz"; - sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a"; + name = "_rails_actioncable___actioncable_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.0.tgz"; + sha1 = "f336f25450b1bc43b99bc60557a70b6e6bb1d3d2"; }; } { - name = "_rails_ujs___ujs_6.0.3_2.tgz"; + name = "_rails_ujs___ujs_6.1.0.tgz"; path = fetchurl { - name = "_rails_ujs___ujs_6.0.3_2.tgz"; - url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz"; - sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3"; + name = "_rails_ujs___ujs_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz"; + sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751"; }; } { @@ -1178,11 +1186,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.4.tgz"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; }; } { @@ -1314,11 +1322,11 @@ }; } { - name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; + name = "_vue_test_utils___test_utils_1.1.2.tgz"; path = fetchurl { - name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz"; - sha1 = "d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d"; + name = "_vue_test_utils___test_utils_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz"; + sha1 = "fdb487448dceefeaf3d01d465f7c836a3d666dbc"; }; } { @@ -1538,11 +1546,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { @@ -1610,19 +1618,19 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "ajv___ajv_6.12.5.tgz"; + name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.5.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; - sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } { @@ -4402,11 +4410,11 @@ }; } { - name = "dompurify___dompurify_2.2.4.tgz"; + name = "dompurify___dompurify_2.2.6.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz"; - sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"; + name = "dompurify___dompurify_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz"; + sha1 = "54945dc5c0b45ce5ae228705777e8e59d7b2edc4"; }; } { @@ -4874,11 +4882,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz"; - sha1 = "27fecd9a3a24789b0f111ecdd540a9e56198e0fe"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; + sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6"; }; } { @@ -4914,11 +4922,11 @@ }; } { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } { @@ -4938,11 +4946,11 @@ }; } { - name = "espree___espree_6.1.2.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; - sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -5225,6 +5233,14 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz"; + path = fetchurl { + name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/fast-mersenne-twister/-/fast-mersenne-twister-1.0.2.tgz"; + sha1 = "5ead7caf3ace592a5789d11767732bd81cbaaa56"; + }; + } { name = "fault___fault_1.0.2.tgz"; path = fetchurl { @@ -7874,11 +7890,11 @@ }; } { - name = "katex___katex_0.10.0.tgz"; + name = "katex___katex_0.10.2.tgz"; path = fetchurl { - name = "katex___katex_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz"; - sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; + name = "katex___katex_0.10.2.tgz"; + url = "https://registry.yarnpkg.com/katex/-/katex-0.10.2.tgz"; + sha1 = "39973edbb65eda5b6f9e7f41648781e557dd4932"; }; } { @@ -8081,6 +8097,14 @@ sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; }; } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -8593,6 +8617,14 @@ sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790"; }; } + { + name = "mathjax___mathjax_3.1.2.tgz"; + path = fetchurl { + name = "mathjax___mathjax_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/mathjax/-/mathjax-3.1.2.tgz"; + sha1 = "95c0d45ce2330ef7b6a815cebe7d61ecc26bbabd"; + }; + } { name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; path = fetchurl { @@ -8721,14 +8753,6 @@ sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8"; }; } - { - name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; - path = fetchurl { - name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz"; - sha1 = "f916618ee43d7179efcf641bec4531eb9670978a"; - }; - } { name = "methods___methods_1.1.2.tgz"; path = fetchurl { @@ -10265,14 +10289,6 @@ sha1 = "a3b4160516007075d29127262f3a0063d19896e9"; }; } - { - name = "prettier___prettier_1.18.2.tgz"; - path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; - }; - } { name = "prettier___prettier_2.0.5.tgz"; path = fetchurl { @@ -10281,6 +10297,22 @@ sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; }; } + { + name = "prettier___prettier_2.2.1.tgz"; + path = fetchurl { + name = "prettier___prettier_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; + sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5"; + }; + } + { + name = "prettier___prettier_1.18.2.tgz"; + path = fetchurl { + name = "prettier___prettier_1.18.2.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; + sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + }; + } { name = "pretty_format___pretty_format_25.5.0.tgz"; path = fetchurl { @@ -11338,11 +11370,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; - sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { @@ -12202,11 +12234,11 @@ }; } { - name = "style_loader___style_loader_1.1.3.tgz"; + name = "style_loader___style_loader_1.3.0.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz"; - sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200"; + name = "style_loader___style_loader_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz"; + sha1 = "828b4a3b3b7e7aa5847ce7bae9e874512114249e"; }; } { @@ -13442,11 +13474,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; - sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6"; + name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; + sha1 = "894085839d99d81296fa081d19643733f23d7559"; }; } { @@ -13474,11 +13506,11 @@ }; } { - name = "vue_loader___vue_loader_15.9.5.tgz"; + name = "vue_loader___vue_loader_15.9.6.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.9.5.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz"; - sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706"; + name = "vue_loader___vue_loader_15.9.6.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz"; + sha1 = "f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b"; }; } { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/meld/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/meld/default.nix index 268098b2d2d..89e3a5ea0b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix index 29440724274..f499be17f7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index c841482126a..7c0a96583e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix index d6d55eaa4eb..56cc2a4ea5a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/pijul/default.nix index eaad772f734..776a794d649 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index 3e89fe0a4dc..7fb26476d8a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , srht, redis, celery, pyyaml, markdown }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix index ea3f58e3890..5ce140273eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pyyaml, PyGithub }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index 8966cbe0800..a25a14f610c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , srht, minio, pygit2, scmsrht }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index fae311831f2..c8fa64c8b4d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,5 +1,4 @@ { lib, fetchhg, buildPythonPackage -, python , srht, hglib, scmsrht, unidiff }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix index 99b5663a9b8..8b6d9201997 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index 25d22dede35..98191f564e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix index 24a31a3ef17..e3751a6d5c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pygit2 }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index d07bd29357a..b5b15520d25 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , sshpubkeys, weasyprint }: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index 12747f98103..dab518e70ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pyyaml }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index 85ae3b2cf14..5e75efb0886 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,7 +1,6 @@ { lib, fetchgit, buildPythonPackage -, python , srht, redis, alembic, pystache -, pytest, factory_boy, writeText }: +, pytest, factory_boy }: buildPythonPackage rec { pname = "todosrht"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 7b01ab21f49..1ca04a1634a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/video/alass/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/alass/default.nix new file mode 100644 index 00000000000..c57a224ee0a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/video/catt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/catt/default.nix index d22657d651c..e60acf87da6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/catt/default.nix @@ -1,32 +1,26 @@ { lib, python3 }: -let - py = python3.override { - packageOverrides = self: super: { - PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { - version = "6.0.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm"; - }; - }); - }; - }; +with python3.pkgs; -in with py.pkgs; buildPythonApplication rec { +buildPythonApplication rec { pname = "catt"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; + sha256 = "sha256-6RUeinHhAvvSz38hHQP5/MXNiY00rCM8k2ONaFYbwPc="; }; propagatedBuildInputs = [ - youtube-dl PyChromecast click ifaddr requests + click + ifaddr + PyChromecast + requests + youtube-dl ]; doCheck = false; # attempts to access various URLs + pythonImportsCheck = [ "catt" ]; meta = with lib; { description = "Cast All The Things allows you to send videos from many, many online sources to your Chromecast"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/cinelerra/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/cinelerra/default.nix index e0249f6d0b2..c81811ea937 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/cinelerra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -7,23 +7,15 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-cv-2018-05-16"; + name = "cinelerra-cv-2021-02-14"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; - sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; + rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e"; + sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj"; }; - patches = [ - # avoid gcc10 error about narrowing - (fetchpatch { - url = "https://github.com/cinelerra-cv-team/cinelerra-cv/pull/2/commits/a1b2d9c3bd5730ec0284894f3d81892af3e77f1f.patch"; - sha256 = "1cjyv1m174dblpa1bs5dggk24h4477zqvc5sbfc0m5rpkndx5ycp"; - }) - ]; - preConfigure = '' find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i ./autogen.sh @@ -50,8 +42,8 @@ stdenv.mkDerivation { ]; meta = with lib; { - description = "Video Editor"; - homepage = "https://www.cinelerra.org/"; + description = "Professional video editing and compositing environment (community version)"; + homepage = "http://cinelerra-cv.wikidot.com/"; maintainers = with maintainers; [ marcweber ]; license = licenses.gpl2Only; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix index 0e7cce4fee7..a9d56cc9108 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz"; + sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA="; }; unpackPhase = "tar xvf $src"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix index 3aaa465a3cc..f461838fdf1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -1,11 +1,12 @@ -{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders -, pkg-config, cmake, gnumake, yasm, python2Packages +{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders +, pkg-config, cmake, gnumake, yasm, python3Packages , libgcrypt, libgpgerror, libunistring -, boost, avahi, lame, autoreconfHook +, boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless +, gtest, ncurses, spdlog , libxml2, systemd -, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl +, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -42,17 +43,18 @@ assert udevSupport -> udev != null; assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; +assert useGbm || useWayland || x11Support; let - kodiReleaseDate = "20200728"; - kodiVersion = "18.9"; - rel = "Leia"; + kodiReleaseDate = "20210219"; + kodiVersion = "19.0"; + rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0nnf7823pixj6n2fkjc8rbdjwayvhlbglij2by4rnjzzfgmqmw20"; + sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p"; }; cmakeProto = fetchurl { @@ -87,9 +89,9 @@ let ffmpeg = kodiDependency rec { name = "FFmpeg"; - version = "4.0.3"; - rev = "${version}-${rel}-18.2"; - sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy"; + version = "4.3.1"; + rev = "${version}-${rel}-Beta1"; + sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt @@ -151,6 +153,12 @@ let postPatch = cmakeProtoPatch; }; + kodi_platforms = + lib.optional useGbm "gbm" ++ + lib.optional useWayland "wayland" ++ + lib.optional x11Support "x11" + ; + in stdenv.mkDerivation { name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; @@ -158,10 +166,11 @@ in stdenv.mkDerivation { buildInputs = [ gnutls libidn libtasn1 nasm p11-kit - libxml2 python2Packages.python + libxml2 python3Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh + gtest ncurses spdlog alsaLib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff libmpeg2 libsamplerate libmad @@ -210,7 +219,7 @@ in stdenv.mkDerivation { which pkg-config gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - jre_headless yasm gettext python2Packages.python flatbuffers + jre_headless yasm gettext python3Packages.python flatbuffers # for TexturePacker giflib zlib libpng libjpeg lzo @@ -221,6 +230,7 @@ in stdenv.mkDerivation { ]; cmakeFlags = [ + "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}" "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" "-Dlibdvdread_URL=${libdvdread.src}" @@ -231,39 +241,36 @@ in stdenv.mkDerivation { "-DLIRC_DEVICE=/run/lirc/lircd" "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" - "-DPYTHON_EXECUTABLE=${buildPackages.python2Packages.python}/bin/python" + "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" ] ++ lib.optional useWayland [ - "-DCORE_PLATFORM_NAME=wayland" - "-DWAYLAND_RENDER_SYSTEM=gl" "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" - ] ++ lib.optional useGbm [ - "-DCORE_PLATFORM_NAME=gbm" - "-DGBM_RENDER_SYSTEM=gles" ]; # 14 tests fail but the biggest issue is that every test takes 30 seconds - # 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) '' - CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder + 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" - CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" ''; postPatch = '' - substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \ + substituteInPlace xbmc/platform/posix/PosixTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' ''; postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath ([ python2Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \ + --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath ([ curl systemd libmad libvdpau libcec libcec_platform libass ] ++ lib.optional nfsSupport libnfs @@ -279,7 +286,7 @@ in stdenv.mkDerivation { installCheckPhase = "$out/bin/kodi --version"; passthru = { - pythonPackages = python2Packages; + pythonPackages = python3Packages; }; meta = with lib; { @@ -287,6 +294,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/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix index 7d9fdcc3d00..44e5dec6b77 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/kodi/plugins.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub -, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml +, cmake, kodiPlain, libcec_platform, tinyxml, pugixml , steam, udev, libusb1, jsoncpp, libhdhomerun, zlib -, python2Packages, expat, glib, nspr, nss, openssl +, python3Packages, expat, glib, nspr, nss, openssl , libssh, libarchive, lzma, bzip2, lz4, lzo }: with lib; @@ -9,7 +9,7 @@ with lib; let self = rec { pluginDir = "/share/kodi/addons"; - rel = "Leia"; + rel = "Matrix"; kodi = kodiPlain; @@ -122,6 +122,7 @@ let self = rec { ''; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 }; }; @@ -151,6 +152,7 @@ let self = rec { ''; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 }; }; @@ -204,6 +206,7 @@ let self = rec { homepage = "https://forum.kodi.tv/showthread.php?tid=258159"; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 }; in { service = mkKodiPlugin { @@ -221,14 +224,14 @@ let self = rec { joystick = mkKodiABIPlugin rec { namespace = "peripheral.joystick"; - version = "1.4.7"; + version = "1.7.1"; plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; - rev = "v${version}"; - sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap"; + rev = "${version}-${rel}"; + sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; }; meta = { @@ -237,7 +240,7 @@ let self = rec { maintainers = with maintainers; [ edwtjo ]; }; - extraBuildInputs = [ udev ]; + extraBuildInputs = [ tinyxml udev ]; }; simpleplugin = mkKodiPlugin rec { @@ -256,6 +259,7 @@ let self = rec { homepage = src.meta.homepage; description = "Simpleplugin API"; license = licenses.gpl3; + broken = true; # requires port to python3 }; }; @@ -263,14 +267,14 @@ let self = rec { plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.48"; + version = "5.1.12"; src = fetchFromGitHub { name = plugin + "-" + version + ".tar.gz"; owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "dc18ad002cd69257611d0032fba91f57bb199165"; - sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x"; + rev = "v${version}"; + sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6"; }; meta = { @@ -290,14 +294,14 @@ let self = rec { steam-controller = mkKodiABIPlugin rec { namespace = "peripheral.steamcontroller"; - version = "0.10.0"; + version = "0.11.0"; plugin = namespace; src = fetchFromGitHub { owner = "kodi-game"; repo = namespace; - rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de"; - sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279"; + rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb"; + sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg"; }; extraBuildInputs = [ libusb1 ]; @@ -314,13 +318,13 @@ let self = rec { plugin = "steam-launcher"; namespace = "script.steam.launcher"; - version = "3.1.4"; + version = "3.5.1"; src = fetchFromGitHub rec { owner = "teeedubb"; repo = owner + "-xbmc-repo"; - rev = "db67704c3e16bdcdd3bdfe2926c609f1f6bdc4fb"; - sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm"; + rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55"; + sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k"; }; propagatedBuildInputs = [ steam ]; @@ -356,6 +360,7 @@ let self = rec { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 }; }; @@ -363,13 +368,13 @@ let self = rec { plugin = "pvr-hts"; namespace = "pvr.hts"; - version = "4.4.14"; + version = "8.2.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr"; + sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q"; }; meta = { @@ -385,13 +390,13 @@ let self = rec { plugin = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "3.5.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6"; + sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; }; meta = { @@ -409,13 +414,13 @@ let self = rec { plugin = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "3.5.7"; + version = "7.4.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d"; + sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; }; meta = { @@ -426,7 +431,7 @@ let self = rec { license = licenses.gpl2Plus; }; - extraBuildInputs = [ zlib rapidxml ]; + extraBuildInputs = [ zlib pugixml ]; }; osmc-skin = mkKodiPlugin rec { @@ -451,7 +456,7 @@ let self = rec { }; }; - yatp = python2Packages.toPythonModule (mkKodiPlugin rec { + yatp = python3Packages.toPythonModule (mkKodiPlugin rec { plugin = "yatp"; namespace = "plugin.video.yatp"; version = "3.3.2"; @@ -467,14 +472,15 @@ let self = rec { propagatedBuildInputs = [ simpleplugin - python2Packages.requests - python2Packages.libtorrent-rasterbar + python3Packages.requests + python3Packages.libtorrent-rasterbar ]; meta = { homepage = src.meta.homepage; description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi"; license = licenses.gpl3; + broken = true; # requires port to python3 }; }); @@ -482,13 +488,13 @@ let self = rec { plugin = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.4.6"; + version = "2.6.7"; src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; + sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s"; }; extraBuildInputs = [ expat ]; @@ -509,14 +515,14 @@ let self = rec { vfs-sftp = mkKodiABIPlugin rec { namespace = "vfs.sftp"; - version = "1.0.6"; + version = "2.0.0"; plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "044kkzcpzvbyih4vys33r4hqw38xa82snmvl4qj1r80wnszc8af1"; + sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; }; meta = with lib; { @@ -531,14 +537,14 @@ let self = rec { vfs-libarchive = mkKodiABIPlugin rec { namespace = "vfs.libarchive"; - version = "1.0.7"; + version = "2.0.0"; plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "01qhv095h5j67ispm4iw18pd3kl7a0mnjkgm92al9qqiyif8lzgh"; + sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix index 1776aab0033..0312c34bf70 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix index d9867b1bb2d..b35398d65b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix index eb8e4186882..2716120682e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase obs-studio ]; + dontWrapQtApps = true; + patches = [ # Fixes the segfault when stopping the plugin (fetchpatch { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix index 2070d05d980..169bd33b709 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin llvmPackages.openmp ; + dontWrapQtApps = true; + LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix index e388d5a67fe..45c96fb180d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,4 @@ { lib -, fetchFromGitHub , fetchurl , pkg-config , gettext diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/quvi/tool.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/quvi/tool.nix index 6718fc1dc36..87c8066a976 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/quvi/tool.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/sub-batch/default.nix index 070bcc90685..9cda6eb0a2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/sub-batch/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/video/tartube/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/tartube/default.nix index 3619d4ee5e3..69f777541a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/tartube/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/video/xplayer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/xplayer/default.nix new file mode 100644 index 00000000000..d3f87f879c5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/xplayer/default.nix @@ -0,0 +1,103 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, clutter-gst +, clutter-gtk +, gettext +, glib +, gobject-introspection +, gst-plugins-bad +, gst-plugins-base +, gst-plugins-good +, gstreamer +, gtk-doc +, gtk3 +, intltool +, itstool +, libpeas +, libxml2 +, libxplayer-plparser +, pkg-config +, python3 +, wrapGAppsHook +, xapps +, yelp-tools }: + +let + pythonenv = python3.withPackages (ps: [ + ps.pygobject3 + ps.dbus-python # For one plugin + ]); +in + +stdenv.mkDerivation rec { + pname = "xplayer"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1xcv6nr2gc0vji5afwy283v7bgx46kzgrq79hl8q9pz995qq2kbp"; + }; + + # configure wants to find gst-inspect-1.0 via pkgconfig but + # the gstreamer toolsdir points to the wrong derivation output + postPatch = '' + substituteInPlace configure.ac \ + --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \ + ''; + + preBuild = '' + makeFlagsArray+=( + "INCLUDES=-I${glib.dev}/include/gio-unix-2.0" + "CFLAGS=-Wno-error" # Otherwise a lot of deprecated warnings are treated as error + ) + ''; + + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + autoconf-archive + gettext + gtk-doc + intltool + itstool + pkg-config + yelp-tools + ]; + + buildInputs = [ + clutter-gst + clutter-gtk + glib + gobject-introspection + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + gtk3 + libpeas + libxml2 + libxplayer-plparser + pythonenv + xapps + # to satisfy configure script + pythonenv.pkgs.pygobject3 + ]; + + postInstall = '' + wrapProgram $out/bin/xplayer \ + --prefix PATH : ${lib.makeBinPath [ pythonenv ]} + ''; + + meta = with lib; { + description = "A generic media player from Linux Mint"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + homepage = "https://github.com/linuxmint/xplayer"; + maintainers = with maintainers; [ tu-maurice ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/xplayer/plparser.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/xplayer/plparser.nix new file mode 100644 index 00000000000..da3daa445f6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/video/xplayer/plparser.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, intltool +, gobject-introspection +, gmime +, libxml2 +, libsoup +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "xplayer-plparser"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1i7sld8am6b1wwbpfb18v7qp17vk2a5p8xcfds50yznr30lddsb2"; + }; + + nativeBuildInputs = [ + intltool + pkg-config + gobject-introspection + ]; + + buildInputs = [ + gmime + libxml2 + libsoup + ]; + + meta = with lib; { + description = "Playlist parsing library for xplayer"; + homepage = "https://github.com/linuxmint/xplayer-plparser"; + maintainers = with maintainers; [ tu-maurice ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/video/xscast/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/video/xscast/default.nix index 49f5b43bb73..6501a399088 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/video/xscast/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index 14d8d0c13fe..aed59e05a98 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, edk2, util-linux, nasm, iasl , csmSupport ? false, seabios ? null , secureBoot ? false +, httpSupport ? false }: assert csmSupport -> seabios != null; @@ -30,7 +31,8 @@ edk2.mkDerivation projectDscPath { buildFlags = lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" - ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ]; + ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] + ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix index 2d865f41818..13b27c7d6cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cntr/default.nix index 2283b45aee4..9b57be87e44 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cntr/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 695109fd8a4..1d84da72c94 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -40,13 +40,8 @@ buildGoPackage rec { installPhase = '' install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] - ''; - - # completion installed separately so it can be overridden in docker - # can be moved to installPhase when docker uses containerd >= 1.4 - postInstall = '' - installShellFiles --bash contrib/autocomplete/ctr - installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + installShellCompletion --bash contrib/autocomplete/ctr + installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete ''; passthru.tests = { inherit (nixosTests) docker; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 99505371507..8a7399cf66c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix index 5aca291a601..a0a39beeda2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -27,6 +27,8 @@ in runCommand cri-o.name { name = "${cri-o.pname}-wrapper-${cri-o.version}"; inherit (cri-o) pname version passthru; + preferLocalBuild = true; + meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; outputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 3d73ccbf48a..15ca7c9667f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -11,6 +11,8 @@ , yajl , nixosTests , criu +, system +, fetchpatch }: let @@ -36,19 +38,29 @@ 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 = [ criu libcap libseccomp systemd yajl ]; + buildInputs = [ libcap libseccomp systemd yajl ] + # Criu currently only builds on x86_64-linux + ++ lib.optional (lib.elem system criu.meta.platforms) criu; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 93f5f56ac55..885a48fd7c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.28.2"; + version = "1.28.3"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "2f148b590414915d029dad7551f4cdf0b03a774dc9baa674480217236d260cc1"; + sha256 = "78a48ef8ff4fed092261ecb1a60d9b28b7776e72ed6df591a900008039308b0f"; }; # lots of networking and other fails diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 207ebdf2211..73f4812ee59 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker/gc.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker/gc.nix index f7bd5a4b069..52ca54501d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/docker/gc.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 91d45986f91..32160616c83 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,15 +16,19 @@ buildGoModule rec { pname = "podman"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1dsriw2vjzjaddxdhl3wbj2ppnsyi29f4bjwc8lzyz20wfwx4ay4"; + sha256 = "sha256-+z28Z0KvaJa32+eTGFsNX8g/WVd3BohKoBnNPU/kpWM="; }; + patches = [ + ./remove-unconfigured-runtime-warn.patch + ]; + vendorSha256 = null; doCheck = false; @@ -59,6 +63,9 @@ buildGoModule rec { installShellCompletion --fish completions/fish/* installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild + '' + lib.optionalString stdenv.isLinux '' + install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d + install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system ''; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch new file mode 100644 index 00000000000..8530cd93cdf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch @@ -0,0 +1,23 @@ +Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf + +It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths. +--- + vendor/github.com/containers/common/pkg/config/config.go | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go +index 4a98c7e92..4a95a2a49 100644 +--- a/vendor/github.com/containers/common/pkg/config/config.go ++++ b/vendor/github.com/containers/common/pkg/config/config.go +@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string { + return name + } + } +- if path, err := exec.LookPath(name); err == nil { +- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path) ++ if _, err := exec.LookPath(name); err == nil { + return name + } + } +-- +2.30.0 diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix index 863888227b3..ae163583e69 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix @@ -31,6 +31,8 @@ in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version passthru; + preferLocalBuild = true; + meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; outputs = [ @@ -46,6 +48,7 @@ in runCommand podman.name { ln -s ${podman.man} $man mkdir -p $out/bin + ln -s ${podman-unwrapped}/lib $out/lib ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ --prefix PATH : ${binPath} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index d83c6d350e2..4124b8e111f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -50,8 +50,9 @@ stdenv.mkDerivation rec { sha256 = "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b"; }; - nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja autoPatchelfHook ] - ++ optionals gtkSupport [ wrapGAppsHook ]; + nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja ] + ++ optionals gtkSupport [ wrapGAppsHook ] + ++ optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ zlib glib perl pixman vde2 texinfo makeWrapper lzo snappy @@ -76,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" ]; @@ -108,6 +108,10 @@ stdenv.mkDerivation rec { # this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang chmod +x ./scripts/shaderinclude.pl patchShebangs . + # avoid conflicts with libc++ include for + mv VERSION QEMU_VERSION + substituteInPlace meson.build \ + --replace "'VERSION'" "'QEMU_VERSION'" '' + optionalString stdenv.hostPlatform.isMusl '' NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; @@ -117,9 +121,8 @@ stdenv.mkDerivation rec { "--enable-docs" "--enable-tools" "--enable-guest-agent" + "--sysconfdir=/etc" ] - # disable sysctl check on darwin. - ++ optional stdenv.isDarwin "--cpu=x86_64" ++ optional numaSupport "--enable-numa" ++ optional seccompSupport "--enable-seccomp" ++ optional smartcardSupport "--enable-smartcard" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix index 3a5f26bfcc8..9568a0bb695 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 3bc2df19d1d..a51a58d21ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -5,7 +5,6 @@ , openssl , libuuid , coreutils -, go , which , makeWrapper , cryptsetup diff --git a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 360e6e36c1a..fe19f1f4a3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -2,7 +2,7 @@ , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch +, alsaLib, curl, libvpx, nettools, dbus, substituteAll # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin ? null @@ -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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch new file mode 100644 index 00000000000..66b70bf0d97 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index b671c1f6fa4..b90033e438d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix deleted file mode 100644 index 93718448340..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index 9a56f865c34..52c0a6ae04d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix index ad45f01915d..a1151dcf82e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix index d05b187ca78..c918a3b5d8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.19"; + version = "4.19.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "0wjq6lkidg0g474xsln1fhbxci7zclq3748sda10f1n7q01qp95c"; + sha256 = "sha256-IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index be7e88a2501..88d035bce66 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 571c13e9461..8f1a920296a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix index 72170401d79..04c232a3e89 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix index 7615c6c4bd8..cb76f0c465c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index e427a85d038..c201c55dcea 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/install" "install" ''; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' runHook preInstall diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 8fef2ca6624..3243e883e4d 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/build-bazel-package/default.nix index 3be72bd22c3..988298ac72b 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/build-bazel-package/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 6592621570c..3985eca4243 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,4 +1,6 @@ -{ lib, callPackage, runCommandLocal, writeShellScriptBin, coreutils, bubblewrap }: +{ lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }: + +let buildFHSEnv = callPackage ./env.nix { }; in args @ { name @@ -60,29 +62,53 @@ let in concatStringsSep "\n " (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files); + # Create this on the fly instead of linking from /nix + # The container might have to modify it and re-run ldconfig if there are + # issues running some binary with LD_LIBRARY_PATH + createLdConfCache = '' + cat > /etc/ld.so.conf < /dev/null + ''; init = run: writeShellScriptBin "${name}-init" '' source /etc/profile + ${createLdConfCache} exec ${run} "$@" ''; bwrapCmd = { initArgs ? "" }: '' blacklist=(/nix /dev /proc /etc) ro_mounts=() + symlinks=() for i in ${env}/*; do path="/''${i##*/}" if [[ $path == '/etc' ]]; then - continue + : + elif [[ -L $i ]]; then + symlinks+=(--symlink "$(readlink "$i")" "$path") + blacklist+=("$path") + else + ro_mounts+=(--ro-bind "$i" "$path") + blacklist+=("$path") fi - ro_mounts+=(--ro-bind "$i" "$path") - blacklist+=("$path") done if [[ -d ${env}/etc ]]; then for i in ${env}/etc/*; do path="/''${i##*/}" - # NOTE: we're binding /etc/fonts from the host so we don't want to - # override it with a path from the FHS environment. - if [[ $path == '/fonts' ]]; then + # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we + # don't want to override it with a path from the FHS environment. + if [[ $path == '/fonts' || $path == '/ssl' ]]; then continue fi ro_mounts+=(--ro-bind "$i" "/etc$path") @@ -112,8 +138,26 @@ let ${lib.optionalString unshareCgroup "--unshare-cgroup"} --die-with-parent --ro-bind /nix /nix + # Our glibc will look for the cache in its own path in `/nix/store`. + # As such, we need a cache to exist there, because pressure-vessel + # depends on the existence of an ld cache. However, adding one + # globally proved to be a bad idea (see #100655), the solution we + # settled on being mounting one via bwrap. + # Also, the cache needs to go to both 32 and 64 bit glibcs, for games + # of both architectures to work. + --tmpfs ${glibc}/etc \ + --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \ + --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ + --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ + --remount-ro ${glibc}/etc \ + --tmpfs ${pkgsi686Linux.glibc}/etc \ + --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \ + --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \ + --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \ + --remount-ro ${pkgsi686Linux.glibc}/etc \ ${etcBindFlags} "''${ro_mounts[@]}" + "''${symlinks[@]}" "''${auto_mounts[@]}" ${init runScript}/bin/${name}-init ${initArgs} ) diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 8b2d46c4ae9..b9c719a4c78 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: +{ stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }: { name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] @@ -49,6 +49,9 @@ let [ (toString gcc.cc.lib) ]; + ldconfig = writeShellScriptBin "ldconfig" '' + exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" + ''; etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' @@ -86,7 +89,8 @@ let # Composes a /usr-like directory structure staticUsrProfileTarget = buildEnv { name = "${name}-usr-target"; - paths = [ etcPkg ] ++ basePkgs ++ targetPaths; + # ldconfig wrapper must come first so it overrides the original ldconfig + paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; @@ -132,7 +136,20 @@ let mkdir -m0755 usr cd usr ${setupLibDirs} - for i in bin sbin share include; do + ${lib.optionalString isMultiBuild '' + if [ -d "${staticUsrProfileMulti}/share" ]; then + cp -rLf ${staticUsrProfileMulti}/share share + fi + ''} + if [ -d "${staticUsrProfileTarget}/share" ]; then + if [ -d share ]; then + chmod -R 755 share + cp -rLTf ${staticUsrProfileTarget}/share share + else + cp -rLf ${staticUsrProfileTarget}/share share + fi + fi + for i in bin sbin include; do if [ -d "${staticUsrProfileTarget}/$i" ]; then cp -rsHf "${staticUsrProfileTarget}/$i" "$i" fi diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 341e2850437..65f9791597e 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/docker/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/docker/default.nix index 0c9d4f110ad..4d57b399199 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/docker/default.nix +++ b/infra/libkookie/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 @@ -770,6 +769,7 @@ rec { mkdir $out tar \ + --sort name \ --owner 0 --group 0 --mtime "@$SOURCE_DATE_EPOCH" \ --hard-dereference \ -C old_out \ diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/elpa.nix b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/elpa.nix index 214aed9c3f9..41a0670d0c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/elpa.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo, writeText }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/setup-hook.sh b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/emacs-funcs.sh similarity index 75% rename from infra/libkookie/nixpkgs/pkgs/build-support/emacs/setup-hook.sh rename to infra/libkookie/nixpkgs/pkgs/build-support/emacs/emacs-funcs.sh index f6f2331b8e0..e1e6a3b6220 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/setup-hook.sh +++ b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/emacs-funcs.sh @@ -32,13 +32,3 @@ addEmacsVars () { fi done } - -if [[ ! -v emacsHookDone ]]; then - emacsHookDone=1 - - # If this is for a wrapper derivation, emacs and the dependencies are all - # run-time dependencies. If this is for precompiling packages into bytecode, - # emacs is a compile-time dependency of the package. - addEnvHooks "$hostOffset" addEmacsVars - addEnvHooks "$targetOffset" addEmacsVars -fi diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/generic.nix b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/generic.nix index d84fa24923d..1456d9e423d 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, ... }: +{ lib, stdenv, emacs, texinfo, writeText, ... }: with lib; @@ -49,7 +49,19 @@ stdenv.mkDerivation ({ propagatedBuildInputs = packageRequires; propagatedUserEnvPkgs = packageRequires; - setupHook = ./setup-hook.sh; + setupHook = writeText "setup-hook.sh" '' + source ${./emacs-funcs.sh} + + if [[ ! -v emacsHookDone ]]; then + emacsHookDone=1 + + # If this is for a wrapper derivation, emacs and the dependencies are all + # run-time dependencies. If this is for precompiling packages into bytecode, + # emacs is a compile-time dependency of the package. + addEnvHooks "$hostOffset" addEmacsVars + addEnvHooks "$targetOffset" addEmacsVars + fi + ''; doCheck = false; @@ -63,9 +75,16 @@ stdenv.mkDerivation ({ addEmacsNativeLoadPath = true; postInstall = '' + # Besides adding the output directory to the native load path, make sure + # the current package's elisp files are in the load path, otherwise + # (require 'file-b) from file-a.el in the same package will fail. + mkdir -p $out/share/emacs/native-lisp + source ${./emacs-funcs.sh} + addEmacsVars "$out" + find $out/share/emacs -type f -name '*.el' -print0 \ | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \ - "emacs --batch --eval=\"(add-to-list 'comp-eln-load-path \\\"$out/share/emacs/native-lisp/\\\")\" -f batch-native-compile {} || true" + "emacs --batch -f batch-native-compile {} || true" ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/melpa.nix b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/melpa.nix index d6fe3085837..824611b20c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/melpa.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ ename = if ename == null diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/build-support/emacs/wrapper.nix index f34835eaf09..fcbf5bcabe6 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/emacs/wrapper.nix +++ b/infra/libkookie/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" < !fetchSubmodules; +}@args: let baseUrl = "https://${githubBase}/${owner}/${repo}"; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; + useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone; # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. - fetcher = if fetchSubmodules then fetchgit else fetchzip; + fetcher = if useFetchGit then fetchgit else fetchzip; privateAttrs = lib.optionalAttrs private { netrcPhase = '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then @@ -26,8 +28,14 @@ let ''; netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; }; - fetcherArgs = (if fetchSubmodules - then { inherit rev fetchSubmodules; url = "${baseUrl}.git"; } + fetcherArgs = (if useFetchGit + then { + inherit rev deepClone fetchSubmodules; url = "${baseUrl}.git"; + } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else ({ url = "${baseUrl}/archive/${rev}.tar.gz"; } // privateAttrs) ) // passthruAttrs // { inherit name; }; -in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; } +in + +assert private -> !useFetchGit; + +fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; } diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/fetchs3/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/fetchs3/default.nix index 8c551c20aa0..acad0749b66 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/fetchs3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, runCommand, awscli }: +{ lib, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/go/garble.nix b/infra/libkookie/nixpkgs/pkgs/build-support/go/garble.nix new file mode 100644 index 00000000000..da1e3152ba4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/build-support/go/garble.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "garble"; + version = "20200107"; + + src = fetchFromGitHub { + owner = "burrowers"; + repo = pname; + rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1"; + sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8="; + }; + + vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek="; + + preBuild = '' + # https://github.com/burrowers/garble/issues/184 + substituteInPlace testdata/scripts/tiny.txt \ + --replace "{6,8}" "{4,8}" + '' + lib.optionalString (!stdenv.isx86_64) '' + # The test assumex amd64 assembly + rm testdata/scripts/asm.txt + ''; + + meta = { + description = "Obfuscate Go code by wrapping the Go toolchain"; + homepage = "https://github.com/burrowers/garble/"; + maintainers = with lib.maintainers; [ davhau ]; + license = lib.licenses.bsd3; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/rust/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/rust/default.nix index dc86a7dc581..bfa6c0d17cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/rust/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/rust/default.nix @@ -2,8 +2,10 @@ , lib , buildPackages , cacert -, cargo -, diffutils +, cargoBuildHook +, cargoCheckHook +, cargoInstallHook +, cargoSetupHook , fetchCargoTarball , runCommandNoCC , rustPlatform @@ -23,6 +25,9 @@ # Legacy hash , cargoSha256 ? "" + # Name for the vendored dependencies tarball +, cargoDepsName ? name + , src ? null , srcs ? null , unpackPhase ? null @@ -34,14 +39,11 @@ , nativeBuildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" -, cargoBuildFlags ? [] , buildType ? "release" , meta ? {} -, target ? rust.toRustTargetSpec stdenv.hostPlatform , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} -, cargoParallelTestThreads ? true # Toggles whether a custom sysroot is created when the target is a .json file. , __internal_dontAddSysroot ? false @@ -60,7 +62,8 @@ let cargoDeps = if cargoVendorDir == null then fetchCargoTarball ({ - inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; + inherit src srcs sourceRoot unpackPhase cargoUpdateHook; + name = cargoDepsName; hash = cargoHash; patches = cargoPatches; sha256 = cargoSha256; @@ -71,19 +74,7 @@ let # against the src fixed-output derivation to check consistency. validateCargoDeps = !(cargoHash == "" && cargoSha256 == ""); - # 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. - setupVendorDir = if cargoVendorDir == null - then ('' - unpackFile "$cargoDeps" - cargoDepsCopy=$(stripHash $cargoDeps) - '') - else '' - cargoDepsCopy="$sourceRoot/${cargoVendorDir}" - ''; - + target = rust.toRustTargetSpec stdenv.hostPlatform; targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; @@ -99,18 +90,6 @@ let originalCargoToml = src + /Cargo.toml; # profile info is later extracted }; - 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++"; - releaseDir = "target/${shortTarget}/${buildType}"; - tmpDir = "${releaseDir}-tmp"; - - # 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"; - in # Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`. @@ -120,11 +99,22 @@ assert useSysroot -> !(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; @@ -135,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/infra/libkookie/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix b/infra/libkookie/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix index c30e88d99b8..3b36554e707 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix @@ -21,7 +21,7 @@ in , src ? null , srcs ? [] , patches ? [] -, sourceRoot +, sourceRoot ? "" , hash ? "" , sha256 ? "" , cargoUpdateHook ? "" diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh new file mode 100644 index 00000000000..54f4512d67c --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh new file mode 100644 index 00000000000..8c5b1a13219 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh new file mode 100644 index 00000000000..e6ffa300706 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh new file mode 100644 index 00000000000..0fddd30582a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/default.nix new file mode 100644 index 00000000000..e8927e2b542 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/infra/libkookie/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh new file mode 100644 index 00000000000..7e2599d9224 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh b/infra/libkookie/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh index b48b0c50f57..04ebcd2cc64 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/infra/libkookie/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -24,10 +24,10 @@ fixupOutputHooks+=(patchShebangsAuto) patchShebangs() { local pathName - if [ "$1" = "--host" ]; then + if [[ "$1" == "--host" ]]; then pathName=HOST_PATH shift - elif [ "$1" = "--build" ]; then + elif [[ "$1" == "--build" ]]; then pathName=PATH shift fi @@ -41,7 +41,7 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - if [ $# -eq 0 ]; then + if [[ $# -eq 0 ]]; then echo "No arguments supplied to patchShebangs" >&2 return 0 fi @@ -50,29 +50,29 @@ patchShebangs() { while IFS= read -r -d $'\0' f; do isScript "$f" || continue - oldInterpreterLine=$(head -1 "$f" | tail -c+3) - read -r oldPath arg0 args <<< "$oldInterpreterLine" + read -r oldInterpreterLine < "$f" + read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" - if [ -z "$pathName" ]; then - if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then + if [[ -z "$pathName" ]]; then + if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then pathName=HOST_PATH else pathName=PATH fi fi - if $(echo "$oldPath" | grep -q "/bin/env$"); then + if [[ "$oldPath" == *"/bin/env" ]]; then # Check for unsupported 'env' functionality: # - options: something starting with a '-' # - environment variables: foo=bar - if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then + if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2 exit 1 fi newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" else - if [ "$oldPath" = "" ]; then + if [[ -z $oldPath ]]; then # If no interpreter is specified linux will use /bin/sh. Set # oldpath="/bin/sh" so that we get /nix/store/.../sh. oldPath="/bin/sh" @@ -84,19 +84,19 @@ patchShebangs() { fi # Strip trailing whitespace introduced when no arguments are present - newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')" + newInterpreterLine="$newPath $args" + newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}} - if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then - if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then + if [[ -n "$oldPath" && "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]]; then + if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" # escape the escape chars so that sed doesn't interpret them - escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') + escapedInterpreterLine=${newInterpreterLine//\\/\\\\} + # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 - timestamp=$(mktemp) - touch -r "$f" "$timestamp" + timestamp=$(stat --printf "%y" "$f") sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" - touch -r "$timestamp" "$f" - rm "$timestamp" + touch --date "$timestamp" "$f" fi fi done < <(find "$@" -type f -perm -0100 -print0) @@ -105,12 +105,12 @@ patchShebangs() { } patchShebangsAuto () { - if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then + if [[ -z "${dontPatchShebangs-}" && -e "$prefix" ]]; then # Dev output will end up being run on the build platform. An # example case of this is sdl2-config. Otherwise, we can just # use the runtime path (--host). - if [ "$output" != out ] && [ "$output" = "$outputDev" ]; then + if [[ "$output" != out && "$output" = "$outputDev" ]]; then patchShebangs --build "$prefix" else patchShebangs --host "$prefix" diff --git a/infra/libkookie/nixpkgs/pkgs/build-support/setup-systemd-units.nix b/infra/libkookie/nixpkgs/pkgs/build-support/setup-systemd-units.nix index 4fa2f42c39d..4c7ee86669f 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/setup-systemd-units.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/templaterpm/default.nix b/infra/libkookie/nixpkgs/pkgs/build-support/templaterpm/default.nix index ffe5b0b4581..efe70efe6c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/templaterpm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/build-support/writers/test.nix b/infra/libkookie/nixpkgs/pkgs/build-support/writers/test.nix index 7b7a698376a..a3f15ffe366 100644 --- a/infra/libkookie/nixpkgs/pkgs/build-support/writers/test.nix +++ b/infra/libkookie/nixpkgs/pkgs/build-support/writers/test.nix @@ -7,7 +7,6 @@ python2Packages, python3Packages, runCommand, - stdenv, writers, writeText }: diff --git a/infra/libkookie/nixpkgs/pkgs/common-updater/scripts.nix b/infra/libkookie/nixpkgs/pkgs/common-updater/scripts.nix index 351db619884..26c77e87636 100644 --- a/infra/libkookie/nixpkgs/pkgs/common-updater/scripts.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/infra/libkookie/nixpkgs/pkgs/data/documentation/man-pages/default.nix index a8f38b1a6c6..f54df832191 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/documentation/man-pages/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix index 7f934658479..a2b67a22e2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2009.22"; + version = "2102.03"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "0wdkjzaf5a14yfiqqqn6wvi6db6r7g1m5r07cg9730b0mkzhfyhl"; + sha256 = "076l44cyyp3cf15qyn2hzx34kzqm73d218fgwf8n69m8a1v34hs2"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index e9fad77e8c0..ee10c5bd18b 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/infra/libkookie/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 = "4.5.0"; + version = "5.0.4"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix index cbdd309db5e..04e5b48bd0b 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal +{ stdenv, lib, nodejs, nodePackages, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 8ee3206d070..10f8cc67c7e 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,26 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; - iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; - iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; - iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; - iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; - iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; - iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; - iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; - iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; - iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; - iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; - iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; - iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; - iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; - iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; - iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; - iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; - iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; - iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; - iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; - iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; + 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/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix index d7442b34521..146b832af9c 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 8774913c83c..bf2fbe256fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,11 +1,12 @@ { 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 @@ -14,9 +15,12 @@ in fetchzip { meta = { description = "A monospaced font for scientific and technical computing"; + 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 lib.maintainers; [ suhr ]; platforms = with lib.platforms; all; - homepage = "https://juliamono.netlify.app/"; + homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/"; license = lib.licenses.ofl; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/montserrat/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/montserrat/default.nix index de8ea80b017..41135122f05 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/montserrat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/montserrat/default.nix @@ -1,29 +1,28 @@ -# Originally packaged for ArchLinux. -# -# https://aur.archlinux.org/packages/ttf-montserrat/ - -{ lib, fetchzip }: +{ lib, fetchFromGitHub }: let - version = "1.0"; -in fetchzip { - name = "montserrat-${version}"; - - url = "https://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; + pname = "montserrat"; + version = "7.210"; +in fetchFromGitHub { + name = "${pname}-${version}"; + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U="; postFetch = '' - tar -xzf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts/montserrat - cp *.ttf $out/share/fonts/montserrat + tar xf $downloadedFile --strip 1 + install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf + install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf + install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff + install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; - meta = with lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; - homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ scolobb ]; + homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb jk ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index d93e5885401..530cfca7424 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , fetchzip -, optipng , cairo , python3 , pkg-config diff --git a/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix b/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfb..c43ff3a313f 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/icons/iso-flags/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/iso-flags/default.nix index 4252853b898..57cc1752f18 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/iso-flags/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/iso-flags/default.nix @@ -1,9 +1,7 @@ { lib, stdenv , fetchFromGitHub , perl -, perlPackages , inkscape -, pngcrush , librsvg , targets ? [ "all" ] }: diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix index b3513818df8..5c44619e02d 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9.2"; + version = "1.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p"; + sha256 = "1gggsd7scf15vrpgzvskx4p3jifnjdx0aqndqhvpc6ksdbh3nzqd"; }; nativeBuildInputs = [ @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons cp -a Luna* $out/share/icons - # remove files with spaces in the name, otherwise - # gtk-update-icon-cache fails with the message "The generated cache - # was invalid" - # https://github.com/darkomarko42/Luna-Icons/issues/2 - rm "$out/share/icons/Luna/scalable/apps/yast-checkmedia (copia).svg" - for theme in $out/share/icons/*; do gtk-update-icon-cache "$theme" done diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index 75c7cd58007..32365b70184 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; + dontWrapQtApps = true; + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme diff --git a/infra/libkookie/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/infra/libkookie/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index b18354910e4..1d4c3866b4e 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix b/infra/libkookie/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix index caab674393a..af8a157d491 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/misc/tzdata/default.nix b/infra/libkookie/nixpkgs/pkgs/data/misc/tzdata/default.nix index 98a6b9877d1..7ab25da3cc4 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=cc AR=ar zic + make $makeFlags cc=${stdenv.cc.nativePrefix}cc AR=${stdenv.cc.nativePrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix index f7f139a9ea9..5297fe05683 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/data/themes/orchis/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/orchis/default.nix new file mode 100644 index 00000000000..ee315427e23 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/data/themes/orchis/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-themes-extra, gtk-engine-murrine +, accentColor ? "default" }: + +stdenv.mkDerivation rec { + pname = "orchis"; + version = "2021-01-22"; + + src = fetchFromGitHub { + repo = "Orchis-theme"; + owner = "vinceliuice"; + rev = version; + sha256 = "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc"; + }; + + nativeBuildInputs = [ gtk3 ]; + + buildInputs = [ gnome-themes-extra ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + preInstall = '' + mkdir -p $out/share/themes + ''; + + installPhase = '' + runHook preInstall + bash install.sh -d $out/share/themes -t ${accentColor} + runHook postInstall + ''; + + meta = with lib; { + description = "A Material Design theme for GNOME/GTK based desktop environments."; + homepage = "https://github.com/vinceliuice/Orchis-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.fufexan ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/data/themes/yaru/default.nix b/infra/libkookie/nixpkgs/pkgs/data/themes/yaru/default.nix index 7121aed9b1e..29176c664ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 198cfe40a6d..4e951bfcc58 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -8,18 +8,11 @@ , intltool , gtk3 , libnotify -, gnome-menus , libxml2 -, systemd -, upower , gnome-online-accounts , cinnamon-settings-daemon , colord , polkit -, ibus -, libpulseaudio -, isocodes -, kerberos , libxkbfile , cinnamon-menus , dbus-glib @@ -27,7 +20,6 @@ , libxklavier , networkmanager , libwacom -, gnome3 , libtool , wrapGAppsHook , tzdata diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 80a026e8836..0e8f6dbf8c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -11,18 +11,10 @@ , intltool , libxslt , gtk3 -, libnotify -, libxkbfile -, cinnamon-menus , libgnomekbd -, libxklavier -, networkmanager -, libwacom , gnome3 , libtool , wrapGAppsHook -, tzdata -, glibc , gobject-introspection , python3 , pam diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 93a036228c3..82c40fc429d 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; + sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk="; }; passthru = { diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix index f0972f8d6f1..60ec6792e5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , vala , meson , ninja diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index 4a1a305d127..31828bad0af 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.1"; + version = "3.38.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM="; + sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 900040a7611..cfe8197a90b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.3"; + version = "3.38.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19rwgvjicfmd5zgabr5ns42rg8cqa05p8qf7684prajjna8gcclp"; + sha256 = "rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU="; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix index c88c1e0f525..324ab865b11 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 3a7e21c65f5..ef5e564beb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,7 +2,6 @@ , gettext , fetchurl , evolution-data-server -, fetchpatch , pkg-config , libxslt , docbook_xsl diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5a78f412dc7..603aaf1744b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -22,7 +22,6 @@ , gnome-color-manager , gnome-desktop , gnome-online-accounts -, gnome-session , gnome-settings-daemon , gnome3 , grilo @@ -59,6 +58,7 @@ , shared-mime-info , sound-theme-freedesktop , tracker +, tracker-miners , tzdata , udisks2 , upower @@ -76,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; @@ -101,6 +102,7 @@ stdenv.mkDerivation rec { clutter-gtk colord colord-gtk + epoxy fontconfig gdk-pixbuf glib @@ -122,6 +124,7 @@ stdenv.mkDerivation rec { libgudev libhandy libkrb5 + libnma libpulseaudio libpwquality librsvg @@ -132,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 = [ @@ -160,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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 002ae9197b7..d2909c449d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -30,7 +30,6 @@ , systemd , libnma , tzdata -, yelp , libgnomekbd , gsettings-desktop-schemas , gnome-tour diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix index d2dca54b5ca..1fa0a0b0fc6 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,6 +1,7 @@ { fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl +, fetchpatch }: stdenv.mkDerivation rec { pname = "gnome-session"; @@ -21,6 +22,12 @@ stdenv.mkDerivation rec { grep = "${gnugrep}/bin/grep"; bash = "${bash}/bin/bash"; }) + # Fixes 2 minute delay at poweroff. + # https://gitlab.gnome.org/GNOME/gnome-session/issues/74 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff"; + sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz"; + }) ]; mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 087aa7f5ce0..52aee2a004a 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 +, desktop-file-utils, itstool, wrapGAppsHook, pcre2 , libxslt, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J73cnQumFMhuXstPVMdevDQV4oh6zZFEIFdUj9MgZhg="; + sha256 = "EaWw1jXxX9znUINRpRD79OkqpTMVKlD/DHhF4xAuR2Q="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 2b84442620d..61f8761ce81 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix similarity index 56% rename from infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix rename to infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix index 58f1836a132..851a816c61c 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }: stdenv.mkDerivation rec { - pname = "gnome-shell-arc-menu"; - version = "47"; + pname = "gnome-shell-arcmenu"; + version = "5"; src = fetchFromGitLab { - owner = "arcmenu-team"; - repo = "Arc-Menu"; - rev = "v${version}-Stable"; - sha256 = "1hhjxdm1sm9pddhkkxx532hqqiv9ghvqgn9xszg1jwhj29380fv6"; + owner = "arcmenu"; + repo = "ArcMenu"; + rev = "v${version}"; + sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3"; }; patches = [ @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - uuid = "arc-menu@linxgem33.com"; + uuid = "arcmenu@arcmenu.com"; meta = with lib; { - description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; + description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dkabot ]; - homepage = "https://gitlab.com/LinxGem33/Arc-Menu"; + homepage = "https://gitlab.com/arcmenu/ArcMenu"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch similarity index 100% rename from infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch rename to infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 0bdc3974d97..cb8ece571e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -15,7 +15,6 @@ , gnome3 , gjs , nixosTests -, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index 7d143a061f6..ad588be18ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch index 9a53d63860d..fb2d3d57e51 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix index 9d58a923740..1949b97fafb 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "44"; + version = "45"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g"; + sha256 = "sha256-ghmCnzlPvxHEy2ro1AL+T2yiavJVrPhRfIKbMBwMjac="; }; uuid = "unite@hardpixel.eu"; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix index 3ca257db49b..a209f2d2d9c 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , pkg-config , gtk3 , vala diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 1f9b1ba871d..1947179028b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -16,7 +16,6 @@ , adwaita-icon-theme , libgweather , gucharmap -, tracker , polkit , gnome3 }: diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index db7a6ba0920..0ea59c3fc42 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.2.4"; + version = "0.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"; + sha256 = "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj"; }; passthru = { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; description = "Library to integrate compressed files management with GNOME"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnustep/base/default.nix index 8cc68b75569..8fe232dff7b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnustep/base/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/gnustep/gui/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnustep/gui/default.nix index e945af64d90..8356a608c83 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnustep/gui/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 27a379f4738..38fcb8d40b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/infra/libkookie/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 @@ -11,7 +10,6 @@ , wingpanel , orca , onboard -, at-spi2-core , elementary-default-settings , elementary-settings-daemon , runtimeShell diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix new file mode 100644 index 00000000000..d7816de3042 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -0,0 +1,37 @@ +{ lib, mkDerivation, fetchFromGitHub +, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: + +mkDerivation rec { + pname = "parachute"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tcorreabr"; + repo = "parachute"; + rev = "v${version}"; + sha256 = "QIWb1zIGfkS+Bef7LK+JA6XpwGUW+79XZY47j75nlCE="; + }; + + buildInputs = [ + kcoreaddons kwindowsystem plasma-framework systemsettings + ]; + + dontBuild = true; + + # 1. --global still installs to $HOME/.local/share so we use --packageroot + # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually + installPhase = '' + runHook preInstall + plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts + install -Dm644 ${src}/metadata.desktop $out/share/kservices5/Parachute.desktop + runHook postInstall + ''; + + meta = with lib; { + description = "Look at your windows and desktops from above."; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mjlbach ]; + inherit (src.meta) homepage; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix index 014f794b5e8..c4cbc44b375 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -146,6 +146,7 @@ let kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix index c8213482d79..23e225bd744 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix @@ -5,7 +5,7 @@ kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, - solid + solid, systemsettings }: mkDerivation { @@ -15,6 +15,11 @@ mkDerivation { buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage - kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid + kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid systemsettings ]; + preFixup = '' + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in the same directory, + # while it is actually located in a completely different store path + ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 2b0450928f5..aade506483f 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 9a923025c94..fd59b173a73 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix index b0b4268db6e..4e9732ce1c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/xfce/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/default.nix index de8ae12b895..12f487f1784 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix deleted file mode 100644 index e35dc5922d9..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix deleted file mode 100644 index d8946c98a38..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/infra/libkookie/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch deleted file mode 100644 index 1ed86a67f72..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/arduino/arduino-core/default.nix index 4c440ab97db..2eff5e553ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/arduino/arduino-core/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/4th/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/4th/default.nix index 7205a979e27..a8923879c06 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/4th/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 0fcad6c333f..ed8935b0042 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index e20983380a4..d062c8605b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.4"; + version = "1.8.6"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; + sha256 = "sha256-meqbFLGwCMpFoOVAfvtriRAS8ZWr374eSN3m0CdC2aM="; }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/aldor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/aldor/default.nix index 2654cc467fe..3799f2c9212 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/aldor/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix index 030da03add8..f537eb14d34 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cseed/arachne-pnr"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ shell thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix index defe78d7c31..cfbec681e8a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -27,13 +27,13 @@ let ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ])); in stdenv.mkDerivation rec { pname = "bluespec"; - version = "unstable-2020.11.04"; + version = "unstable-2021.02.14"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; - rev = "103357f32cf63f2ca2b16ebc8e2c675ec5562464"; - sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3"; + rev = "c085ecd807d85f31d102d8bec71f5c28dc96b31d"; + sha256 = "0c86gwhrarw78cr9c9slb9vij6kcwx3x281kbqji96qqzs0dfb32"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/carp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/carp/default.nix index b0a14534b08..d83e70a703a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/carp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/carp/default.nix @@ -3,20 +3,20 @@ haskellPackages.mkDerivation rec { pname = "carp"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "carp-lang"; repo = "Carp"; rev = "v${version}"; - sha256 = "07yk3gy4l6h3k7sh8al7lgwk75a13zxwfp7siqpb5gnnqr1z3brc"; + sha256 = "sha256-nTSMY8bq0b/JvE/XQGDC4St2sqdni12E5WQU5FXnuCg="; }; - buildDepends = [ makeWrapper ]; + buildTools = [ makeWrapper ]; executableHaskellDepends = with haskellPackages; [ - HUnit blaze-markup blaze-html split cmdargs ansi-terminal cmark - edit-distance + HUnit blaze-markup blaze-html split ansi-terminal cmark + edit-distance hashable open-browser optparse-applicative ]; isExecutable = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/default.nix index 8d29c7c9a2b..5445469b776 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix index d2f2805ed7f..422053ea9d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix index 4c84ef8c42b..10cf91579a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/default.nix index 8d29c7c9a2b..5445469b776 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix index 7102126206a..a6d19eaeb13 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix index e887bc22089..b3be2bb220c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchurl , lib -# Dependencies + # Dependencies , boehmgc , coreutils , git @@ -32,11 +32,10 @@ # # We need to keep around at least the latest version released with a stable # NixOS - let archs = { - x86_64-linux = "linux-x86_64"; - i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i686"; x86_64-darwin = "darwin-x86_64"; }; @@ -45,223 +44,231 @@ let checkInputs = [ git gmp openssl readline libxml2 libyaml ]; genericBinary = { version, sha256s, rel ? 1 }: - stdenv.mkDerivation rec { - pname = "crystal-binary"; - inherit version; - - src = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; - sha256 = sha256s.${stdenv.system}; + stdenv.mkDerivation rec { + pname = "crystal-binary"; + inherit version; + + src = fetchurl { + url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + sha256 = sha256s.${stdenv.system}; + }; + + buildCommand = '' + mkdir -p $out + tar --strip-components=1 -C $out -xf ${src} + ''; }; - buildCommand = '' - mkdir -p $out - tar --strip-components=1 -C $out -xf ${src} - ''; - }; - commonBuildInputs = extraBuildInputs: [ - boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl + boehmgc + libatomic_ops + pcre + libevent + libyaml + zlib + libxml2 + openssl ] ++ extraBuildInputs - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; generic = ( { version , sha256 , binary , doCheck ? true - , extraBuildInputs ? [] - , buildFlags ? ["all" "docs"] + , extraBuildInputs ? [ ] + , buildFlags ? [ "all" "docs" ] }: - lib.fix (compiler: stdenv.mkDerivation { - pname = "crystal"; - inherit buildFlags doCheck version; + lib.fix (compiler: stdenv.mkDerivation { + pname = "crystal"; + inherit buildFlags doCheck version; - src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "crystal"; - rev = version; - inherit sha256; - }; + src = fetchFromGitHub { + owner = "crystal-lang"; + repo = "crystal"; + rev = version; + inherit sha256; + }; - outputs = [ "out" "lib" "bin" ]; + outputs = [ "out" "lib" "bin" ]; - postPatch = '' - # Add dependency of crystal to docs to avoid issue on flag changes between releases - # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782 - substituteInPlace Makefile \ - --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' + postPatch = '' + # Add dependency of crystal to docs to avoid issue on flag changes between releases + # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782 + substituteInPlace Makefile \ + --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo + substituteInPlace src/crystal/system/unix/time.cr \ + --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - ln -sf spec/compiler spec/std + ln -sf spec/compiler spec/std - # Dirty fix for when no sandboxing is enabled - rm -rf /tmp/crystal - mkdir -p /tmp/crystal + # Dirty fix for when no sandboxing is enabled + rm -rf /tmp/crystal + mkdir -p /tmp/crystal - substituteInPlace spec/std/file_spec.cr \ - --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/share' '/tmp/crystal' \ - --replace '/usr' '/tmp' + substituteInPlace spec/std/file_spec.cr \ + --replace '/bin/ls' '${coreutils}/bin/ls' \ + --replace '/usr/share' '/tmp/crystal' \ + --replace '/usr' '/tmp' - substituteInPlace spec/std/process_spec.cr \ - --replace '/bin/cat' '${coreutils}/bin/cat' \ - --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/bin/env' '${coreutils}/bin/env' \ - --replace '"env"' '"${coreutils}/bin/env"' \ - --replace '"/usr"' '"/tmp"' + substituteInPlace spec/std/process_spec.cr \ + --replace '/bin/cat' '${coreutils}/bin/cat' \ + --replace '/bin/ls' '${coreutils}/bin/ls' \ + --replace '/usr/bin/env' '${coreutils}/bin/env' \ + --replace '"env"' '"${coreutils}/bin/env"' \ + --replace '"/usr"' '"/tmp"' - substituteInPlace spec/std/socket/tcp_server_spec.cr \ - --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' + substituteInPlace spec/std/socket/tcp_server_spec.cr \ + --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' - substituteInPlace spec/std/system_spec.cr \ - --replace '`hostname`' '`${hostname}/bin/hostname`' + substituteInPlace spec/std/system_spec.cr \ + --replace '`hostname`' '`${hostname}/bin/hostname`' - # See https://github.com/crystal-lang/crystal/pull/8640 - substituteInPlace spec/std/http/cookie_spec.cr \ - --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' + # See https://github.com/crystal-lang/crystal/pull/8640 + substituteInPlace spec/std/http/cookie_spec.cr \ + --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' - # See https://github.com/crystal-lang/crystal/issues/8629 - substituteInPlace spec/std/socket/udp_socket_spec.cr \ - --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + # See https://github.com/crystal-lang/crystal/issues/8629 + substituteInPlace spec/std/socket/udp_socket_spec.cr \ + --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - # See https://github.com/crystal-lang/crystal/pull/8699 - substituteInPlace spec/std/xml/xml_spec.cr \ - --replace 'it "handles errors"' 'pending "handles errors"' - ''; + # See https://github.com/crystal-lang/crystal/pull/8699 + substituteInPlace spec/std/xml/xml_spec.cr \ + --replace 'it "handles errors"' 'pending "handles errors"' + ''; - buildInputs = commonBuildInputs extraBuildInputs; + buildInputs = commonBuildInputs extraBuildInputs; - nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; - makeFlags = [ - "CRYSTAL_CONFIG_VERSION=${version}" - ]; + makeFlags = [ + "CRYSTAL_CONFIG_VERSION=${version}" + ]; - LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config"; + LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config"; - FLAGS = [ - "--release" - "--single-module" # needed for deterministic builds - ]; + FLAGS = [ + "--release" + "--single-module" # needed for deterministic builds + ]; - # This makes sure we don't keep depending on the previous version of - # crystal used to build this one. - CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; + # This makes sure we don't keep depending on the previous version of + # crystal used to build this one. + CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; - # We *have* to add `which` to the PATH or crystal is unable to build - # stuff later if which is not available. - installPhase = '' - runHook preInstall + # We *have* to add `which` to the PATH or crystal is unable to build + # stuff later if which is not available. + installPhase = '' + runHook preInstall - install -Dm755 .build/crystal $bin/bin/crystal - wrapProgram $bin/bin/crystal \ - --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ - --suffix CRYSTAL_PATH : lib:$lib/crystal \ - --suffix CRYSTAL_LIBRARY_PATH : ${ - lib.makeLibraryPath (commonBuildInputs extraBuildInputs) - } - install -dm755 $lib/crystal - cp -r src/* $lib/crystal/ + install -Dm755 .build/crystal $bin/bin/crystal + wrapProgram $bin/bin/crystal \ + --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ + --suffix CRYSTAL_PATH : lib:$lib/crystal \ + --suffix CRYSTAL_LIBRARY_PATH : ${ + lib.makeLibraryPath (commonBuildInputs extraBuildInputs) + } + install -dm755 $lib/crystal + cp -r src/* $lib/crystal/ - install -dm755 $out/share/doc/crystal/api - cp -r docs/* $out/share/doc/crystal/api/ - cp -r samples $out/share/doc/crystal/ + install -dm755 $out/share/doc/crystal/api + cp -r docs/* $out/share/doc/crystal/api/ + cp -r samples $out/share/doc/crystal/ - install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal - install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal + install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal - install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 + install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 - install -Dm644 -t $out/share/licenses/crystal LICENSE README.md + install -Dm644 -t $out/share/licenses/crystal LICENSE README.md - mkdir -p $out - ln -s $bin/bin $out/bin - ln -s $lib $out/lib + mkdir -p $out + ln -s $bin/bin $out/bin + ln -s $lib $out/lib - runHook postInstall - ''; + runHook postInstall + ''; - enableParallelBuilding = true; + enableParallelBuilding = true; - dontStrip = true; + dontStrip = true; - checkTarget = "compiler_spec"; + checkTarget = "compiler_spec"; - preCheck = '' - export HOME=/tmp - mkdir -p $HOME/test + preCheck = '' + export HOME=/tmp + mkdir -p $HOME/test - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH - export PATH=${lib.makeBinPath checkInputs}:$PATH - ''; + export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH + export PATH=${lib.makeBinPath checkInputs}:$PATH + ''; - passthru.buildCrystalPackage = callPackage ./build-package.nix { - crystal = compiler; - }; + passthru.buildCrystalPackage = callPackage ./build-package.nix { + crystal = compiler; + }; - meta = with lib; { - description = "A compiled language with Ruby like syntax and type inference"; - homepage = "https://crystal-lang.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; - platforms = builtins.attrNames archs; - }; - }) + meta = with lib; { + description = "A compiled language with Ruby like syntax and type inference"; + homepage = "https://crystal-lang.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; + platforms = builtins.attrNames archs; + }; + }) ); -in rec { +in +rec { binaryCrystal_0_31 = genericBinary { version = "0.31.1"; sha256s = { - x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih"; - i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr"; + x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih"; + i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr"; x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz"; }; }; crystal_0_31 = generic { version = "0.31.1"; - sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; + sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; doCheck = false; # 5 checks are failing now binary = binaryCrystal_0_31; }; crystal_0_32 = generic { version = "0.32.1"; - sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; + sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; binary = crystal_0_31; }; crystal_0_33 = generic { version = "0.33.0"; - sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; + sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; binary = crystal_0_32; }; crystal_0_34 = generic { version = "0.34.0"; - sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; + sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; binary = crystal_0_33; }; crystal_0_35 = generic { version = "0.35.1"; - sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69"; + sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69"; binary = crystal_0_34; # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789 extraBuildInputs = [ git ]; }; crystal_0_36 = generic { - version = "0.36.0"; - sha256 = "0s7g13mrh2jrxxrrrg4hy3gi49rp7fmpn9zg9kj4nbc8w8yir20r"; + version = "0.36.1"; + sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk="; binary = crystal_0_35; }; crystal = crystal_0_36; - crystal2nix = callPackage ./crystal2nix.nix {}; + crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix index 25cbbd4d01a..0f4909f5e15 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index b3b7b305fba..5685f178876 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -10,47 +10,6 @@ let common = callPackage ./common.nix; in rec { - cudatoolkit_6 = common { - version = "6.0.37"; - url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; - sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; - gcc = gcc48; - }; - - cudatoolkit_6_5 = common { - version = "6.5.19"; - url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run"; - sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; - gcc = gcc48; - }; - - cudatoolkit_7 = common { - version = "7.0.28"; - url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; - sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; - gcc = gcc6; - }; - - cudatoolkit_7_5 = common { - version = "7.5.18"; - url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; - sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; - gcc = gcc6; - }; - - cudatoolkit_8 = common { - version = "8.0.61.2"; - url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; - sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run"; - sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; - }) - ]; - gcc = gcc6; - }; - cudatoolkit_9_0 = common { version = "9.0.176.1"; url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; @@ -153,5 +112,12 @@ in rec { gcc = gcc9; }; - cudatoolkit_11 = cudatoolkit_11_1; + cudatoolkit_11_2 = common { + version = "11.2.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run"; + sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g="; + gcc = gcc9; + }; + + cudatoolkit_11 = cudatoolkit_11_2; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/factor-lang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/factor-lang/default.nix index fc5f478177c..2c9999ccdb4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/factor-lang/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/flasm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/flasm/default.nix index 4257feb87b9..9423f5e15df 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flasm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flasm/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; nativeBuildInputs = [ unzip bison flex gperf ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix index 0b7ac647529..5cd0609960d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 07b0921ec18..1502b09cca6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index fa7881e398a..93c9dde61fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 2ea9033ba63..d9b4c639b5a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 4bdec26fd99..f7ec7b6ee2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix index 78a335f1b7b..b371cadb1db 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.13.2"; + version = "0.14.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA="; + sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc="; + cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix index 174c299b15b..92c1cbdfc18 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -4,15 +4,20 @@ , buildPackages , pkgsBuildTarget , fetchpatch +, callPackage }: let inherit (lib) optionals optionalString; + version = "1.14.15"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ @@ -36,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.14"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132"; + sha256 = "0jci03f5z09xibbdqg4lnv2k3crhal1phzwr6lc4ajp514i3plby"; }; # perl is used for testing go vet @@ -145,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"; @@ -253,5 +265,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; + knownVulnerabilities = [ + "Support for Go 1.14 ended with the release of Go 1.16: https://golang.org/doc/devel/release.html#policy" + ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix index c3aef549e68..4432b1fe895 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -4,15 +4,20 @@ , buildPackages , pkgsBuildTarget , fetchpatch +, callPackage }: let inherit (lib) optionals optionalString; + version = "1.15.8"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ @@ -36,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.7"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1g1a39y1cnvw3y0bjwjms55cz0s9icm8myrgxi295jwfznmb6cc6"; + sha256 = "1hlphkrsvb5nza5ajm24x4nrhyg4b0afs88kk4jd310hg2vhl32l"; }; # perl is used for testing go vet @@ -153,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/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.16.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.16.nix new file mode 100644 index 00000000000..8267e9745dc --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -0,0 +1,267 @@ +{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation, xcbuild +, mailcap, runtimeShell +, buildPackages +, pkgsBuildTarget +, fetchpatch +, callPackage +}: + +let + + inherit (lib) optionals optionalString; + + version = "1.16"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; +in + +stdenv.mkDerivation rec { + pname = "go"; + inherit version; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0nn98xiw8zrvxf9f36p8dzc7ihrrkakr0g9jiy4haqb5alyhd23n"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkg-config patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + propagatedBuildInputs = optionals stdenv.isDarwin [ xcbuild ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.16.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.16.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks-1.16.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with lib; { + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix deleted file mode 100644 index ec3fd97da9b..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross -, pkg-config -, pcre -, Security }: - -let - libc = if stdenv ? cross then libcCross else stdenv.cc.libc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.4-bootstrap-${builtins.substring 0 7 revision}"; - revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6"; - - src = fetchurl { - url = "https://github.com/golang/go/archive/${revision}.tar.gz"; - sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre ]; - depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; - - hardeningDisable = [ "all" ]; - - # The tests try to do stuff with 127.0.0.1 and localhost - __darwinAllowLocalNetworking = true; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go - patchShebangs ./ # replace /bin/bash - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - '' + lib.optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - # Find the loader dynamically - LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)" - - # Replace references to the loader - find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; - ''; - - patches = [ - ./remove-tools-1.4.patch - ]; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.hostPlatform.system == "i686-linux" then "386" - else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if stdenv.isAarch32 then "arm" - else throw "Unsupported system"; - GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 0; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - ''; - - meta = with lib; { - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/2-dev.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/2-dev.nix index 3e09f7c0fad..2bdf6a4950c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/2-dev.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/2-dev.nix @@ -4,15 +4,18 @@ , buildPackages , pkgsBuildTarget , fetchpatch +, callPackage }: let inherit (lib) optionals optionalString; + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ + cp -rf ${go_bootstrap}/* $out/ chmod -R u+w $out find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/binary.nix new file mode 100644 index 00000000000..9a0dc343546 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/binary.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, version, hashes }: +let + toGoKernel = platform: + if platform.isDarwin then "darwin" + else platform.parsed.kernel.name; + + toGoCPU = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}"); + + toGoPlatform = platform: "${toGoKernel platform}-${toGoCPU platform}"; + + platform = toGoPlatform stdenv.hostPlatform; +in +stdenv.mkDerivation rec { + name = "go-${version}-${platform}-bootstrap"; + + src = fetchurl { + url = "https://golang.org/dl/go${version}.${platform}.tar.gz"; + sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}"); + }; + + # We must preserve the signature on Darwin + dontStrip = stdenv.hostPlatform.isDarwin; + + installPhase = '' + mkdir -p $out/share/go $out/bin + mv bin/* $out/bin + cp -r . $out/share/go + ${lib.optionalString stdenv.isLinux ('' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/go + '')} + '' ; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/bootstrap.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/bootstrap.nix new file mode 100644 index 00000000000..71573b0bdd2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/bootstrap.nix @@ -0,0 +1,15 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.16"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8"; + darwin-arm64 = "4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810"; + linux-386 = "ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa"; + linux-amd64 = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"; + linux-arm64 = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098"; + linux-armv6l = "d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd"; + linux-ppc64le = "27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6"; + linux-s390x = "be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch new file mode 100644 index 00000000000..9edf6efa851 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index d8fd91f1fe..8bc08e6fed 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if semver.Compare(index.goVersionV, "v1.14") < 0 { ++ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/print-hashes.sh b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/print-hashes.sh new file mode 100755 index 00000000000..97be7d189ad --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/print-hashes.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -euo pipefail + +BASEURL=https://golang.org/dl/ +VERSION=${1:-} + +if [[ -z $VERSION ]] +then + echo "No version supplied" + exit -1 +fi + +curl -s "${BASEURL}?mode=json&include=all" | \ + jq '.[] | select(.version == "go'${VERSION}'")' | \ + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch deleted file mode 100644 index 807ab8e089c..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go -index 3b511b1..a46ebd8 100644 ---- a/misc/makerelease/makerelease.go -+++ b/misc/makerelease/makerelease.go -@@ -65,9 +65,6 @@ const ( - // These must be the command that cmd/go knows to install to $GOROOT/bin - // or $GOROOT/pkg/tool. - var toolPaths = []string{ -- "golang.org/x/tools/cmd/cover", -- "golang.org/x/tools/cmd/godoc", -- "golang.org/x/tools/cmd/vet", - } - - var preBuildCleanFiles = []string{ -diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c -index b6c61b4..2006bc2 100644 ---- a/src/cmd/dist/build.c -+++ b/src/cmd/dist/build.c -@@ -210,7 +210,9 @@ init(void) - workdir = xworkdir(); - xatexit(rmworkdir); - -- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); -+ xgetenv(&b, "GOTOOLDIR"); -+ if (b.len == 0) -+ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); - tooldir = btake(&b); - - bfree(&b); -diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go -index b71feb7..8468ea8 100644 ---- a/src/cmd/go/pkg.go -+++ b/src/cmd/go/pkg.go -@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{ - "cmd/pack": toTool, - "cmd/pprof": toTool, - "cmd/yacc": toTool, -- "golang.org/x/tools/cmd/cover": toTool, -- "golang.org/x/tools/cmd/godoc": toBin, -- "golang.org/x/tools/cmd/vet": toTool, -+ "nixos.org/x/tools/cmd/cover": toTool, -+ "nixos.org/x/tools/cmd/godoc": toBin, -+ "nixos.org/x/tools/cmd/vet": toTool, - "code.google.com/p/go.tools/cmd/cover": stalePath, - "code.google.com/p/go.tools/cmd/godoc": stalePath, - "code.google.com/p/go.tools/cmd/vet": stalePath, -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 311ecb0..f151d8f 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1367,7 +1367,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 6cc5df8..9a9a964 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -152,6 +152,17 @@ func GOROOT() string { - return defaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch new file mode 100644 index 00000000000..8f1eb6be7bb --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch @@ -0,0 +1,33 @@ +diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go +index c902b1404f..66016088a2 100644 +--- a/src/internal/testenv/testenv.go ++++ b/src/internal/testenv/testenv.go +@@ -163,13 +163,15 @@ func MustHaveExecPath(t testing.TB, path string) { + // HasExternalNetwork reports whether the current system can use + // external (non-localhost) networks. + func HasExternalNetwork() bool { +- return !testing.Short() && runtime.GOOS != "js" ++ // Nix sandbox does not external network in sandbox ++ return false + } + + // MustHaveExternalNetwork checks that the current system can use + // external (non-localhost) networks. + // If not, MustHaveExternalNetwork calls t.Skip with an explanation. + func MustHaveExternalNetwork(t testing.TB) { ++ t.Skipf("Nix sandbox does not have networking") + if runtime.GOOS == "js" { + t.Skipf("skipping test: no external network on %s", runtime.GOOS) + } +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 57cf5554ad..d00be53b2c 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -990,6 +990,7 @@ func TestDialerControl(t *testing.T) { + // except that it won't skip testing on non-mobile builders. + func mustHaveExternalNetwork(t *testing.T) { + t.Helper() ++ t.Skipf("Nix sandbox does not have networking") + mobile := runtime.GOOS == "android" || runtime.GOOS == "ios" + if testenv.Builder() == "" || mobile { + testenv.MustHaveExternalNetwork(t) diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.16.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.16.patch new file mode 100644 index 00000000000..f4bc16e5b8c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.16.patch @@ -0,0 +1,34 @@ +diff --git a/src/crypto/x509/root.go b/src/crypto/x509/root.go +index ac92915128..fb1d70c735 100644 +--- a/src/crypto/x509/root.go ++++ b/src/crypto/x509/root.go +@@ -6,7 +6,11 @@ package x509 + + //go:generate go run root_ios_gen.go -version 55161.140.3 + +-import "sync" ++import ( ++ "io/ioutil" ++ "os" ++ "sync" ++) + + var ( + once sync.Once +@@ -20,6 +24,16 @@ func systemRootsPool() *CertPool { + } + + func initSystemRoots() { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ systemRoots = roots ++ return ++ } ++ } ++ + systemRoots, systemRootsErr = loadSystemRoots() + if systemRootsErr != nil { + systemRoots = nil diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gprolog/default.nix index 59f33db68cb..87bf767f5bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gprolog/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix index f3a03b36474..3a8fca2c1a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix @@ -1,56 +1,106 @@ -{ 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}"; graalvmXXX-ce = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ce"; - version = "20.3.0"; + version = "21.0.0"; srcs = [ (fetchurl { - sha256 = { "8-linux-amd64" = "195b20ivvv8ipjn3qq2313j8qf96ji93pqm99nvn20bq23wasp25"; - "11-linux-amd64" = "1mdk1zhazvvh1fa01bzi5v5fxhvx592xmbakx0y1137vykbayyjm"; - "8-darwin-amd64" = "1rrs471204p71knyxpjxymdi8ws98ph2kf5j0knk529g0d24rs01"; - "11-darwin-amd64" = "008dl8dbf37mv4wahb9hbd6jp8svvmpy1rgsiqkn3i4hypxnkf12"; + sha256 = { "8-linux-amd64" = "18q1plrpclp02rlwn3vvv2fcyspvqv2gkzn14f0b59pnladmlv1j"; + "11-linux-amd64" = "1g1xjbr693rimdy2cy6jvz4vgnbnw76wa87xcmaszka206fmpnsc"; + "8-darwin-amd64" = "0giv8f7ybdykadzmxjy91i6njbdx6dclyx7g6vyhwk2l1cvxi4li"; + "11-darwin-amd64" = "1a8gjp6fp11ms05pd62h1x1ifkkr3wv0hrxic670v90bbps9lsqf"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "1rzbhllz28x5ps8n304v998hykr4m8z1gfg53ybi6laxhkbx3i13"; - "11-linux-amd64" = "09ipdl1489xnbckwl6sl9y7zy7kp5qf5fgf3kgz5d69jrk2z6rvf"; - "8-darwin-amd64" = "1iy2943jbrarh8bm9wy15xk7prnskqwik2ham07a6ybp4j4b81xi"; - "11-darwin-amd64" = "0vk2grlirghzc78kvwg66w0xriy5p8qkcp7qx83i62d7sj0kvwnf"; + sha256 = { "8-linux-amd64" = "0hpq2g9hc8b7j4d8a08kq1mnl6pl7a4kwaj0a3gka3d4m6r7cscg"; + "11-linux-amd64" = "0z3hb2bf0lqzw760civ3h1wvx22a75n7baxc0l2i9h5wxas002y7"; + "8-darwin-amd64" = "1izbgl4hjg5jyi422xnkx006qnw163r1i1djf76q1plms40y01ph"; + "11-darwin-amd64" = "1d9z75gil0if74ndla9yw3xx9i2bfbcs32qa0z6wi5if66cmknb8"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "0v98v44vblhyi3jhrngmvrkb3a6d607x4fpmrb4mrrsg75vbvc6d"; - "11-linux-amd64" = "0kb9472ilwqg40gyw1c4lmzkd9s763raw560sw80ljm3p75k4sc7"; - "8-darwin-amd64" = "192n9ckr4p8qirpxr67ji3wzxpng33yfr7kxynlrcp7b3ghfic6p"; - "11-darwin-amd64" = "1wqdk8wphywa00kl3xikiskclb84rx3nw5a4vi5y2n060kclcp22"; + sha256 = { "8-linux-amd64" = "122p8psgmzhqnjb2fy1lwghg0kw5qa8xkzgyjp682lwg4j8brz43"; + "11-linux-amd64" = "1vdc90m6s013cbhmj58nb4vyxllbxirw0idlgv0iv9cyhx90hzgz"; + "8-darwin-amd64" = "04q0s9xsaskqn9kbhz0mgdk28j2qnxrzqfmw6jn2znr8s8jsc6yp"; + "11-darwin-amd64" = "1pw4xd8g5cc9bm52awmm1zxs96ijws43vws7y10wxa6a0nhv7z5f"; }.${javaVersionPlatform}; url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "1iskmkhrrwlhcq92g1ljvsfi9q403xxkwgzn9m282z5llh2fxv74"; - "11-linux-amd64" = "13bg2gs22rzbngnbw8j68jqgcknbiw30kpxac5jjcn55rf2ymvkz"; - "8-darwin-amd64" = "08pib13q7s5wymnbykkyif66ll146vznxw4yz12qwhb419882jc7"; - "11-darwin-amd64" = "0cb9lhc21yr2dnrm4kwa68laaczvsdnzpcbl2qix50d0v84xl602"; + sha256 = { "8-linux-amd64" = "19m7n4f5jrmsfvgv903sarkcjh55l0nlnw99lvjlcafw5hqzyb91"; + "11-linux-amd64" = "18ibb7l7b4hmbnvyr8j7mrs11mvlsf2j0c8rdd2s93x2114f26ba"; + "8-darwin-amd64" = "1zlzi00339kvg4ym2j75ypfkzn8zbwdpriqmkaz4fh28qjmc1dwq"; + "11-darwin-amd64" = "0x301i1fimakhi2x29ldr0fsqkb3qs0g9jsmjv27d62dpqx8kgc8"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "12lvcl1vmc35wh3xw5dqca7yiijsd432x4lim3knzppipy7fmflq"; - "11-linux-amd64" = "1s8zfgjyyw6w53974h9a2ig8a1bvc97aplyrdziywfrijgp6zkqk"; - "8-darwin-amd64" = "06i1n42hkhcf1pfb2bly22ws4a09xgydsgh8b0kvjmb1fapd4paq"; - "11-darwin-amd64" = "1r2bqhfxnw09izxlsc562znlp3m9c1isqzhlki083h3vp548vv9s"; + sha256 = { "8-linux-amd64" = "0dlgbg6kri89r9zbk6n0ch3g8356j1g35bwjng87c2y5y0vcw0b5"; + "11-linux-amd64" = "1yby65hww6zmd2g5pjwbq5pv3iv4gfv060b8fq75fjhwrisyj5gd"; + "8-darwin-amd64" = "1smdj491g23i3z7p5rybid18nnz8bphrqjkv0lg2ffyrpn8k6g93"; + "11-darwin-amd64" = "056zyn0lpd7741k1szzjwwacka0g7rn0j4ypfmav4h1245mjg8lx"; }.${javaVersionPlatform}; 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"; - "11" = "$out/lib/jli:$out/lib/server:$out/lib"; - }.${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. @@ -204,11 +250,13 @@ let echo '1 + 1' | $out/bin/graalpython - # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL - # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even - # though `openssl` is in `propagatedBuildInputs`. For more details see: - # https://github.com/NixOS/nixpkgs/pull/105815 - # echo '1 + 1' | $out/bin/irb + ${lib.optionalString stdenv.isLinux '' + # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + echo '1 + 1' | $out/bin/irb + ''} echo '1 + 1' | $out/bin/node -i ${lib.optionalString (javaVersion == "11") '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix index cd613c1b33b..2ddc5b3d3a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index 3a3e384ad98..2e03112d827 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix index 091f327550b..c42e07eac4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index ca9ef4382b4..e4d9f45c955 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix index 7a34977afe2..6adb824f539 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix index 22e4ac4abe4..d941044ca60 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix index 1b5fe0f5788..0c635cabc0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix index cead886f49b..1a16184a6e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix index fcc73cfdeb6..2f54305736a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix index 868da1a5b20..cb44643ff78 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix index 5503a98ae5f..c99358cd287 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 54a7733f4ba..5f9dba0fc3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix index e063c4c0921..c5e767a46cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/microscheme/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/microscheme/default.nix index ee2de8518f3..1f3a98de821 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/microscheme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/microscheme/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, fetchzip, vim, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, unixtools }: stdenv.mkDerivation rec { pname = "microscheme"; version = "0.9.3"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; - sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; + src = fetchFromGitHub { + owner = "ryansuchocki"; + repo = "microscheme"; + rev = "v${version}"; + sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ="; }; - buildInputs = [ makeWrapper vim ]; - - installPhase = '' - make install PREFIX=$out + postPatch = '' + substituteInPlace makefile --replace gcc ${stdenv.cc.targetPrefix}cc ''; + nativeBuildInputs = [ makeWrapper unixtools.xxd ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + meta = with lib; { homepage = "http://microscheme.org"; description = "A Scheme subset for Atmel microcontrollers"; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { microcontrollers, especially as found on Arduino boards. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ ardumont ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix index 298cb5e21ea..5de16633ed7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "CFLAGS=-O2" "PREFIX=${placeholder "out"}" ]; @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs quotehostinfo + substituteInPlace Makefile --replace strip '${stdenv.cc.targetPrefix}strip' ''; meta = with lib; { @@ -69,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/infra/libkookie/nixpkgs/pkgs/development/compilers/mosml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mosml/default.nix index ec8fa793cfd..f6d2053f315 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mosml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/mosml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp perl ]; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; src = fetchurl { url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/mozart/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mozart/binary.nix index 8366fd77a47..b043187e6c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mozart/binary.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/muon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/muon/default.nix index 2e178f775b6..aef02bca970 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/muon/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix index 27427e75d00..75b1a0f0020 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix deleted file mode 100644 index 5762bed41a4..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix deleted file mode 100644 index e3778457fd3..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix deleted file mode 100644 index 642b0d91b7f..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch deleted file mode 100644 index 4b867bbb1e6..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix deleted file mode 100644 index 781b5be0982..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix index afda8592818..3e5aefc11f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix index c422d2a15a3..0662e66e0b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix index 18440a718d1..a24dca373f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix index 64654351886..069380802ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix @@ -7,11 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu11.2.3-jdk11.0.1"; + name = "zulu11.43.21-ca-jdk11.0.9"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; - sha256 = "1jxnxmy79inwf3146ygry1mzv3dj6yrzqll16j7dpr91x1p3dpqy"; + sha256 = "1j19fb5mwdkfn6y8wfsnvxsz6wfpcab4xv439fqssxy520n6q4zs"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix index f9059ae2fc4..655b29f6535 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/ophis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ophis/default.nix new file mode 100644 index 00000000000..f28513a9bb2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ophis/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonApplication, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "ophis"; + version = "unstable-2019-04-13"; + + src = fetchFromGitHub { + owner = "michaelcmartin"; + repo = "Ophis"; + rev = "99f074da278d4ec80689c0e22e20c5552ea12512"; + sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g="; + }; + + sourceRoot = "./src"; + + meta = with lib; { + homepage = "http://michaelcmartin.github.io/Ophis/"; + description = "A cross-assembler for the 6502 series of microprocessors"; + longDescription = '' + Ophis is an assembler for the 6502 microprocessor - the famous chip used + in the vast majority of the classic 8-bit computers and consoles. Its + primary design goals are code readability and output flexibility - Ophis + has successfully been used to create programs for the Nintendo + Entertainment System, the Atari 2600, and the Commodore 64. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 7a6cdf4d705..41f4befe469 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix index d8d141a5e56..2471910fdb5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; # tests are run as part of the compilation process doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 3a2e3c4b944..9fc8188daa1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.38.1"; + version = "0.38.3"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; + sha256 = "14kivmyphi7gbd7mgd4cnsiwl4cl7wih8kwzh7n79s2s4c5hj4ak"; # Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched # LLVM. (The submodule is a specific tag in the LLVM source tree). @@ -24,7 +24,7 @@ stdenv.mkDerivation (rec { }; ponygbenchmark = fetchurl { - url = https://github.com/google/benchmark/archive/v1.5.0.tar.gz; + url = "https://github.com/google/benchmark/archive/v1.5.0.tar.gz"; sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw"; name = "v1.5.0.tar.gz"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation (rec { (substituteAll { src = ./make-safe-for-sandbox.patch; googletest = fetchurl { - url = https://github.com/google/googletest/archive/release-1.8.1.tar.gz; + url = "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"; sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv"; name = "release-1.8.1.tar.gz"; }; @@ -95,7 +95,7 @@ stdenv.mkDerivation (rec { wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" ''; # Stripping breaks linking for ponyc diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index 741d0ec7d1c..6d7f05ebdae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix index c2415899f6b..0feaabc92e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix index 770cc3415f2..ce4250f675e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix index 4b1f572bebb..584b1fdbe43 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rls/default.nix index ee860d78258..aa55866def5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rls/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix index ada098ec182..80b30ec87f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix @@ -1,114 +1,4 @@ -{ lib, stdenv, fetchurl, writeText, sbclBootstrap -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" -, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) -, disableImmobileSpace ? false - # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. - # Note that the created binaries still need `patchelf --set-interpreter ...` - # to get rid of ${glibc} dependency. -, purgeNixReferences ? false -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "sbcl"; +import ./common.nix { version = "2.0.9"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "sha256:17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4"; - }; - - buildInputs = [texinfo]; - - patchPhase = '' - 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 - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # 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 - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - enableFeatures = with lib; - optional threadSupport "sb-thread" ++ - optional stdenv.isAarch32 "arm"; - - disableFeatures = with lib; - optional (!threadSupport) "sb-thread" ++ - optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - - buildPhase = '' - 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) - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - '' - + lib.optionalString (!purgeNixReferences) '' - cp -r src $out/lib/sbcl - cp -r contrib $out/lib/sbcl - cat >$out/lib/sbcl/sbclrc < version.lisp-expr + + # 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 + #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp + sed -i src/cold/slam.lisp -e \ + '/file-write-date input/a)' + sed -i src/cold/slam.lisp -e \ + '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' + sed -i src/code/target-load.lisp -e \ + '/date defaulted-fasl/a)' + sed -i src/code/target-load.lisp -e \ + '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' + + # 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 + '' + + (if purgeNixReferences + then + # This is the default location to look for the core; by default in $out/lib/sbcl + '' + sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ + -i src/runtime/runtime.c + '' + else + # Fix software version retrieval + '' + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ + src/code/run-program.lisp + '' + ); + + + preBuild = '' + export INSTALL_ROOT=$out + mkdir -p test-home + export HOME=$PWD/test-home + ''; + + enableFeatures = with lib; + optional threadSupport "sb-thread" ++ + optional stdenv.isAarch32 "arm"; + + disableFeatures = with lib; + optional (!threadSupport) "sb-thread" ++ + 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 + cp -r contrib $out/lib/sbcl + cat >$out/lib/sbcl/sbclrc < 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 - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # 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 - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - enableFeatures = with lib; - optional threadSupport "sb-thread" ++ - optional stdenv.isAarch32 "arm"; - - disableFeatures = with lib; - optional (!threadSupport) "sb-thread" ++ - optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - - buildPhase = '' - 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) - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - '' - + lib.optionalString (!purgeNixReferences) '' - cp -r src $out/lib/sbcl - cp -r contrib $out/lib/sbcl - cat >$out/lib/sbcl/sbclrc < $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/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix index cbfa9997b8d..c7b01877ad5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 18dbeaea201..b57671d8637 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,19 +1,23 @@ { lib, mkCoqDerivation, which, coq, version ? null }: with builtins; with lib; let - elpi = coq.ocamlPackages.elpi.override ( - optionalAttrs (coq.coq-version == "8.11") { version = "1.11.4"; } - ); + elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [ + { case = "8.11"; out = { version = "1.11.4"; };} + { case = "8.12"; out = { version = "1.12.0"; };} + { case = "8.13"; out = { version = "1.13.0"; };} + ] {}); in mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.13"; out = "1.8.1"; } + { case = "8.13"; out = "1.9.3"; } { case = "8.12"; out = "1.8.0"; } { case = "8.11"; out = "1.6.0_8.11"; } ] null; + release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; + release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07"; release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/infra/libkookie/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index c6cc0d34ed1..203b8bb1b2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = switch coq.coq-version [ + { case = "8.13"; out = "0.6.9"; } { case = "8.12"; out = "0.6.8"; } { case = "8.11"; out = "0.6.7"; } { case = "8.10"; out = "0.6.6"; } @@ -19,6 +20,7 @@ mkCoqDerivation { { case = "8.5"; out = "0.6"; } ] null; + release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z"; release."0.6.8".sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps"; release."0.6.7".sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; release."0.6.6".sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 530763c9439..dabcc44261b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -12,6 +12,8 @@ with lib; mkCoqDerivation { release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; + nativeBuildInputs = [ which ]; + propagatedBuildInputs = [ coq-elpi ]; extraInstallFlags = [ "VFILES=structures.v" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/go-modules/generic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/go-modules/generic/default.nix index c0f10ab5d8f..8246eaefed4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -34,14 +34,16 @@ , meta ? {} # Not needed with buildGoModule -, goPackagePath ? null +, goPackagePath ? "" , ... }@args': with builtins; +assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; + let - args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; + args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" ]; go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = { @@ -240,7 +242,5 @@ let [ lib.maintainers.kalbasit ]; }; }); -in if (goPackagePath != null) then - throw "`goPackagePath` not needed with `buildGoModule`" -else +in package diff --git a/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix index 0a1b3a9a294..8a093a03d1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index f03f4a6dcc0..4b63f03873b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/infra/libkookie/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 { @@ -1410,9 +1413,6 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 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; @@ -1502,6 +1502,8 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; + hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; }); + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; @@ -1525,7 +1527,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) @@ -1581,4 +1583,30 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; + + # 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/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index c162740b8d7..5e39a8047bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/infra/libkookie/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; @@ -92,11 +85,4 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - - # Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3. - # https://github.com/agda/agda/issues/5109 - Agda = appendPatch super.Agda (pkgs.fetchpatch { - url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch"; - sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3"; - }); } diff --git a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index e3f196440ca..932441f7810 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -43,18 +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 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"; - }; - }); + # 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; @@ -62,8 +56,10 @@ self: super: { data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; + hackage-security = doJailbreak super.hackage-security; hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); hashable-time = doJailbreak super.hashable-time; + HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); lukko = doJailbreak super.lukko; parallel = doJailbreak super.parallel; @@ -96,10 +92,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/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e03c9425ed2..05454bd0b89 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -75,8 +75,10 @@ default-package-overrides: - 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-10 + # Stackage Nightly 2021-02-25 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -86,11 +88,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 @@ -101,7 +103,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 @@ -211,7 +213,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0.1 - - amqp-utils ==0.4.4.1 + - amqp-utils ==0.4.5.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 @@ -224,9 +226,9 @@ default-package-overrides: - 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 @@ -234,15 +236,15 @@ default-package-overrides: - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.2 - - ascii-case ==1.0.0.2 - - ascii-char ==1.0.0.6 + - 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.2 - - ascii-predicates ==1.0.0.2 + - ascii-group ==1.0.0.4 + - ascii-predicates ==1.0.0.4 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.2 - - ascii-th ==1.0.0.2 + - ascii-superset ==1.0.1.4 + - ascii-th ==1.0.0.4 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -250,7 +252,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 @@ -258,7 +260,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atomic-primops ==0.8.4 - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.4 + - attoparsec ==0.13.2.5 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 @@ -281,16 +283,16 @@ default-package-overrides: - barbies ==2.0.2.0 - 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 @@ -321,7 +323,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 @@ -330,10 +332,10 @@ default-package-overrides: - bindings-uname ==0.1 - bins ==0.1.2.0 - bitarray ==0.0.1.1 - - bits ==0.5.2 + - bits ==0.5.3 - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 - - bitvec ==1.0.3.0 + - bitvec ==1.1.1.0 - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 - blanks ==0.5.0 @@ -382,7 +384,7 @@ default-package-overrides: - 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 @@ -434,7 +436,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 @@ -457,6 +459,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 @@ -474,7 +477,7 @@ 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 @@ -489,12 +492,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 @@ -572,6 +578,7 @@ default-package-overrides: - 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 @@ -604,7 +611,7 @@ default-package-overrides: - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.4 + - data-ascii ==1.0.0.6 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 @@ -643,19 +650,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 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.2.2 - - deriving-aeson ==0.2.6 + - deriving-aeson ==0.2.6.1 - deriving-compat ==0.5.10 - derulo ==1.0.10 - dhall ==1.38.0 @@ -663,7 +670,7 @@ default-package-overrides: - dhall-json ==1.7.5 - dhall-lsp-server ==1.0.13 - dhall-yaml ==1.2.5 - - 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 @@ -715,7 +722,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 @@ -738,12 +745,12 @@ default-package-overrides: - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.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 @@ -765,8 +772,8 @@ 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 @@ -806,7 +813,7 @@ 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 - feature-flags ==0.1.0.1 @@ -855,7 +862,7 @@ default-package-overrides: - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 - foldl ==1.4.10 - - folds ==0.7.5 + - folds ==0.7.6 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 - foreign-store ==0.2 @@ -880,7 +887,7 @@ 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 @@ -905,7 +912,7 @@ default-package-overrides: - generic-optics ==2.0.0.0 - GenericPretty ==1.2.2 - generic-random ==1.3.0.1 - - generics-sop ==0.5.1.0 + - generics-sop ==0.5.1.1 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 - genvalidity ==0.11.0.0 @@ -937,7 +944,7 @@ 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 @@ -946,14 +953,14 @@ default-package-overrides: - 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-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.4 - - ghc-typelits-natnormalise ==0.7.3 + - ghc-typelits-knownnat ==0.7.5 + - ghc-typelits-natnormalise ==0.7.4 - ghc-typelits-presburger ==0.5.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 @@ -1004,8 +1011,8 @@ default-package-overrides: - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.2.0.0 - - greskell-core ==0.1.3.5 + - greskell ==1.2.0.1 + - greskell-core ==0.1.3.6 - greskell-websocket ==0.1.2.5 - groom ==0.1.2.1 - group-by-date ==0.1.0.4 @@ -1030,7 +1037,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 @@ -1055,7 +1062,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 @@ -1087,7 +1094,7 @@ default-package-overrides: - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 - 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 @@ -1108,7 +1115,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 @@ -1120,7 +1126,7 @@ 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 @@ -1163,7 +1169,7 @@ default-package-overrides: - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.5 + - hspec-need-env ==0.1.0.6 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 @@ -1177,7 +1183,7 @@ 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 @@ -1191,8 +1197,8 @@ 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 @@ -1250,8 +1256,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 @@ -1275,7 +1281,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 @@ -1283,19 +1289,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 @@ -1331,7 +1337,7 @@ default-package-overrides: - 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 @@ -1349,7 +1355,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 @@ -1374,7 +1380,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 @@ -1391,14 +1397,14 @@ 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 @@ -1407,7 +1413,7 @@ default-package-overrides: - 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 @@ -1424,7 +1430,7 @@ default-package-overrides: - 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 @@ -1447,7 +1453,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 @@ -1465,7 +1471,7 @@ default-package-overrides: - 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 - mainland-pretty ==0.7.0.1 @@ -1523,7 +1529,7 @@ 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 - mini-egison ==1.0.0 @@ -1541,13 +1547,13 @@ 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 - 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 @@ -1651,6 +1657,7 @@ 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 - nonce ==1.0.7 - nondeterminism ==1.4 @@ -1664,8 +1671,8 @@ default-package-overrides: - 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 @@ -1726,6 +1733,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 @@ -1789,11 +1798,11 @@ default-package-overrides: - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 - - pipes ==4.3.14 + - pipes ==4.3.15 - 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 @@ -1803,9 +1812,9 @@ default-package-overrides: - pipes-network ==0.6.5 - pipes-network-tls ==0.4 - pipes-ordered-zip ==1.1.0 - - pipes-parse ==3.0.8 + - 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 @@ -1841,7 +1850,7 @@ default-package-overrides: - prelude-safeenum ==0.1.1.2 - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - - pretty-diff ==0.2.0.3 + - pretty-diff ==0.4.0.2 - pretty-hex ==1.1 - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 @@ -1857,7 +1866,7 @@ default-package-overrides: - 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 @@ -1928,12 +1937,13 @@ default-package-overrides: - 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 + - ranged-list ==0.1.0.0 - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 @@ -1944,24 +1954,25 @@ default-package-overrides: - rate-limit ==1.4.2 - ratel-wai ==1.1.4 - rattle ==0.2 + - Rattus ==0.5 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - - rcu ==0.2.4 + - 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 - - reanimate ==1.1.3.2 - - reanimate-svg ==0.13.0.0 + - reanimate ==1.1.3.3 + - reanimate-svg ==0.13.0.1 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.7 + - record-dot-preprocessor ==0.2.8 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - record-wrangler ==0.1.1.0 - - recursion-schemes ==5.2.1 + - recursion-schemes ==5.2.2 - reducers ==3.12.3 - refact ==0.3.0.2 - ref-fd ==0.4.0.2 @@ -1976,8 +1987,8 @@ default-package-overrides: - 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 @@ -2011,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 @@ -2030,7 +2042,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 - - safecopy ==0.10.3.1 + - safecopy ==0.10.4.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 @@ -2060,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 @@ -2109,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 @@ -2155,12 +2167,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.3 + - skylighting-core ==0.10.3 - 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 @@ -2188,7 +2200,7 @@ default-package-overrides: - 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 @@ -2218,7 +2230,7 @@ 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 - STMonadTrans ==0.4.5 - stm-split ==0.0.2.1 @@ -2247,7 +2259,7 @@ default-package-overrides: - 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 - stringsearch ==0.3.6.6 @@ -2258,7 +2270,7 @@ default-package-overrides: - 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 @@ -2293,13 +2305,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-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 @@ -2391,7 +2403,7 @@ default-package-overrides: - th-test-utils ==1.1.0 - th-utilities ==0.2.4.1 - thyme ==0.3.5.5 - - tidal ==1.6.1 + - tidal ==1.7.1 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2412,11 +2424,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 @@ -2431,8 +2443,8 @@ 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 @@ -2456,14 +2468,14 @@ default-package-overrides: - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - - type-natural ==1.0.0.0 + - type-natural ==1.1.0.0 - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - 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 @@ -2516,8 +2528,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 @@ -2533,7 +2545,7 @@ 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 + - vault ==0.3.1.5 - vec ==0.3 - vector ==0.12.2.0 - vector-algorithms ==0.8.0.4 @@ -2548,16 +2560,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 @@ -2605,7 +2617,7 @@ default-package-overrides: - witherable-class ==0 - within ==0.2.0.1 - with-location ==0.1.0 - - with-utf8 ==1.0.2.1 + - with-utf8 ==1.0.2.2 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 @@ -2661,7 +2673,7 @@ default-package-overrides: - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 - yesod-auth-oauth2 ==0.6.1.7 - - yesod-bin ==1.6.0.6 + - yesod-bin ==1.6.1 - yesod-core ==1.6.18.8 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 @@ -2690,9 +2702,9 @@ default-package-overrides: - zip ==1.7.0 - zip-archive ==0.4.1 - zipper-extra ==0.1.3.2 - - zippers ==0.3 + - zippers ==0.3.1 - zip-stream ==0.2.0.1 - - zlib ==0.6.2.2 + - zlib ==0.6.2.3 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 @@ -2788,14 +2800,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 @@ -2808,6 +2818,33 @@ package-maintainers: - zre utdemir: - nix-tree + turion: + - rhine + - rhine-gloss + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck + - Agda + - dunai + - finite-typelits + - pulse-simple + - simple-affine-space + sternenseemann: + # also maintain upstream package + - spacecookie + - gopher-proxy + # other packages I can help out for + - systemd + - fast-logger + - Euterpea2 + - utc + - socket + - gitit + - yarn-lock + - yarn2nix + poscat: + - hinit unsupported-platforms: alsa-mixer: [ x86_64-darwin ] @@ -6418,7 +6455,6 @@ broken-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hinit - hinquire - hinstaller - hint-server @@ -6887,6 +6923,7 @@ broken-packages: - huzzy - hVOIDP - hw-all + - hw-aws-sqs-conduit - hw-ci-assist - hw-dsv - hw-json @@ -6954,6 +6991,7 @@ broken-packages: - iban - ical - iCalendar + - ice40-prim - IcoGrid - iconv-typed - ide-backend @@ -6967,7 +7005,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud @@ -7329,7 +7366,6 @@ broken-packages: - keyvaluehash - keyword-args - khph - - ki - kicad-data - kickass-torrents-dump-parser - kickchan @@ -9400,7 +9436,6 @@ broken-packages: - regex-tdfa-pipes - regex-tdfa-quasiquoter - regex-tdfa-rc - - regex-tdfa-text - regex-tdfa-unittest - regex-tdfa-utf8 - regex-tre @@ -9874,9 +9909,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 @@ -11460,7 +11498,6 @@ broken-packages: - xml-conduit-stylist - xml-enumerator - xml-enumerator-combinators - - xml-extractors - xml-html-conduit-lens - xml-monad - xml-parsec @@ -11539,8 +11576,6 @@ broken-packages: - yandex-translate - yaop - yap - - yarn-lock - - yarn2nix - yarr - yarr-image-io - yavie diff --git a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 4e23ab80c1b..21aa86ee5a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -207,6 +207,7 @@ self: super: builtins.intersectAttrs super { network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw + pixiv = dontCheck super.pixiv; raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw scotty-binding-play = dontCheck super.scotty-binding-play; @@ -226,6 +227,7 @@ self: super: builtins.intersectAttrs super { http-client-tls = dontCheck super.http-client-tls; http-conduit = dontCheck super.http-conduit; transient-universe = dontCheck super.transient-universe; + telegraph = dontCheck super.telegraph; typed-process = dontCheck super.typed-process; js-jquery = dontCheck super.js-jquery; hPDB-examples = dontCheck super.hPDB-examples; @@ -806,4 +808,8 @@ self: super: builtins.intersectAttrs super { # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); + + # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. + # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b + hadolint = disableCabalFlag super.hadolint "static"; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 6928bba47fa..4ebf5522bd6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -824,7 +824,7 @@ self: { description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ abbradar ]; + maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; "Agda-executable" = callPackage @@ -9393,8 +9393,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 +9777,8 @@ self: { pname = "HaXml"; version = "1.25.5"; sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "2"; - editedCabalFile = "0vlczcac2is5dbvkcwbsry1i10pbh1r316n1sq2py35alw7kzp1j"; + revision = "3"; + editedCabalFile = "0n98cigikjiqg2ckgihjw4if35n1jhv0zcqi3qw56b9j02yxdvvz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15016,6 +15016,8 @@ self: { pname = "OneTuple"; version = "0.2.2.1"; sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc"; + revision = "1"; + editedCabalFile = "03mygfz7lv6h0i30bq2grvmahbg9j7a36mc0wls2nr81dv9p19s7"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = lib.licenses.bsd3; @@ -17052,15 +17054,15 @@ self: { "Rattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim - , simple-affine-space + , simple-affine-space, transformers }: mkDerivation { pname = "Rattus"; - version = "0.4"; - sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1"; + version = "0.5"; + sha256 = "1dh6ln8awqhgnk7hqh4zdkv4pqy3wmsqbmqrd016raf8vjbc1i3m"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc ghc-prim simple-affine-space + base containers ghc ghc-prim simple-affine-space transformers ]; testHaskellDepends = [ base containers ]; description = "A modal FRP language"; @@ -20805,8 +20807,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.12"; - sha256 = "0j46hhwfqbry6w8l8wj0p486rsyvxkk6dbvhd1sjkha6cy5cvar4"; + version = "0.4"; + sha256 = "1v4m9b13p0sf3gs8qvdgkai4r9kb6sszw2qdyxrn6i4nq62f19zq"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21177,12 +21179,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_11_0_0" = callPackage + "Win32_2_11_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.11.0.0"; - sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm"; + version = "2.11.1.0"; + sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -21961,8 +21963,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.6.0.0"; - sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d"; + version = "0.6.1.0"; + sha256 = "096zzi2fb6pj310bkihsidwaail9hi78mpfplg4c8skq4157ps6s"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21989,8 +21991,10 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.6.1.0"; - sha256 = "0m0qvamvixxm9yd45393j44mnnlnw2672gcdv7kaqw4hjczlddmq"; + version = "0.6.4.0"; + sha256 = "1d651q0xda38652n249swh84kkn2jgw63db01aia00304h9cbcgf"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -22015,10 +22019,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 @@ -23961,8 +23963,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 ]; @@ -24379,8 +24381,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.5.5.1"; - sha256 = "0iqnzh9xh2vx9viqvs528i24zm9sdpvh8kjbpfxgrca38v6ds5m2"; + version = "1.5.6.0"; + sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -24486,14 +24488,15 @@ 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, aeson, base, bytestring, containers, criterion + , deepseq, 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"; + version = "0.0.4.1"; + sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg"; libraryHaskellDepends = [ aeson base bytestring containers fail scientific text time time-compat unordered-containers uuid-types vector void @@ -24501,6 +24504,9 @@ self: { testHaskellDepends = [ aeson base bytestring doctest hspec text utf8-string ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq text + ]; description = "Aeson combinators for dead simple JSON decoding"; license = lib.licenses.bsd3; }) {}; @@ -24917,8 +24923,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 @@ -25100,8 +25106,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 @@ -26461,6 +26467,68 @@ self: { broken = true; }) {}; + "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.1.1.0"; + sha256 = "0sxgysi596j77j3bfadvk6gcq9k70g0wqrq1mgxh4ypmc145psc1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l + mmsyn7ukr-common phonetic-languages-simplified-base process + ukrainian-phonetics-basic-array + ]; + executableHaskellDepends = [ + 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 { @@ -29602,28 +29670,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.4.1"; - sha256 = "1vs0p7pc6z9mfjd2vns66wnhl8v1n9rbgabyjw0v832m2pwizzmj"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - amqp base bytestring connection containers data-default-class - directory hinotify magic network process text time tls unix - utf8-string x509-system - ]; - description = "AMQP toolset for the command line"; - license = lib.licenses.gpl3; - }) {}; - - "amqp-utils_0_4_5_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.0"; - sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; + version = "0.4.5.1"; + sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29633,7 +29681,6 @@ self: { ]; description = "AMQP toolset for the command line"; license = lib.licenses.gpl3; - hydraPlatforms = lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -31805,8 +31852,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 = [ @@ -31874,10 +31921,10 @@ self: { }: mkDerivation { pname = "approx"; - version = "0.1.0.0"; - sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2"; + version = "0.1.0.1"; + sha256 = "0vzi0ai7lf7ji2lbf9v412fvrins7acy0dqs4j8ylfd1chck1w99"; revision = "1"; - editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1"; + editedCabalFile = "0kj9qqfv8fzg5b6l33avflxjlmd52wjsjridff1d5n071dnif37y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31890,7 +31937,7 @@ self: { base containers hashable QuickCheck text time unordered-containers vector ]; - description = "Easy-to-use reasonable way of emulating approximate in Haskell"; + description = "Easy-to-use emulation of approximate, ranges and tolerances in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -31928,23 +31975,18 @@ 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, base, binary, bytes, cereal, comonad, deepseq + , ghc-prim, hashable, lens, log-domain, pointed, safecopy + , semigroupoids, semigroups, vector }: mkDerivation { pname = "approximate"; - version = "0.3.2"; - sha256 = "016i37c5imb0n8gsk7gzyiq8dhkjv0xnn5315kmn6lnrhpfm7yyk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.3.4"; + sha256 = "06akbrmy66nkgnnk3x87jss9qgv5y9m638rvxy57mfzibf925kbd"; 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; }) {}; @@ -32958,8 +33000,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 @@ -33295,23 +33337,6 @@ self: { }) {}; "ascii" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-group - , ascii-predicates, ascii-superset, ascii-th, base, bytestring - , data-ascii, text - }: - mkDerivation { - pname = "ascii"; - version = "1.0.1.2"; - sha256 = "051q0gamgvgd4j1bzqxww7qy4syx21s0vqhfihwlb2ypxf2s2fqa"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-group ascii-predicates ascii-superset - ascii-th base bytestring data-ascii text - ]; - description = "The ASCII character set and encoding"; - license = lib.licenses.asl20; - }) {}; - - "ascii_1_0_1_4" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group , ascii-predicates, ascii-superset, ascii-th, base, bytestring , data-ascii, text @@ -33326,7 +33351,6 @@ self: { ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-art-to-unicode" = callPackage @@ -33345,17 +33369,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.2"; - sha256 = "1qs1rccslixsg4szgp7y98sqhhn0asp9qmk9vfrwdjfipmf3z72p"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33364,21 +33377,9 @@ self: { libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.6"; - sha256 = "049xccazgjb1zzqbzpgcw77hsl5j3j8l7f0268wxjy87il3wfnx3"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_8" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33387,7 +33388,6 @@ self: { libraryHaskellDepends = [ base hashable ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33418,17 +33418,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.2"; - sha256 = "19l50ksqa7jdsl0pmrmy8q8jbgmb1j3hr63jjzys220f0agsgcwr"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33437,7 +33426,6 @@ self: { libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33456,17 +33444,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.2"; - sha256 = "0dzrxqhq7vqplg4aanc4kindwpizv3d777ri81sj1m1zn3vzvrrq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33475,7 +33452,6 @@ self: { libraryHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33523,19 +33499,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.2"; - sha256 = "0hx5kh6h239hqrnqyda55769jfbxjxcr4mihya1djl7ls1fy493v"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_4" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33546,7 +33509,6 @@ self: { ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33568,20 +33530,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.2"; - sha256 = "1dmr2g4kx14qad62awk4pv3izx5gm8bmzvs03gn3xrbzssjb8pvc"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell }: mkDerivation { @@ -33593,7 +33541,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -33816,8 +33763,8 @@ self: { pname = "asn1-encoding"; version = "0.9.6"; sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"; - revision = "1"; - editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n"; + revision = "2"; + editedCabalFile = "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -33992,6 +33939,8 @@ self: { pname = "assoc"; version = "1.0.2"; sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q"; + revision = "1"; + editedCabalFile = "17ycclzwnysca80frsyyb6sdd2r5p83lkgwxjjnjg6j62pvf8958"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -34208,10 +34157,8 @@ self: { }: mkDerivation { pname = "async"; - version = "2.2.2"; - sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; - revision = "1"; - editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51"; + version = "2.2.3"; + sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -34996,36 +34943,6 @@ self: { }) {}; "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.2.4"; - sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; - revision = "1"; - editedCabalFile = "0jlipzz2b1jb8yw22rvnhvbnadzcdf3wkwn4svl3j4m6858s0har"; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - description = "Fast combinator parsing for bytestrings and text"; - license = lib.licenses.bsd3; - }) {}; - - "attoparsec_0_13_2_5" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -35051,7 +34968,6 @@ self: { ]; description = "Fast combinator parsing for bytestrings and text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -38042,8 +37958,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 ]; @@ -38094,18 +38010,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; }) {}; @@ -38119,8 +38032,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 ]; @@ -38153,18 +38066,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; }) {}; @@ -38286,6 +38196,8 @@ self: { pname = "base64"; version = "0.4.2.3"; sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw"; + revision = "1"; + editedCabalFile = "10s7nw79q385f74x76rh8cy0dxfj7idzrj77ng9x32bf8h7jpa6q"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -38377,8 +38289,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 @@ -38413,16 +38325,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; }) {}; @@ -38928,8 +38839,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 @@ -40508,6 +40419,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 @@ -40578,8 +40491,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "4"; - editedCabalFile = "07jwyndphnfr20ihagncpl8rr7i62hxf0b9m2bdahyzvz0yzdsl2"; + revision = "5"; + editedCabalFile = "1h2d37szfrcwn9rphnijn4q9l947b0wwqjs1aqmm62xkhbad7jf6"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -40672,8 +40585,8 @@ 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 @@ -42766,18 +42679,12 @@ self: { }) {}; "bits" = callPackage - ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl - , transformers - }: + ({ mkDerivation, base, bytes, mtl, transformers }: mkDerivation { pname = "bits"; - version = "0.5.2"; - sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; - revision = "2"; - editedCabalFile = "0zcxzi3afs2vxmm2mc9l65br5qym2ah9q3671f4ckzn0h0hcqw2n"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.5.3"; + sha256 = "0avcm2635nvgghr7nbci66s4l5q4k6ag81hla1xai58b159anyq0"; libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base doctest ]; description = "Various bit twiddling and bitwise serialization primitives"; license = lib.licenses.bsd3; }) {}; @@ -43036,30 +42943,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 @@ -43080,7 +42963,6 @@ self: { ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitwise" = callPackage @@ -43125,6 +43007,31 @@ self: { broken = true; }) {}; + "bitwise-enum_1_0_1_0" = callPackage + ({ mkDerivation, aeson, array, base, deepseq, gauge + , mono-traversable, QuickCheck, test-framework + , test-framework-quickcheck2, vector, wide-word + }: + mkDerivation { + pname = "bitwise-enum"; + version = "1.0.1.0"; + sha256 = "0vmdr8csmxwab7s4nmqdfpqdssivh90fddk94i8wkwj1la867y1z"; + libraryHaskellDepends = [ + aeson array base deepseq mono-traversable vector + ]; + testHaskellDepends = [ + aeson array base deepseq mono-traversable QuickCheck test-framework + test-framework-quickcheck2 vector + ]; + benchmarkHaskellDepends = [ + aeson array base deepseq gauge mono-traversable vector wide-word + ]; + description = "Bitwise operations on bounded enumerations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bitx-bitcoin" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, directory , doctest, exceptions, hspec, http-client, http-client-tls @@ -45809,7 +45716,6 @@ self: { ]; description = "Haskell source code formatter"; license = lib.licenses.agpl3; - maintainers = with lib.maintainers; [ maralorn ]; }) {}; "broadcast-chan" = callPackage @@ -47291,24 +47197,19 @@ self: { }) {}; "bytes" = callPackage - ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal - , cabal-doctest, cereal, containers, directory, doctest, filepath - , hashable, mtl, scientific, text, time, transformers + ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal + , containers, 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 ]; + version = "0.17.1"; + sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; 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; }) {}; @@ -47333,8 +47234,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 @@ -47376,15 +47277,23 @@ self: { broken = true; }) {}; - "bytestring_0_11_0_0" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: + "bytestring_0_11_1_0" = callPackage + ({ mkDerivation, base, deepseq, dlist, ghc-prim, integer-gmp + , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , transformers + }: mkDerivation { pname = "bytestring"; - version = "0.11.0.0"; - sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj"; - revision = "1"; - editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr"; + version = "0.11.1.0"; + sha256 = "1a29kwczd1hcpir691x936i9c5ys9d7m1lyby48djs9w54ksy1jw"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; + testHaskellDepends = [ + base deepseq dlist ghc-prim tasty tasty-hunit tasty-quickcheck + transformers + ]; + benchmarkHaskellDepends = [ + base deepseq dlist random tasty-bench + ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -48745,23 +48654,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 = '' @@ -50659,8 +50567,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.10.0.0"; - sha256 = "054cy2rr2hg0brrbxff4my3q2fzr1qk7ik2xyip65dq54958ibqk"; + version = "0.10.0.1"; + sha256 = "1p5vx7gcswz08f790swb8pi2ckbphqr76j8gav4rvrbalscd3zvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51567,8 +51475,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "1"; - editedCabalFile = "1ph8rf91z4nf1ryrh9s4gd1kq98jlgk2manwddkpch8k0n9xvfk4"; + revision = "2"; + editedCabalFile = "1y08lhkh6c6421g3nwwkrrv3r36l75x9j2hnm5khagjpm5njjzma"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -53144,17 +53052,15 @@ self: { }) {}; "charset" = callPackage - ({ mkDerivation, array, base, bytestring, containers, semigroups + ({ mkDerivation, array, base, bytestring, containers , unordered-containers }: mkDerivation { pname = "charset"; - version = "0.3.7.1"; - sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; - revision = "2"; - editedCabalFile = "002x3yan7632nqgwk0a7f3wvchgm95pdwqh225va8dnn1lr9pi1z"; + version = "0.3.8"; + sha256 = "1rw6y2insgljbi5l1nwqwv9v865sswjly9rvwipd8zajkgks7aks"; libraryHaskellDepends = [ - array base bytestring containers semigroups unordered-containers + array base bytestring containers unordered-containers ]; description = "Fast unicode character sets based on complemented PATRICIA tries"; license = lib.licenses.bsd3; @@ -57094,8 +57000,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.20"; - sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf"; + version = "0.10.21"; + sha256 = "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57525,8 +57431,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.14"; - sha256 = "1vkjnyzcl44h9b24k1h5mz61gdz42bs64ifxwijx8a2a72mwmaa6"; + version = "0.1.3.17"; + sha256 = "1x289bmzrj1yrr934b51v3amldhjdanjv4kxnay89n8avix899yw"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58039,8 +57945,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.8.0.0"; - sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3"; + version = "0.9.0.0"; + sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59521,23 +59427,18 @@ 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, base, bifunctors, binary, bytes, cereal, comonad + , criterion, deepseq, distributive, hashable, lens, log-domain + , safecopy, semigroupoids, semigroups, vector }: mkDerivation { pname = "compensated"; - version = "0.8.1"; - sha256 = "1qr5nsg6fb6ib2wp29c1y05zdbydsng0sfg2k75qsh0avb2cgw7z"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.8.3"; + sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; 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; @@ -61869,14 +61770,15 @@ self: { , base-unicode-symbols, bytestring, Cabal, case-insensitive , deepseq, directory, dlist, filepath, mtl, network-uri , optparse-applicative, process, profunctors, semigroupoids - , semigroups, text, transformers, unordered-containers, yaml + , semigroups, text, transformers, unordered-containers, vector + , yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.5.0"; - sha256 = "0pgx2wzzqxgafgf3qjys05hp89lz4fwczsx0i581n8ngs3p4i0wh"; - revision = "1"; - editedCabalFile = "0srscnmj5dhaq0djx0lhcggl53ipn6pw8vgsvgzhhjrbmnn2zb2p"; + version = "0.6.0"; + sha256 = "1lncsh3dfl8iz1yr2b0mmpcdyww3cbr3jglp85iqmpvzv66m2kbg"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base bytestring Cabal directory filepath process ]; @@ -61885,8 +61787,9 @@ self: { bytestring Cabal case-insensitive deepseq directory dlist filepath mtl network-uri optparse-applicative process profunctors semigroupoids semigroups text transformers unordered-containers - yaml + vector yaml ]; + executableHaskellDepends = [ base base-unicode-symbols Cabal mtl ]; testHaskellDepends = [ base base-unicode-symbols bytestring Cabal mtl text transformers unordered-containers yaml @@ -62135,16 +62038,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; @@ -62442,6 +62344,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_13" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13"; + sha256 = "143558jykvya7y8134dx30g6nh27q5s61nbq369p69igd1aayncj"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -65292,6 +65214,8 @@ self: { pname = "criterion"; version = "1.5.9.0"; sha256 = "0qhlylhra1d3vzk6miqv0gdrn10gw03bdwv8b4bfmdzgpf0zgqr1"; + revision = "1"; + editedCabalFile = "140444pqw65vsqpa168c13cljb66rdgvq41mxnvds296wxq2yz7i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -65315,6 +65239,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion-cmp" = callPackage + ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava + , containers, filepath, optparse-applicative, vector + }: + mkDerivation { + pname = "criterion-cmp"; + version = "0.1.0.0"; + sha256 = "0p9l9c89bg1n7xjdq3npvknlfb36gkvpgwhq7i0qd2g20ysdxppd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base boxes bytestring cassava containers filepath + optparse-applicative vector + ]; + description = "A simple tool for comparing in Criterion benchmark results"; + license = lib.licenses.bsd3; + }) {}; + "criterion-compare" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams , clay, colour, containers, data-default, filepath, lens, lucid @@ -68511,22 +68453,6 @@ self: { }) {}; "data-ascii" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , hashable, semigroups, text - }: - mkDerivation { - pname = "data-ascii"; - version = "1.0.0.4"; - sha256 = "17pb1kmqln7cswsc4c7xipq619aj2y0kjhrcm23r8b39c0g02scy"; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive hashable semigroups - text - ]; - description = "Type-safe, bytestring-based ASCII values"; - license = lib.licenses.bsd3; - }) {}; - - "data-ascii_1_0_0_6" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , hashable, semigroups, text }: @@ -68540,7 +68466,6 @@ self: { ]; description = "Type-safe, bytestring-based ASCII values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-aviary" = callPackage @@ -70880,7 +70805,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_2_18" = callPackage + "dbus_1_2_19" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -70889,8 +70814,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.18"; - sha256 = "15ggmggzgzf0xmj80rj14dyk83vra6yzm5pm92psnc4spn213p73"; + version = "1.2.19"; + sha256 = "1wcwh8c27v8vs7jaqzp3032wzx14v4mn7r2qhxhb77cppimrjqpg"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -71678,10 +71603,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; @@ -71756,8 +71679,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 @@ -72020,8 +71943,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 @@ -73000,8 +72923,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"; @@ -73617,8 +73540,8 @@ self: { pname = "dhall"; version = "1.38.0"; sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229"; - revision = "1"; - editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r"; + revision = "2"; + editedCabalFile = "13ppbn4kcrfls9fm9sqjwa4hb4nj8q6fqfxj3a62vck7qc1rbvn0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73660,6 +73583,8 @@ self: { pname = "dhall-bash"; version = "1.0.36"; sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; + revision = "1"; + editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73703,8 +73628,8 @@ self: { pname = "dhall-docs"; version = "1.0.4"; sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; - revision = "2"; - editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; + revision = "3"; + editedCabalFile = "116m74khdfx57ghrid1myqyj8acrhzhnjzjmxnsn3yghdan29797"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73770,8 +73695,8 @@ self: { pname = "dhall-json"; version = "1.7.5"; sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; - revision = "1"; - editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; + revision = "2"; + editedCabalFile = "0181ma0qzkcfg4g5fcyivmjfn542m9cmq74r6hxilfjvfzhk7fqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73821,8 +73746,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.13"; sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; - revision = "2"; - editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; + revision = "4"; + editedCabalFile = "04m040956j49qr8hzlj2jj101pjj6n0f5g5hhf5m73y1bww43ahf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73965,6 +73890,8 @@ self: { pname = "dhall-yaml"; version = "1.2.5"; sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf"; + revision = "1"; + editedCabalFile = "034rykrnmsnc9v9hsblkzjp26b8wv265sd31gwhqxy2358y4s33h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74659,8 +74586,8 @@ self: { }: mkDerivation { pname = "diagrams-solve"; - version = "0.1.2"; - sha256 = "1qzycw3aj4107dqpgir3ak7pnja3a6i4ax15gd2q2fjzmp4p3z24"; + version = "0.1.3"; + sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -75857,6 +75784,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"; @@ -77398,8 +77327,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 ]; @@ -78833,6 +78762,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 { @@ -79255,6 +79195,20 @@ self: { broken = true; }) {}; + "drama" = callPackage + ({ mkDerivation, base, ki, transformers, unagi-chan }: + mkDerivation { + pname = "drama"; + version = "0.3.0.0"; + sha256 = "17smzrvpaah2lcc2467dd61lns53q4n0bf0pl9glsv04j9kv2nl9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ki transformers unagi-chan ]; + executableHaskellDepends = [ base ]; + description = "Actor library for Haskell"; + license = lib.licenses.bsd3; + }) {}; + "draw-poker" = callPackage ({ mkDerivation, base, random-shuffle, safe }: mkDerivation { @@ -79694,8 +79648,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.1.1.1"; - sha256 = "1pxhvnm5vvgfxwm42s3w3i5nk0lx75xgsr1c487hkswip48fiyd6"; + version = "1.2"; + sha256 = "1mkk1jdw04294hljz3jxiz8403jq7srx6nalyjn1kj09yvws3d05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80016,6 +79970,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "dunai-core" = callPackage @@ -81110,10 +81065,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "echo"; - version = "0.1.3"; - sha256 = "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh"; - revision = "1"; - editedCabalFile = "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"; + version = "0.1.4"; + sha256 = "0hqfdd4kvpp59cjjv790bkf72yqr9xjfqlbjcrdsc9a8j3r1pzn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -82978,8 +82931,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.5.0.1"; - sha256 = "1rglf080hx4c8nai07ghh2wf6j79x9hfx2mjzbqc588y0rpj7kmj"; + version = "0.5.0.2"; + sha256 = "1hky4amw78ciblr6alcxp79dshsc5wqswp16hbqdry132xps9dw3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82994,21 +82947,20 @@ 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 + , math-functions, mwc-random, primitive, statistics, vector }: mkDerivation { pname = "elynx-markov"; - version = "0.5.0.1"; - sha256 = "0m24kzayvhc2mhhk2glpw82kmdbgk38vl2d0xdkkdnnbqag8mbqa"; + version = "0.5.0.2"; + sha256 = "0wlcq3q26lgwixhsq1afz9i3phr2sncwc0r6m4adminh9m1zdr5z"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix - integration math-functions mwc-random parallel primitive statistics - vector + integration math-functions mwc-random primitive statistics vector ]; testHaskellDepends = [ base containers elynx-tools hmatrix hspec mwc-random vector ]; + benchmarkHaskellDepends = [ base ]; description = "Simulate molecular sequences along trees"; license = lib.licenses.gpl3Plus; }) {}; @@ -83017,8 +82969,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.5.0.1"; - sha256 = "0jh5j4f8awallrjbgrgdjl6jdzk2lswr28xjryqdapwf4licfkk2"; + version = "0.5.0.2"; + sha256 = "1y7ndj216w58s85bfgp4vg7zi1asj6br68k000hy4a8cchjprlp9"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -83032,8 +82984,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.5.0.1"; - sha256 = "0b5jih0jgcf0rbcbwj18l269wbgf31i9125gx3rz6w7ydapmr7wr"; + version = "0.5.0.2"; + sha256 = "11nl8gw05gvd6j7dflqzi21kixmm0jalpqv9x9f6bb7qwdv1xak2"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -83054,8 +83006,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.5.0.1"; - sha256 = "0lq5jv9dwyi0plkx1n270dan8nfxac9q7rhcdq95mzhgar8daink"; + version = "0.5.0.2"; + sha256 = "1q62f0b0fk6g2a4w5bbbpldv0awk7cn2q544xcxplanpr3fmaj8v"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -83075,8 +83027,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.5.0.1"; - sha256 = "1pzam7qg7qihim50iyxw2fsy58xakzjvzskaa4vhzg9cghmjjva8"; + version = "0.5.0.2"; + sha256 = "1ywqbc80hq4dprzrrq9gyi7h2624i2mgpd43pv045dldh7dqhygn"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random parallel @@ -84873,19 +84825,17 @@ 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, array, attoparsec, base, bytestring, containers + , data-default, fail, lens, mtl, parsec, process, semigroups + , temporary, transformers, unordered-containers }: mkDerivation { pname = "ersatz"; - version = "0.4.8"; - sha256 = "1gddf8zhavxri80f3nnd29ff6k7n03ggcah4qglknci7h94z7v8c"; + version = "0.4.9"; + sha256 = "1pnqz7zvkfw70pjhhs5lm965iydrj8cgbj685fh50fpm0wapnmfd"; 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 @@ -84893,7 +84843,7 @@ self: { executableHaskellDepends = [ array base containers fail lens mtl parsec semigroups ]; - testHaskellDepends = [ array base directory doctest filepath ]; + testHaskellDepends = [ array base ]; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -85111,8 +85061,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 @@ -85163,6 +85113,7 @@ self: { ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -85178,6 +85129,7 @@ self: { ]; description = "General purpose live coding framework - Gloss backend"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-gloss-example" = callPackage @@ -85211,6 +85163,7 @@ self: { ]; description = "General purpose live coding framework - pulse backend"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-pulse-example" = callPackage @@ -85245,6 +85198,7 @@ self: { ]; description = "General purpose live coding framework - QuickCheck integration"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-warp" = callPackage @@ -85732,17 +85686,23 @@ self: { "evdev" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, extra - , libevdev, monad-loops, time, unix + , filepath-bytestring, libevdev, monad-loops, rawfilepath, tasty + , tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "evdev"; - version = "2.0.0.1"; - sha256 = "0ryq50g7z70rnv07pnvwssl0qrvhbljkq9yk1z8gj9kvqdsw9cmg"; + version = "2.1.0"; + sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; libraryHaskellDepends = [ - base bytestring containers extra monad-loops time unix + base bytestring containers extra filepath-bytestring monad-loops + rawfilepath time unix ]; libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring containers extra filepath-bytestring monad-loops + rawfilepath tasty tasty-hunit tasty-quickcheck time unix + ]; description = "Bindings to libevdev"; license = lib.licenses.bsd3; }) {inherit (pkgs) libevdev;}; @@ -85755,6 +85715,8 @@ self: { pname = "evdev-streamly"; version = "0.0.1.0"; sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp"; + revision = "1"; + editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj"; libraryHaskellDepends = [ base bytestring containers evdev extra posix-paths rawfilepath streamly streamly-fsnotify unix @@ -86722,8 +86684,8 @@ self: { }: mkDerivation { pname = "exh"; - version = "1.0.0"; - sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l"; + version = "1.0.2"; + sha256 = "10pvr8ya2f7arp8cqi4g97dpqin1h8n0xmnihqszchcils0v2ayn"; libraryHaskellDepends = [ aeson base bytestring conduit containers html-conduit http-client in-other-words language-javascript megaparsec optics-core optics-th @@ -87625,8 +87587,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 @@ -88586,8 +88548,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.0.2"; - sha256 = "0ilbjz09vw35jzfvkiqjy6zjbci2l60wcyjzfysrbxzk24qxmb5z"; + version = "3.0.3"; + sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -88596,6 +88558,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "fast-math" = callPackage @@ -91255,6 +91218,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "finito" = callPackage @@ -93136,6 +93100,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "fmr" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fmr"; + version = "0.1"; + sha256 = "1hwi4f027pv1sy6pmanc0488xdy398iv50yapivyk2l9kipfnq3q"; + libraryHaskellDepends = [ base ]; + description = "Fake monadic records library"; + license = lib.licenses.bsd3; + }) {}; + "fmt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover @@ -93312,8 +93287,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "foldable-ix"; - version = "0.1.0.0"; - sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79"; + version = "0.2.0.0"; + sha256 = "1xbdwnvbg4phkqrcb9izabff85dhdj004nnbgk53f50if9sv4463"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; @@ -93353,6 +93328,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "foldl_1_4_11" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, mwc-random + , primitive, profunctors, semigroupoids, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.4.11"; + sha256 = "05i87pqldk1xfpx66nh1lhn75x3g7s8kvhf9k9yll33a6ggawwxl"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors semigroupoids text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, doctest, foldl, safe-exceptions }: mkDerivation { @@ -93468,26 +93465,21 @@ 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, adjunctions, base, bifunctors, comonad + , constraints, contravariant, data-reify, distributive, lens, mtl + , pointed, profunctors, reflection, semigroupoids, transformers + , unordered-containers, vector }: mkDerivation { pname = "folds"; - version = "0.7.5"; - sha256 = "17a8xggx17m59hiwd2lxd2379sw4xblgyv1pk9g5h93w3m8wgq1r"; + version = "0.7.6"; + sha256 = "06sy3arl37k7qz6zm2rscpvzl9za165214f5bgjppj7zdv0qkc3v"; 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; }) {}; @@ -94346,6 +94338,8 @@ self: { pname = "fourmolu"; version = "0.3.0.0"; sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; + revision = "1"; + editedCabalFile = "1n3avdmjqkd2910lhb5spxvjgzb7icln82pcrz3cmkfmjwxnirsc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -96449,10 +96443,8 @@ self: { }: mkDerivation { pname = "functor-classes-compat"; - version = "1"; - sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "6"; - editedCabalFile = "0r0h3hp182w9ndhr5lrvhzl1vyj2f3vvh32fpdnbxb8xkkhx55sa"; + version = "1.0.1"; + sha256 = "0p6kwj1yimis0rg2gihwkgxkjj1psxy38hxa94gz5pd638314hi3"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -98223,33 +98215,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; @@ -99109,10 +99101,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 ]; @@ -99130,6 +99120,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; @@ -100303,6 +100295,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; + revision = "1"; + editedCabalFile = "1qwx6569079a8viq2plkpc1wlqdz8syys6hvx68m051a7zvdwzyl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -100591,8 +100585,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3.4"; - sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98"; + version = "0.6.4"; + sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101020,8 +101014,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"; @@ -101098,8 +101092,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 = [ @@ -101413,6 +101407,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-trace-events_0_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, tasty-bench, text }: + mkDerivation { + pname = "ghc-trace-events"; + version = "0.1.2.2"; + sha256 = "18vhv99lrfjx6bxww77qxg7gwqmvpylvlrq1bji0hd6mcxxdjn69"; + libraryHaskellDepends = [ base bytestring text ]; + benchmarkHaskellDepends = [ base bytestring tasty-bench ]; + description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-extra" = callPackage ({ mkDerivation, base, containers, ghc, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat @@ -101437,26 +101444,6 @@ self: { }) {}; "ghc-typelits-knownnat" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; - version = "0.7.4"; - sha256 = "1i3kwq8i3p4i2jmmq8irycs0z3g69qy4i5smh14kbcz3pl35x71l"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_7_5" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers @@ -101474,7 +101461,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -101483,8 +101469,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.3"; - sha256 = "14lynjsmiml19wma9fk2bbhfz43wzbbyvrxp8xpch2lkh5zkfkny"; + version = "0.7.4"; + sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra integer-gmp transformers ]; @@ -101821,73 +101807,71 @@ 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_4_0" = callPackage + "ghcide_0_7_5_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, Diff - , directory, dlist, extra, filepath, fingertree, fuzzy, ghc - , ghc-boot, ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hiedb, hls-plugin-api, hp2pretty, hslogger, implicit-hie-cradle - , lens, lsp-test, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck + , containers, cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, extra, filepath + , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check + , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl + , network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unordered-containers - , utf8-string, vector, yaml + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml }: mkDerivation { pname = "ghcide"; - version = "0.7.4.0"; - sha256 = "00f2p18g6w7vf2a344fr4k0rg7spnbri76d1by7403g1daqwkar9"; + version = "0.7.5.0"; + sha256 = "157h7jliwf25yjip9hfc5lghifqgqz3ckj894fnmx7pw4jfwyc2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq Diff directory dlist extra filepath fingertree - fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths - Glob haddock-library hashable haskell-lsp haskell-lsp-types + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens mtl network-uri opentelemetry parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie - rope-utf16-splay safe safe-exceptions shake sorted-list - sqlite-simple stm syb text time transformers unix - unordered-containers utf8-string vector + implicit-hie-cradle lens lsp lsp-types mtl network-uri + opentelemetry parallel prettyprinter prettyprinter-ansi-terminal + regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake + sorted-list sqlite-simple stm syb text time transformers unix + unliftio unliftio-core unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hiedb hls-plugin-api lens lsp-test optparse-applicative - process safe-exceptions shake text unordered-containers + filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api + lens lsp lsp-test lsp-types optparse-applicative process + safe-exceptions shake text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers data-default directory extra filepath ghc ghc-typelits-knownnat haddock-library - haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test - network-uri optparse-applicative process QuickCheck - quickcheck-instances record-dot-preprocessor record-hasfield - rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text ]; + testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ aeson base directory extra filepath optparse-applicative shake shake-bench text yaml ]; - benchmarkToolDepends = [ hp2pretty ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ maralorn ]; broken = true; }) {shake-bench = null;}; @@ -102176,17 +102160,17 @@ self: { "ghcprofview" = callPackage ({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk - , haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text + , haskell-gi-base, mtl, regex-tdfa, scientific, text }: mkDerivation { pname = "ghcprofview"; - version = "0.1.0.0"; - sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a"; + version = "0.1.0.1"; + sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa - regex-tdfa-text scientific text + aeson base containers ghc-prof gi-gtk haskell-gi-base mtl + regex-tdfa scientific text ]; description = "GHC .prof files viewer"; license = lib.licenses.bsd3; @@ -102827,8 +102811,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 @@ -102848,17 +102832,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; @@ -103609,8 +103596,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" @@ -104469,6 +104456,7 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "gitlab-api" = callPackage @@ -105553,8 +105541,8 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.2"; - sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh"; + version = "0.1.0.3"; + sha256 = "0kgkzskn2k9zgihrb1v9xy5yfjlggmpj15g1bdgx7faipksaa3fb"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector @@ -108739,6 +108727,7 @@ self: { ]; description = "proxy gopher over http"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "gopherbot" = callPackage @@ -110405,27 +110394,6 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hashable, hint, hspec, semigroups - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "1.2.0.0"; - sha256 = "0rljpnq690jxqlkbp7ksx5i91r2hrmqvppp5s6sgp373sw9kzkwb"; - libraryHaskellDepends = [ - aeson base exceptions greskell-core hashable semigroups text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = lib.licenses.bsd3; - }) {}; - - "greskell_1_2_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hashable, hint, hspec, semigroups , text, transformers, unordered-containers, vector @@ -110444,31 +110412,9 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.3.5"; - sha256 = "08jpgnsnmh9zbm1pw768ik28vhl3m4jz75l8cbxb3whfgwk5vyy4"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_3_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, hspec-discover, QuickCheck , scientific, semigroups, text, unordered-containers, uuid, vector @@ -110488,7 +110434,6 @@ self: { testToolDepends = [ doctest doctest-discover hspec-discover ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -115520,8 +115465,8 @@ self: { }: mkDerivation { pname = "hanspell"; - version = "0.2.2.0"; - sha256 = "06351wg5y9840nj1ysraa78bixk25vjn64g6fnj3d0zs2qyxd6ca"; + version = "0.2.3.0"; + sha256 = "1n692i4d92g25j31v7iyp7w3135hxcdm5p18zki8mmx6x1pg244a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115796,8 +115741,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.1"; - sha256 = "1166ccqpjwr331chf7hi4n42m2frahpf93ardfjgv8x6d0p5pfss"; + version = "2.4.1.1"; + sha256 = "164pjybk054a3h3ydfakzibngpmp8a4cbzg0sip9slfb739nz25j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -116851,8 +116796,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.0"; - sha256 = "1lic3s5z3rq2m3hpf9626k8k3a8vrx267afavzvzcngkfdl3bfap"; + version = "0.5.0.1"; + sha256 = "08j3bi6a04pkkf99ghw2h7z1bdisby0d3hyqv559a1pxwpbi7k22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117059,6 +117004,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit + , integer-gmp, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.3.1.0"; + sha256 = "1i57iibad5gjk88yq1svi35mjcbgjmms7jzd28wva8f598x84qc0"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -117128,14 +117094,12 @@ self: { }) {}; "hashable-time" = callPackage - ({ mkDerivation, base, hashable, time }: + ({ mkDerivation, base, hashable, time, time-compat }: mkDerivation { pname = "hashable-time"; - version = "0.2.0.2"; - sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; - revision = "3"; - editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk"; - libraryHaskellDepends = [ base hashable time ]; + version = "0.2.1"; + sha256 = "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh"; + libraryHaskellDepends = [ base hashable time time-compat ]; description = "Hashable instances for Data.Time"; license = lib.licenses.bsd3; }) {}; @@ -118337,6 +118301,8 @@ self: { pname = "haskell-language-server"; version = "0.9.0.0"; sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; + revision = "7"; + editedCabalFile = "11dfc9887aq521ywm0m5gpmihvvkypkr3y1cfk6afg210ij6ka40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118366,6 +118332,7 @@ self: { testToolDepends = [ ghcide ]; description = "LSP server for GHC"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "haskell-lexer" = callPackage @@ -120179,14 +120146,14 @@ self: { "haskellish" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, mtl - , template-haskell + , template-haskell, text }: mkDerivation { pname = "haskellish"; - version = "0.2.3.1"; - sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0"; + version = "0.2.4.3"; + sha256 = "09hxl72ivd7dc1fcwdd5w081crc4b8yinxddxcydb9ak0dg7hj26"; libraryHaskellDepends = [ - base containers haskell-src-exts mtl template-haskell + base containers haskell-src-exts mtl template-haskell text ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; @@ -120515,26 +120482,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 @@ -120655,45 +120622,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.42.2"; - sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; + 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"; @@ -120703,25 +120671,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.42.1"; - sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; + 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"; @@ -122223,8 +122192,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 @@ -123861,6 +123830,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "heaps_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "heaps"; + version = "0.4"; + sha256 = "1zbw0qrlnhb42v04phzwmizbpwg21wnpl7p4fbr9xsasp7w9scl9"; + libraryHaskellDepends = [ base ]; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "heapsize" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-heap , hashable, hashtables, primitive, transformers @@ -127007,14 +126988,14 @@ self: { ({ 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 + , hspec-expectations, optparse-applicative, 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"; + version = "0.7.4"; + sha256 = "05ad47ll6vxi7say4f7zf13npcjpqbwb42pqs2bmxslif6rl9sdh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127023,7 +127004,9 @@ self: { filepath ghc hslogger process temporary text time transformers unix-compat unordered-containers vector yaml ]; - executableHaskellDepends = [ base directory filepath ghc ]; + executableHaskellDepends = [ + base directory filepath ghc optparse-applicative + ]; testHaskellDepends = [ base directory extra filepath ghc hspec-expectations tasty tasty-expected-failure tasty-hunit temporary text @@ -127749,23 +127732,23 @@ self: { "hinit" = callPackage ({ mkDerivation, base, Cabal, containers, directory, exceptions - , fused-effects, generic-lens, Glob, haskeline, lens, megaparsec - , mustache, optparse-applicative, parser-combinators, path, path-io + , fused-effects, Glob, haskeline, megaparsec, mustache, optics-core + , optparse-applicative, parser-combinators, path, path-io , prettyprinter, prettyprinter-ansi-terminal, process , quickcheck-text, spdx-license, string-interpolate, text, time , tomland }: mkDerivation { pname = "hinit"; - version = "0.2.0"; - sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v"; + version = "0.2.1"; + sha256 = "10lhx18g50f24l867kjqgb2qpky3vvx7w7s4sc3pidr3hc0ams3g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base Cabal containers directory exceptions fused-effects - generic-lens Glob haskeline lens megaparsec mustache - optparse-applicative parser-combinators path path-io prettyprinter + base Cabal containers directory exceptions fused-effects Glob + haskeline megaparsec mustache optics-core optparse-applicative + parser-combinators path path-io prettyprinter prettyprinter-ansi-terminal process spdx-license string-interpolate text time tomland ]; @@ -127775,8 +127758,7 @@ self: { ]; description = "Generic project initialization tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ poscat ]; }) {}; "hinotify_0_3_9" = callPackage @@ -128620,8 +128602,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\""; @@ -129270,7 +129252,6 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hlint-test" = callPackage @@ -129481,18 +129462,17 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-explicit-imports-plugin_0_1_0_1" = callPackage + "hls-explicit-imports-plugin_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , haskell-lsp-types, hls-plugin-api, shake, text - , unordered-containers + , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "0.1.0.1"; - sha256 = "0n36yk21wh9wklp8bnrg4b6qck2nf34m8p3fpilwpnzfchk6wr1y"; + version = "0.1.0.2"; + sha256 = "0cfkb7ph6ryakybjxmyf6cc615p57wzv6ys2zy4fak1iib8bzwyx"; libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers + aeson base containers deepseq ghc ghcide hls-plugin-api lsp + lsp-types shake text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -129554,6 +129534,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-plugin-api_0_7_1_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 + , unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.7.1.0"; + sha256 = "036lrij56fzd3rbrxrxpvmq2ng0yp4qrnrl8k6g60p5sf9abqzc2"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hslogger lens lsp opentelemetry process regex-tdfa + shake text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types @@ -129573,6 +129573,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-retrie-plugin_0_1_1_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie + , safe-exceptions, shake, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-retrie-plugin"; + version = "0.1.1.1"; + sha256 = "1k85wgnd5f1jqjd09y9gacc5w8kypy84qaly32411xsw4hfsil8a"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra ghc ghcide hashable + hls-plugin-api lsp lsp-types retrie safe-exceptions shake text + transformers unordered-containers + ]; + description = "Retrie integration plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie @@ -130368,6 +130387,8 @@ self: { pname = "hnix"; version = "0.12.0.1"; sha256 = "013jlmzzr5fcvl0w9rrvhsg8jikg0hbc8z57yzxgz109x7hrnjzc"; + revision = "1"; + editedCabalFile = "136lwfb5hjwdbfik5c5dw1nhsmy8v410czmjn4i242s8jv5wm9yb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -130406,34 +130427,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 @@ -130460,7 +130453,6 @@ self: { ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hnix-store-remote" = callPackage @@ -132296,8 +132288,8 @@ self: { }: mkDerivation { pname = "hp2pretty"; - version = "0.9"; - sha256 = "0libwl8kl6yhingvbrmw1b8l5yiq6wn07asvkwbnh9l6mnh8pz2n"; + version = "0.10"; + sha256 = "1irm8mvcib39r8imdx7y7jisp162i0rwk8w3irs2j746c8vhyv12"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -134192,6 +134184,18 @@ self: { broken = true; }) {}; + "hs-swisstable-hashtables-class" = callPackage + ({ mkDerivation, base, hashtables, swisstable }: + mkDerivation { + pname = "hs-swisstable-hashtables-class"; + version = "0.1.0.0"; + sha256 = "15zc24ai13x11ksyhsrs05v9vh93mdlmx9p3rg3lkllqjqy6b35m"; + libraryHaskellDepends = [ base hashtables swisstable ]; + testHaskellDepends = [ base hashtables swisstable ]; + description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; + license = lib.licenses.bsd3; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -134699,6 +134703,8 @@ self: { pname = "hsc2hs"; version = "0.68.7"; sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; + revision = "1"; + editedCabalFile = "0nzmlx0kdsq5231m6dbvdb5zssj1h4lkqplp8rb28z3yl5h6h3sa"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -135977,8 +135983,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "1"; - editedCabalFile = "1g58f8lxcrmv4wh0k48car5lcl5j0k9lwfq5nfkjj9f5gim5yrc8"; + revision = "2"; + editedCabalFile = "1bkv1rbbx0bhyvrmnsyspm30q48820a6rym0msxjdzp8r56rbm9w"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -136651,8 +136657,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 @@ -136992,20 +136998,6 @@ self: { }) {}; "hspec-need-env" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-expectations - , setenv, transformers - }: - mkDerivation { - pname = "hspec-need-env"; - version = "0.1.0.5"; - sha256 = "0bgjhzc4m24sbmfyczq1r61gbgm5i1lsgyql88ki4flllscg4hsh"; - libraryHaskellDepends = [ base hspec-core hspec-expectations ]; - testHaskellDepends = [ base hspec hspec-core setenv transformers ]; - description = "Read environment variables for hspec tests"; - license = lib.licenses.bsd3; - }) {}; - - "hspec-need-env_0_1_0_6" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , hspec-expectations, setenv, transformers }: @@ -137018,7 +137010,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Read environment variables for hspec tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-parsec" = callPackage @@ -138807,10 +138798,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 @@ -138981,6 +138970,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 @@ -139037,7 +139028,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 @@ -139046,8 +139037,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 @@ -139348,8 +139339,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 @@ -139419,8 +139410,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 @@ -140092,6 +140083,8 @@ self: { pname = "http2"; version = "2.0.5"; sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676"; + revision = "1"; + editedCabalFile = "0xxi7gcldh3fvnh98khw9f2vm5w85sakbb6165s779nkvq7p8ak2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140112,6 +140105,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_2_0_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.6"; + sha256 = "17m1avrppiz8i6qwjlgg77ha88sx8f8vvfa57z369aszhld6nx9a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -141123,6 +141148,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 @@ -141168,6 +141211,8 @@ self: { pname = "hw-bits"; version = "0.7.2.1"; sha256 = "18l9r0yhddkzgbc2vvk0qr9brb5ih25zjfga3bddb5j8gpaaq65q"; + revision = "1"; + editedCabalFile = "14y67p3rsj97rzlh2cw7iy04gb6cfa977bjbr35vgkav0skbigbn"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -141857,6 +141902,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 @@ -141955,6 +142015,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.4.1"; sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h"; + revision = "1"; + editedCabalFile = "0flhrgqgwgxwk6ik3k7322dn8ybyjzh6g1csg2d9bafldj7akcwv"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -143237,26 +143299,19 @@ 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, approximate, base, binary, bits, bytes, cereal + , cereal-vector, comonad, deepseq, distributive, hashable, lens + , reflection, semigroupoids, semigroups, siphash, tagged, vector }: mkDerivation { pname = "hyperloglog"; - version = "0.4.3"; - sha256 = "0r1zrhl81hm0sb9my32xyng0xdl2yzh1pdw2bqabzccrhyjk1fwd"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.4.4"; + sha256 = "0iwjxv934vid7bzaxyqq4v7r52vdcqjxmw043dmxykwyzim59l3v"; 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; }) {}; @@ -143308,23 +143363,17 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers - , doctest, text, unordered-containers, zlib + ({ mkDerivation, base, bytestring, containers, text + , unordered-containers, zlib }: mkDerivation { pname = "hyphenation"; - version = "0.8"; - sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; - revision = "3"; - editedCabalFile = "0krjvrk5hzcs101b5h95ai51wwq1fj04q1ryn63j1qmj22jpn4ki"; + version = "0.8.1"; + sha256 = "0pzm9sfn1bw7yvwhby9a6d9z2ghcn91rcbj08x380gff31kn8lbx"; 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; }) {}; @@ -143674,6 +143723,24 @@ self: { broken = true; }) {}; + "ice40-prim" = callPackage + ({ mkDerivation, base, Cabal, clash-prelude, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, interpolate + }: + mkDerivation { + pname = "ice40-prim"; + version = "0.1.0.0"; + sha256 = "00l0kwwayf0bark2yqjrx8imr8997d5mrnhjf3zsayxk9a521j99"; + libraryHaskellDepends = [ + base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise interpolate + ]; + description = "Lattice iCE40 Primitive IP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "icepeak" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, hashable, hspec, hspec-core, hspec-expectations @@ -144148,8 +144215,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -146293,8 +146358,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 ]; @@ -146307,7 +146372,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; }) {}; @@ -146663,19 +146728,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 @@ -146722,8 +146787,8 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.2.4"; - sha256 = "11nz8j56l3h7sn927mcsms9af9rpqkmxc0c0vf9mln567wpb75h3"; + version = "0.4.3.0"; + sha256 = "1pba3br5vd11svk9fpg5s977q55qlvhlf95nd5ay79bwdjm10hj3"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -147288,10 +147353,8 @@ self: { }: mkDerivation { pname = "intern"; - version = "0.9.3"; - sha256 = "1pbk804kq5p25ixrihhpfgy0fwj8i6cybxlhk42krzni7ad7gx4k"; - revision = "1"; - editedCabalFile = "1cjlmvg55nn9fd1f0jfmgy1rjys7gna3x3qknnpcmndq6vzg1mrl"; + version = "0.9.4"; + sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -147614,21 +147677,13 @@ self: { }) {}; "intervals" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-doctest, directory - , distributive, doctest, filepath, ghc-prim, QuickCheck - , template-haskell - }: + ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: mkDerivation { pname = "intervals"; - version = "0.9.1"; - sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z"; - revision = "2"; - editedCabalFile = "1nrpc95wwifnlk7p9nw6xgcc74zw1k6krhvll7rr18ddjgfgv07x"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.9.2"; + sha256 = "1qibvgys8lw61x9na3iy3dcglyj9qyhcbfc00glnagl7cbk1shlv"; libraryHaskellDepends = [ array base distributive ghc-prim ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; + testHaskellDepends = [ base QuickCheck ]; description = "Interval Arithmetic"; license = lib.licenses.bsd3; }) {}; @@ -147818,6 +147873,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.0"; + sha256 = "0nflfrs9qb2bfkpi07r2a5k6lkyyspvfqz18pfvqa2rkpfcqw9bd"; + 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 @@ -147847,6 +147928,8 @@ self: { pname = "invertible"; version = "0.2.0.7"; sha256 = "1ngcmy59cyrg5idcn8a4gxg6ipq88rhhwhdb09gra8jcraq9n7ii"; + revision = "1"; + editedCabalFile = "19xcczz26ji5xaws4ikvacqz991qgislj32hs8rlks07qw3qmnbn"; libraryHaskellDepends = [ base haskell-src-meta invariant lens partial-isomorphisms semigroupoids template-haskell transformers @@ -150691,8 +150774,8 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.2"; - sha256 = "16vcy9gn6qrzvr99l26az4yi2dy9xngcb1wmj86yl7bmk1hcq3wc"; + version = "1.3.3"; + sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -153142,8 +153225,8 @@ self: { }: mkDerivation { pname = "kan-extensions"; - version = "5.2.1"; - sha256 = "114zs8j81ich4178qvvlnpch09dvbv1mm1g7xf2g78f77gh9ia7a"; + version = "5.2.2"; + sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -154691,8 +154774,6 @@ self: { testHaskellDepends = [ base stm ]; description = "A lightweight, structured-concurrency library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kibro" = callPackage @@ -155233,10 +155314,8 @@ self: { }: mkDerivation { pname = "kqueue"; - version = "0.2"; - sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h"; - revision = "3"; - editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7"; + version = "0.2.1"; + sha256 = "0svrswcglipmm47lnqi41hcsn1gvkcniva6qajwqxrdr0wvvhgdi"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; description = "A binding to the kqueue event library"; @@ -157079,8 +157158,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "9.1.2"; - sha256 = "014rb5jf650fhsmc02v4xc60w7v1261ri1w9ig6dw0xjdgxalvbs"; + version = "9.1.3"; + sha256 = "00nr8fb981rkjzy2xhppvg9avsi377ww28d50rldm5wh7ax9s3w2"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -158446,8 +158525,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 @@ -158784,8 +158863,8 @@ self: { ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }: mkDerivation { pname = "lazy-priority-queue"; - version = "0.1.0.1"; - sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v"; + version = "0.1.1"; + sha256 = "1b853cqc1wybwmnywh9jhcv382v43mfyqxskffizp1m10gii9ss5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -158793,7 +158872,7 @@ self: { testHaskellDepends = [ base doctest lens ]; testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; - license = lib.licenses.bsd3; + license = lib.licenses.gpl3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158912,14 +158991,12 @@ self: { }) {}; "lca" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: + ({ mkDerivation, base }: mkDerivation { pname = "lca"; - version = "0.3.1"; - sha256 = "0kj3zsmzckczp51w70x1aqayk2fay4vcqwz8j6sdv0hdw1d093ca"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.4"; + sha256 = "0miji532qc725vprhnc5p3k4i6515i1fn1g0f7hm0gmq0hvvh51f"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; description = "O(log n) persistent online lowest common ancestor search without preprocessing"; license = lib.licenses.bsd3; }) {}; @@ -159577,6 +159654,45 @@ self: { license = lib.licenses.bsd2; }) {}; + "lens_5_0_1" = callPackage + ({ mkDerivation, array, assoc, base, base-compat, base-orphans + , bifunctors, bytestring, call-stack, comonad, containers + , contravariant, criterion, deepseq, distributive, exceptions + , filepath, free, generic-deriving, ghc-prim, hashable, HUnit + , indexed-traversable, indexed-traversable-instances + , kan-extensions, mtl, parallel, profunctors, QuickCheck + , reflection, semigroupoids, simple-reflect, strict, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-abstraction, these + , transformers, transformers-compat, unordered-containers, vector + }: + mkDerivation { + pname = "lens"; + version = "5.0.1"; + sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c"; + libraryHaskellDepends = [ + array assoc base base-orphans bifunctors bytestring call-stack + comonad containers contravariant distributive exceptions filepath + free ghc-prim hashable indexed-traversable + indexed-traversable-instances kan-extensions mtl parallel + profunctors reflection semigroupoids strict tagged template-haskell + text th-abstraction these transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + base containers deepseq HUnit mtl QuickCheck simple-reflect + test-framework test-framework-hunit test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base base-compat bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + description = "Lenses, Folds and Traversals"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -159589,43 +159705,33 @@ self: { }) {}; "lens-action" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant - , directory, doctest, filepath, lens, mtl, profunctors - , semigroupoids, semigroups, transformers + ({ mkDerivation, base, comonad, contravariant, lens, mtl + , profunctors, semigroupoids, transformers }: mkDerivation { pname = "lens-action"; - version = "0.2.4"; - sha256 = "06yg4ds0d4cfs3zl1fhc8865i5w6pwqhx9bxngfa8f9974mdiid3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.2.5"; + sha256 = "02sv76far3y57p2pgcjsx5ffaai8rm4669qkp82l06vv964f0v2r"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids - semigroups transformers + transformers ]; - testHaskellDepends = [ base directory doctest filepath ]; description = "Monadic Getters and Folds"; license = lib.licenses.bsd3; }) {}; "lens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, doctest, generic-deriving, lens, scientific - , semigroups, simple-reflect, text, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, lens + , scientific, text, unordered-containers, vector }: mkDerivation { pname = "lens-aeson"; - version = "1.1"; - sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; - revision = "4"; - editedCabalFile = "1wgk0nd0fxgdbqb6mkslj3gyrs9vdxpb83hvj2n2dcswg3ahwdsy"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "1.1.1"; + sha256 = "1g37c8p25by3hvy5lmq4rqyl9wxmxmci2h16rj4i5jcp7slf3mvg"; 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; }) {}; @@ -159836,8 +159942,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "4"; - editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7"; + revision = "5"; + editedCabalFile = "0zv5r50xz8msrcwrvqym88pwihqcpmlk3vi493jdhik4n70cs0c6"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = lib.licenses.bsd3; @@ -159849,8 +159955,8 @@ self: { }: mkDerivation { pname = "lens-regex"; - version = "0.1.1"; - sha256 = "0c673v6k6y7dng6qmi4jbh3jlx803mg5g1911bz54r785fm6p50d"; + version = "0.1.3"; + sha256 = "11zgdk46skj3g0436vilcgg4wvclixh07xjwqfcsfhffn0vn3mz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160475,8 +160581,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.6"; - sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw"; + version = "0.6.2"; + sha256 = "00axpwgwzqchma89fdp1dxk97palvgv4j1ag8dq1w4gl9yh5q0vx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq hashable ]; @@ -161365,8 +161471,8 @@ self: { ({ mkDerivation, base, bytestring, libtelnet }: mkDerivation { pname = "libtelnet"; - version = "0.1.0.0"; - sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; + version = "0.1.0.1"; + sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -161379,8 +161485,8 @@ self: { ({ mkDerivation, base, bytestring, libversion }: mkDerivation { pname = "libversion"; - version = "0.1.0"; - sha256 = "0w5maaklglbxp7k0ah699w1mhjsjrpgw9n7axld319dpfdwhl94j"; + version = "0.1.1"; + sha256 = "0zxkwiacaznf30wgywmawmqrpvi4r1wwfh6pys82jgr0v8yla4v8"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libversion ]; description = "Haskell binding to libversion"; @@ -161659,6 +161765,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "lifted-async_0_10_1_3" = callPackage + ({ 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.3"; + sha256 = "1hml672j8sqxhklxif3nwr8v59a596wwwbllq0zvvmlxcjdzlh7k"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -162140,20 +162268,21 @@ 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 + , hashable, HUnit, indexed-traversable, 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"; + version = "1.21.5"; + sha256 = "19pvz467wd8gss95qfi90xnd5fwm6dpdppr21g5n30x4m7niymn3"; 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 + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids semigroups tagged template-haskell + transformers transformers-compat unordered-containers vector void ]; testHaskellDepends = [ base binary bytestring deepseq HUnit reflection simple-reflect @@ -162751,6 +162880,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 { @@ -164858,24 +164998,17 @@ 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, base, binary, bytes, cereal, comonad, deepseq + , distributive, hashable, semigroupoids, semigroups, vector }: mkDerivation { pname = "log-domain"; - version = "0.13"; - sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; - revision = "3"; - editedCabalFile = "10ajmxkjbbkdrkasgfd5hhjcbggrylrg00m1lafac53v97hqpyp1"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.13.1"; + sha256 = "0ipiiflzs1r7wm5k8b9cqn4l09rjdyks3pxnm4p3kmncd5s2ajsv"; 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; }) {}; @@ -165951,18 +166084,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 @@ -166236,8 +166369,8 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.0.0.1"; - sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1"; + version = "1.1.1.0"; + sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166311,27 +166444,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "lsp-test_0_12_0_0" = callPackage + "lsp-test_0_13_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix + , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl + , parser-combinators, process, some, text, time, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.12.0.0"; - sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd"; + version = "0.13.0.0"; + sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath Glob - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default directory filepath haskell-lsp hspec lens + aeson base data-default directory filepath hspec lens lsp-types text unordered-containers ]; description = "Functional test framework for LSP servers"; @@ -166341,20 +166474,20 @@ self: { "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum-template, directory - , filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay - , scientific, some, template-haskell, temporary, text - , unordered-containers + , data-default, deepseq, dependent-sum, dependent-sum-template + , directory, filepath, hashable, hslogger, lens, network-uri + , rope-utf16-splay, scientific, some, template-haskell, temporary + , text, unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.0.0.1"; - sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27"; + version = "1.1.0.0"; + sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq - dependent-sum-template directory filepath hashable hslogger lens - network-uri rope-utf16-splay scientific some template-haskell - temporary text unordered-containers + dependent-sum dependent-sum-template directory filepath hashable + hslogger lens network-uri rope-utf16-splay scientific some + template-haskell temporary text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; @@ -166504,6 +166637,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "lua" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit }: + mkDerivation { + pname = "lua"; + version = "1.0.0"; + sha256 = "0ly10sy9xlvalaximff287wd6hr3hxqicsx5alwpqbg9ajxlx798"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "Lua, an embeddable scripting language"; + license = lib.licenses.mit; + }) {}; + "lua-bc" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, pretty, text, vector @@ -166778,6 +166923,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 @@ -167421,24 +167568,20 @@ 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, adjunctions, base, comonad, conduit, containers + , criterion, distributive, 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 ]; + version = "0.7.2"; + sha256 = "0pgsa67j9l1zmazlqdb5wg3cqsikyfvkq8yih7iwcqzkys5qssvr"; 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 ]; @@ -167828,8 +167971,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.3.3"; - sha256 = "1wsm7y05k8byxizkmkyl7bciyz6f3jwxiwqc0gvsqi31kkqajxqn"; + version = "0.3.4"; + sha256 = "1i9010zp1w34kfgx5xgd23hjmb0v8h3y3riiw2ripvjxqgikbky4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171302,8 +171445,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 @@ -172117,8 +172260,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 ]; @@ -172799,6 +172942,8 @@ self: { pname = "microstache"; version = "1.0.1.2"; sha256 = "1xdca11z5cy7vfy2dszhr6qvlrxw6pn0d9iri7mg56lvi02javik"; + revision = "1"; + editedCabalFile = "1l72cfbrr6kxh0z2dx2pghxl7ljlbmbk8s9wlgk35bjm925kkxfl"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -173289,8 +173434,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 @@ -173728,8 +173873,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; @@ -174480,10 +174625,8 @@ self: { ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; - version = "1.1.4"; - sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz"; - revision = "1"; - editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl"; + version = "1.1.5"; + sha256 = "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -174620,20 +174763,20 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn7ukr - , process, vector + ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 + , mmsyn7ukr-common, process }: mkDerivation { pname = "mmsyn7l"; - version = "0.8.0.0"; - sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd"; + version = "0.9.0.0"; + sha256 = "0j8xi8jxak818sw310srxljrywggsa8ss1l4yw0razsa28h92nxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn7ukr process vector + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; executableHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn7ukr process vector + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = lib.licenses.mit; @@ -174853,6 +174996,8 @@ self: { pname = "mod"; version = "0.1.2.1"; sha256 = "0fjcjk9jxwc2d1fm3kzamh9gi3lwnl2g6kz3z2hd43dszkay1mn1"; + revision = "1"; + editedCabalFile = "012slncmwh9i4fh31mdxn5xnpl9l309swrm5vlnibrxj3pxhmrxv"; libraryHaskellDepends = [ base deepseq integer-gmp primitive semirings vector ]; @@ -174923,8 +175068,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 @@ -175390,6 +175535,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 @@ -177518,37 +177665,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; @@ -177649,6 +177804,60 @@ 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; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -177694,6 +177903,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 @@ -177719,6 +177952,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 @@ -177742,6 +178001,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 { @@ -179190,8 +179474,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.5.0.0"; - sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr"; + version = "0.5.0.1"; + sha256 = "0r5kbi378iwg5b578dydvv4smy2xqn4y33h015fp5nyphxz83173"; libraryHaskellDepends = [ aeson base conduit http-types mtl mu-schema sop-core template-haskell text wai @@ -180853,6 +181137,8 @@ self: { pname = "mwc-random"; version = "0.15.0.1"; sha256 = "1p8c5g4hb72k90ai39rgpn6cr942i6636l1y0zfp9xgjb3v0a2q3"; + revision = "1"; + editedCabalFile = "1ay26mvzxqw6rzw3hkib1j12gk6fa2hsilz12q8vhp646bqqc744"; libraryHaskellDepends = [ base math-functions primitive random time vector ]; @@ -182877,8 +183163,6 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-lens" = callPackage @@ -182895,8 +183179,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-rpc" = callPackage @@ -182918,8 +183200,6 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-spider" = callPackage @@ -183748,6 +184028,8 @@ self: { pname = "network-byte-order"; version = "0.1.6"; sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; + revision = "1"; + editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; @@ -184528,8 +184810,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-types-icmp"; - version = "1.0.0.1"; - sha256 = "1j2z51jvrhh9nlnx9sfiabgascyp80ha1906hdm2d4w8xyrp7d1c"; + version = "1.0.1"; + sha256 = "0wf2rg4alw4alalvjdcd85k6sjhcpdqacblbn76r5kmy2pqfrqfs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Types for representing ICMP and ICMPv6 messages"; @@ -185184,8 +185466,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 @@ -185675,21 +185959,26 @@ self: { }) {}; "nix-tree" = callPackage - ({ mkDerivation, aeson, async, base, brick, bytestring, containers - , deepseq, directory, filepath, hashable, hrfsize, lens, parallel + ({ mkDerivation, aeson, base, brick, bytestring, 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.4"; + sha256 = "1hbb4p6yz8c7c49yxqvzmiq9knpsm958pk9vbj12jii3ihdf0pl6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base brick bytestring containers deepseq directory - filepath hashable hrfsize lens parallel protolude text transformers - typed-process unordered-containers vty + aeson base brick bytestring containers deepseq directory filepath + hashable hrfsize protolude text transformers typed-process + unordered-containers vty + ]; + testHaskellDepends = [ + aeson base brick bytestring containers deepseq directory filepath + hashable hedgehog hrfsize protolude text transformers typed-process + unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; license = lib.licenses.bsd3; @@ -186903,8 +187192,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 ]; @@ -186913,24 +187202,26 @@ self: { }) {}; "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 + ({ 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.3.0.0"; - sha256 = "1dijid038rvviz063ncviq1mw20hsk02gidcf68vzy99d16kn5c9"; + version = "0.4.0.0"; + sha256 = "032j7wy9wjjv0pbn1g16vdj15j03brkkwa3ssjv7g0v61hjaq4z7"; 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 + 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 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 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 ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; @@ -189004,6 +189295,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 { @@ -189530,6 +189839,8 @@ self: { pname = "openapi3"; version = "3.0.1.0"; sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc"; + revision = "1"; + editedCabalFile = "017mikhl12iyrgn40mmis3m05bfjxmg9y09nsk7i8xfjzkqcnly0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -190615,6 +190926,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 @@ -190630,6 +190970,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 @@ -190639,6 +190996,8 @@ self: { pname = "optics-extra"; version = "0.3"; sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4"; + revision = "2"; + editedCabalFile = "13x3mavf2bi25ns03b93b5ghhkyivwxf6idn0wqs9fdiih1xvhv8"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors mtl optics-core text transformers unordered-containers vector @@ -190647,6 +191006,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 @@ -190666,6 +191044,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 @@ -190674,6 +191070,8 @@ self: { pname = "optics-vl"; version = "0.2.1"; sha256 = "1xrkak0cn2imgqr641wzysgynykyj438m3ywgdm9h14k17inv55v"; + revision = "1"; + editedCabalFile = "0ba6fk4djs3gm305km8c870h76mg8q1dyy899cll0scc6l9jgbyc"; libraryHaskellDepends = [ base indexed-profunctors optics-core profunctors ]; @@ -193111,8 +193509,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; }) {}; @@ -193878,8 +194276,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "2"; - editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6"; + revision = "3"; + editedCabalFile = "1lv3y3zrdfc09nsiqxg7mzcahgnqi6z9caspd4lvifhhfrqy2722"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -195507,6 +195905,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "patrol" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, http-client, http-types, network-uri, text, time + , uuid + }: + mkDerivation { + pname = "patrol"; + version = "0.0.1"; + sha256 = "08rxyx01mamvc3mfyzyqajfj7239sklz30fw4z8rvi2jrgisbpy7"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-types network-uri text time uuid + ]; + description = "Sentry SDK"; + license = lib.licenses.isc; + }) {}; + "patronscraper" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt }: mkDerivation { @@ -196863,8 +197278,8 @@ self: { pname = "perfect-vector-shuffle"; version = "0.1.1.1"; sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "4"; - editedCabalFile = "14q0773vxmkh4nwskiq85ch175jq12xms2lypaddglciykqs6ml6"; + revision = "5"; + editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198714,8 +199129,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.1.0.0"; - sha256 = "0fd2pslmgm5bvv0yiza87vp61601pl1c69xa5snbgrnb2mlp6f98"; + version = "0.2.0.0"; + sha256 = "1382i77ci70ax7lvbkqqvg1wr2pp5irl8wxvypngr15czqgj7sca"; libraryHaskellDepends = [ base phonetic-languages-permutations-array subG ]; @@ -199693,29 +200108,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.14"; - sha256 = "11r8cqy98w1y0avgn53x1fzqxpdfg7wvwwkfppnk9yip0lkcp3yv"; - libraryHaskellDepends = [ - base exceptions mmorph mtl transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = lib.licenses.bsd3; - }) {}; - - "pipes_4_3_15" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, test-framework , test-framework-quickcheck2, transformers, void @@ -199736,7 +200128,6 @@ self: { ]; description = "Compositional pipelines"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -199896,8 +200287,8 @@ self: { }: mkDerivation { pname = "pipes-bytestring"; - version = "2.1.6"; - sha256 = "061wcb48mdq694zhwb5xh423ss6f7cccxahc05cifrzkh033gp5i"; + version = "2.1.7"; + sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; libraryHaskellDepends = [ base bytestring pipes pipes-group pipes-parse stringsearch transformers @@ -200190,8 +200581,8 @@ self: { pname = "pipes-extras"; version = "1.0.15"; sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; - revision = "2"; - editedCabalFile = "1aprq51r83v5qja9vy01s8d17bnncnvp1mw6h6maxgzh2xppim8b"; + revision = "3"; + editedCabalFile = "177l1fs1wgm34ifbx83xxf29m0ghq6z9skpkwm86qfln2hpikkj9"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -200516,6 +200907,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-ordered-zip_1_2_1" = callPackage + ({ mkDerivation, base, foldl, hspec, pipes, pipes-safe }: + mkDerivation { + pname = "pipes-ordered-zip"; + 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"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-p2p" = callPackage ({ mkDerivation, async, base, binary, bytestring, errors , exceptions, mtl, network, network-simple-sockaddr, pipes @@ -200559,8 +200963,8 @@ self: { ({ mkDerivation, base, pipes, transformers }: mkDerivation { pname = "pipes-parse"; - version = "3.0.8"; - sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj"; + version = "3.0.9"; + sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3"; libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = lib.licenses.bsd3; @@ -200664,8 +201068,8 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.3.2"; - sha256 = "10m6f52nahxwnl2zvgnbilllcvd3lpi0dxl3j6fk20lryjzmhyqc"; + version = "2.3.3"; + sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -200934,6 +201338,23 @@ self: { broken = true; }) {}; + "pixel-printer" = callPackage + ({ mkDerivation, base, JuicyPixels, lens, optparse-applicative }: + mkDerivation { + pname = "pixel-printer"; + version = "0.1.1"; + sha256 = "179r8715rmd7njan4jl0g3jy0w0xq420nmkw9arvp50my8ag610f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base JuicyPixels lens ]; + executableHaskellDepends = [ + base JuicyPixels optparse-applicative + ]; + testHaskellDepends = [ base ]; + description = "A program for turning pixel art into 3D prints"; + license = lib.licenses.gpl3; + }) {}; + "pixela" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , http-client, http-client-tls, http-types, split, text, time @@ -201746,8 +202167,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.6.1"; - sha256 = "004mfq0d10s26sgk12zrhgmxcfxnhvdyajr48scxf5rh1fv9440i"; + version = "1.6.2"; + sha256 = "1lgk25chpl6albf8pzq8q40di02rgv7g3bsf586a5pl2kdh2p2qq"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random split @@ -202561,8 +202982,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"; @@ -202783,8 +203204,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 ]; @@ -204170,6 +204591,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 ]; @@ -204391,6 +204814,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 @@ -206026,14 +206451,31 @@ self: { }: mkDerivation { pname = "pretty-diff"; - version = "0.2.0.3"; - sha256 = "1pnq05zw7zyfikga8y27pkya4wrf0m3mrksmzi8l7jp9qdhkyia1"; + version = "0.4.0.2"; + sha256 = "0wa70is5pmad4f0spj5hmi56y290k1xizs4zwlrgry65r8c1qgns"; + 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; + }) {}; + + "pretty-diff_0_4_0_3" = callPackage + ({ mkDerivation, base, data-default, Diff, tasty, tasty-hunit + , tasty-test-reporter, text + }: + mkDerivation { + pname = "pretty-diff"; + 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 ]; description = "Pretty printing a diff of two values"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "pretty-display" = callPackage @@ -206721,8 +207163,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.8"; - sha256 = "0g3b7b842wbdh7hqr6ikvycdwk1n3in9dq5yb09g744ydpmvg24r"; + version = "0.10.1"; + sha256 = "0ddnn94qqkx021marpi2j03sil15422scq0df6dmlc6q0qyyivyc"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -207757,14 +208199,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "profunctors_5_6_1" = callPackage + "profunctors_5_6_2" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.6.1"; - sha256 = "1b2fgnhl3j790rra615q6y9xx97lip0smfg1c13ad1brvyjygps6"; + version = "5.6.2"; + sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -209445,8 +209887,8 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.1.3"; - sha256 = "1qrcsci4jccx4l1zlpqr202jl2dhpmcbbq94gfgdax80q8js3yrq"; + version = "0.1.1.4"; + sha256 = "1g9b3dixrgi1k8vg85mgdpnph1dz02xggwp61naak6j392kg6rkf"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; @@ -209752,6 +210194,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {inherit (pkgs) libpulseaudio;}; "pulseaudio" = callPackage @@ -211228,10 +211671,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 @@ -211735,6 +212176,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.25.2"; sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h"; + revision = "1"; + editedCabalFile = "0pmsq83jzf7gxr59h8j85121n6n0iqbl3smccl9v7n3gkp70kr2q"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -213373,8 +213816,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "4"; - editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk"; + revision = "5"; + editedCabalFile = "1jai1pcs39ijdhxc8q36x1yayr8rsblhx3y88paf4bqxrks2vmrh"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -213430,8 +213873,8 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.3.2"; - sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw"; + version = "0.1.4"; + sha256 = "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j"; libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; benchmarkHaskellDepends = [ async base bytestring criterion cryptonite entropy ghc-prim @@ -213809,6 +214252,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 { @@ -214639,25 +215095,20 @@ 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, atomic-primops, base, containers, criterion + , deepseq, fail, ghc-prim, optparse-applicative, parallel + , primitive, rdtsc, time, transformers }: mkDerivation { pname = "rcu"; - version = "0.2.4"; - sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; - revision = "2"; - editedCabalFile = "1lblpsgprk26nplfzxkclvj6gsaim1b97njvrq564crryn6hn2wz"; + version = "0.2.5"; + sha256 = "1p2cg6xy5cjdizqialv9y8qylwdri5fhby2xh04fnhpjapsrbc7l"; 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 @@ -215476,8 +215927,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 @@ -215510,8 +215961,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 @@ -215695,8 +216146,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.7"; - sha256 = "1ma1rc962z2qr7xwxh03bkbcmn9dsqizrjv699wbc82fzfzn5hrr"; + version = "0.2.8"; + sha256 = "0ln7kw1f0l56ivzh77s1k1xa3nha3a4hs3bpmdi9apj21ffr5cb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -215887,8 +216338,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 @@ -217526,10 +217977,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 ]; @@ -217541,12 +217990,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; }) {}; @@ -217727,8 +218174,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 ]; @@ -217794,8 +218241,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 ]; @@ -217842,8 +218289,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 ]; @@ -217913,8 +218360,6 @@ 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 @@ -221117,8 +221562,8 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.4.2"; - sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2"; + version = "0.4.3"; + sha256 = "13brargymd1c9b0csaprj85qdqg98bzj3z2smbb0v66myj48v6fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -221145,6 +221590,7 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "rhine-gloss" = callPackage @@ -221159,6 +221605,7 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "rhythm-game-tutorial" = callPackage @@ -221645,6 +222092,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "rio-process-pool" = callPackage + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , data-default, hashable, HUnit, mtl, QuickCheck, rio, tasty + , tasty-html, tasty-hunit, tasty-quickcheck, text, unliftio + , unliftio-messagebox + }: + mkDerivation { + pname = "rio-process-pool"; + version = "1.0.0"; + sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base containers data-default hashable mtl QuickCheck rio text + unliftio unliftio-messagebox + ]; + executableHaskellDepends = [ + async base containers data-default hashable mtl QuickCheck rio text + unliftio unliftio-messagebox + ]; + testHaskellDepends = [ + async atomic-primops base containers data-default hashable HUnit + mtl QuickCheck rio tasty tasty-html tasty-hunit tasty-quickcheck + text unliftio unliftio-messagebox + ]; + benchmarkHaskellDepends = [ + async base containers criterion data-default hashable mtl + QuickCheck rio text unliftio unliftio-messagebox + ]; + description = "A library for process pools coupled with asynchronous message queues"; + license = lib.licenses.bsd2; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -224393,8 +224873,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 @@ -224667,8 +225147,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 @@ -225392,16 +225872,16 @@ self: { , containers, crackNum, deepseq, directory, doctest, filepath , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, time, transformers, uniplate, z3 + , template-haskell, text, time, transformers, uniplate, z3 }: mkDerivation { pname = "sbv"; - version = "8.9"; - sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51"; + version = "8.10"; + sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath mtl - pretty process QuickCheck random syb template-haskell time + pretty process QuickCheck random syb template-haskell text time transformers uniplate ]; testHaskellDepends = [ @@ -225412,7 +225892,7 @@ self: { testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ base bench-show containers crackNum deepseq directory filepath - gauge mtl process random silently syb time + gauge mtl process random silently syb text time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; @@ -226259,8 +226739,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 ]; @@ -227255,16 +227735,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"; @@ -227283,6 +227764,149 @@ self: { license = lib.licenses.bsd2; }) {}; + "sdp" = callPackage + ({ mkDerivation, base, data-default-class, ghc-prim }: + mkDerivation { + pname = "sdp"; + version = "0.2"; + sha256 = "1q9l87rvvx7bqbqx1675r2mvj3b2jf0ywa55xcv2ybsl621z52y0"; + libraryHaskellDepends = [ base data-default-class ghc-prim ]; + description = "Simple Data Processing"; + 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 { + pname = "sdp-deepseq"; + version = "0.2"; + sha256 = "127vzi2a65j5czipgybdhfxfzfzx3r0hrrag1nha40vdgsd3j7w4"; + libraryHaskellDepends = [ base deepseq sdp ]; + description = "DeepSeq SDP extension"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-hashable" = callPackage + ({ mkDerivation, base, hashable, sdp }: + mkDerivation { + pname = "sdp-hashable"; + version = "0.2"; + sha256 = "0cl9a10ww93n64sq4mnc3m56y4add04s06gi8n9rmad93v3xfk3j"; + libraryHaskellDepends = [ base hashable sdp ]; + description = "Hashable instances for SDP"; + 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 + }: + mkDerivation { + pname = "sdp-quickcheck"; + version = "0.2"; + sha256 = "1gmsn5vw8a0qgqkaya7689spmbgcrqqg9zxbkdf4xq38q94zvwvh"; + libraryHaskellDepends = [ base QuickCheck sdp ]; + testHaskellDepends = [ + base QuickCheck sdp test-framework test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base criterion ghc-prim QuickCheck sdp sdp-deepseq + ]; + description = "SDP QuickCheck support"; + 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 + , vector + }: + mkDerivation { + pname = "sdp4vector"; + version = "0.2"; + sha256 = "1d18zgwawn598sax2m6cvb5w1k1vpc8n6bfdrvn0wrm8i6fvn0bq"; + libraryHaskellDepends = [ base sdp vector ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances sdp sdp-quickcheck + test-framework test-framework-quickcheck2 vector + ]; + description = "SDP wrapper for Vector"; + license = lib.licenses.bsd3; + }) {}; + "sdr" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-to-vector , cairo, cereal, Chart, Chart-cairo, colour, containers, criterion @@ -228032,6 +228656,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 @@ -228070,6 +228713,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 @@ -228088,6 +228744,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 { @@ -228694,6 +229363,30 @@ self: { license = lib.licenses.gpl3; }) {}; + "sequence-formats_1_6_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.6.0"; + sha256 = "1vy2wwzpnqd2c0ma3jm46gx3w3al0j61ncr22bcahsb1nrgmg0dq"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -230516,6 +231209,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 @@ -230611,14 +231306,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 = [ @@ -230627,7 +231322,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"; @@ -231459,6 +232154,22 @@ self: { license = lib.licenses.mit; }) {}; + "servant-validate" = callPackage + ({ mkDerivation, base, containers, hspec, servant + , should-not-typecheck, text + }: + mkDerivation { + pname = "servant-validate"; + version = "0.1.0.0"; + sha256 = "0igcbcax6xxp0h1c4kjbgl2iw1gbadn5ccb1kx0cpp0lydszlv80"; + libraryHaskellDepends = [ base containers servant text ]; + testHaskellDepends = [ + base containers hspec servant should-not-typecheck text + ]; + description = "Chekc static properties of servant APIs"; + license = lib.licenses.bsd3; + }) {}; + "servant-waargonaut" = callPackage ({ mkDerivation, base, bytestring, http-media, http-types, lens , servant, servant-server, tasty, tasty-wai, text, transformers @@ -231696,17 +232407,17 @@ self: { "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces - , QuickCheck, text, time, transformers, unordered-containers + , persistent-test, QuickCheck, text, time, transformers + , unordered-containers }: mkDerivation { pname = "serversession"; - version = "1.0.1"; - sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz"; - revision = "2"; - editedCabalFile = "0i5faxzxgvpfylmrr175f8l4asyh4phncc90jkfag53gnspcv028"; + version = "1.0.2"; + sha256 = "02ynhgq6gn5ddx2yd8ns8ay0rrhzln2h6jrmnwk7x1fqqfvzx0jf"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring data-default hashable nonce - path-pieces text time transformers unordered-containers + path-pieces persistent-test text time transformers + unordered-containers ]; testHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default @@ -231715,6 +232426,8 @@ self: { ]; description = "Secure, modular server-side sessions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-backend-acid-state" = callPackage @@ -231723,8 +232436,8 @@ self: { }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.3"; - sha256 = "1rkw5an7lwx05063caqjhvf449jxij2zrbymg64p600mngb1flq0"; + version = "1.0.4"; + sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -231748,8 +232461,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.4"; - sha256 = "074pxfv1yj6ffxp4bg0ia20w7ikdja3g3k1l93nnjcni13zddwn7"; + version = "1.0.5"; + sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -231774,8 +232487,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.3"; - sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf"; + version = "1.0.4"; + sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -231805,6 +232518,8 @@ self: { ]; description = "Snap bindings for serversession"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-frontend-wai" = callPackage @@ -231822,6 +232537,8 @@ self: { ]; description = "wai-session bindings for serversession"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-frontend-yesod" = callPackage @@ -233996,8 +234713,8 @@ self: { pname = "show-combinators"; version = "0.2.0.0"; sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; - revision = "1"; - editedCabalFile = "1pczjf7z43nzfgza9fa29flbmvkj07p4dw16v9bjv36i8dv6cjc7"; + revision = "2"; + editedCabalFile = "0n3xlpm41wpw1ybmacg9s7150nx00qrdlw2rq4fzz7iw7333cyjx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -234376,8 +235093,8 @@ self: { }: mkDerivation { pname = "signable"; - version = "0.2"; - sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s"; + version = "0.3"; + sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q"; libraryHaskellDepends = [ asn1-encoding asn1-types base binary bytestring casing cryptonite memory microlens pem proto-lens proto-lens-runtime @@ -234617,6 +235334,7 @@ self: { ]; description = "A simple library for affine and vector spaces"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "simple-atom" = callPackage @@ -235736,8 +236454,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; @@ -236416,8 +237134,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.10.2"; - sha256 = "1f60fnr8d8a28fr785hjzaaakss1ncn0998sz740xb76wp6q7pqd"; + version = "0.10.3"; + sha256 = "0bhy0y3d8czv2m92snbqqh5b8xywf74xwc1qml98vy6im0s545ad"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -236442,8 +237160,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.2"; - sha256 = "1igqskmcbhk7b3fv1a1fxvfc4s3mc2sf96q90bf5iipy0h3f2zbg"; + version = "0.10.3"; + sha256 = "00avd17l2fqvss2cnndmina3vp809x784gdyaf1bwmkcsfnl8d3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236994,19 +237712,19 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers + ({ mkDerivation, 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"; + version = "0.5.0.2"; + sha256 = "0qpw3h1lbz299gb2jdcsj7svhxsi9icqaws8xpik58a3hb0r8icb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-markov elynx-seq + attoparsec base bytestring containers elynx-markov elynx-seq elynx-tools elynx-tree hmatrix monad-logger mwc-random optparse-applicative statistics text transformers vector ]; @@ -237133,8 +237851,8 @@ self: { }: mkDerivation { pname = "smallcheck-series"; - version = "0.7.0.0"; - sha256 = "11pb4k0y8fqfkq5ajspn5nnliskvk8qp02dzpcjrzqk27da2iwb6"; + version = "0.7.1.0"; + sha256 = "0c5cpnrxqfhrxgic6rk6vy3wj537k249fg0wzczwx30vdqzcmnkx"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -237980,6 +238698,8 @@ self: { pname = "snap-core"; version = "1.0.4.2"; sha256 = "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs"; + revision = "1"; + editedCabalFile = "065v61clskzikywv0gy9n4fjaszi2fnjklal83kqbzhzzgkf83ng"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -239573,6 +240293,7 @@ self: { ]; description = "An extensible socket library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "socket-activation" = callPackage @@ -239741,6 +240462,24 @@ 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; + }) {}; + "socketson" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , crypto-api, data-default, DRBG, either, errors, http-types @@ -240341,6 +241080,7 @@ self: { ]; description = "Gopher Library and Server Daemon"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "spacefill" = callPackage @@ -240960,8 +241700,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 @@ -241274,6 +242014,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"; @@ -243341,6 +244083,22 @@ 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; + }) {}; + "stagen" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring , data-default, directory, feed, filemanip, json-feed, lucid @@ -244365,8 +245123,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 ]; @@ -244631,8 +245389,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.4"; - sha256 = "0hlzi1zg58mgnb77982hkssm86ds66fs5nf1g2hcjjbjawchx3mj"; + version = "1.2.0.6"; + sha256 = "15jqj31h9ff4g2k3sq35nm122sy0hqapxf4fm5vlkfh33zdn28di"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -246130,8 +246888,8 @@ self: { pname = "streamproc"; version = "1.6.2"; sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; - revision = "1"; - editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs"; + revision = "2"; + editedCabalFile = "1j3frdzhlvmggqq07b7kiz6h7mim64n2frsb2d3hzsjd7jym526j"; libraryHaskellDepends = [ base ]; description = "Stream Processer Arrow"; license = lib.licenses.bsd3; @@ -246333,8 +247091,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; @@ -246363,6 +247121,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; @@ -246548,10 +247308,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.0.2"; - sha256 = "1dkw4q2fxnr7gnish45lryxwrmdy93ffa1010qdnjlnz5m3dxbyl"; - revision = "1"; - editedCabalFile = "1rwylfxa821260mxfsr6l6grcyz7gxk18mvjijfhg5sm53v4c1ka"; + version = "0.3.1.0"; + sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -247124,22 +247882,19 @@ self: { }) {}; "structs" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory - , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck + ({ mkDerivation, base, deepseq, ghc-prim, 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 ]; + version = "0.1.5"; + sha256 = "1qsj5w6g0lcvbrm0zs37f1yk3im1swhnb4j1mbpr3fyc3zswwbjf"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; testHaskellDepends = [ - base directory doctest filepath parallel primitive QuickCheck tasty - tasty-hunit tasty-quickcheck + base primitive QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = lib.licenses.bsd3; @@ -247809,8 +248564,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; @@ -248967,6 +249722,29 @@ self: { broken = true; }) {}; + "swisstable" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, hashtables + , primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector + , weigh + }: + mkDerivation { + pname = "swisstable"; + version = "0.1.0.3"; + sha256 = "1d1vk1j8r2lwxkx2l4l1fmm8z9ascp7hq52al7qjn4bir177b92q"; + libraryHaskellDepends = [ base hashable primitive vector ]; + testHaskellDepends = [ + base hashable primitive QuickCheck tasty tasty-discover tasty-hunit + vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq hashable hashtables primitive QuickCheck + vector weigh + ]; + description = "SwissTable hash map"; + license = lib.licenses.bsd3; + }) {}; + "sws" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, hourglass @@ -250516,6 +251294,7 @@ self: { testHaskellDepends = [ base network unix ]; description = "Systemd facilities (Socket activation, Notify)"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "systemstats" = callPackage @@ -251625,8 +252404,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 ]; @@ -251700,11 +252479,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; }) {}; @@ -252034,6 +252812,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_2_2" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.2.2"; + sha256 = "0x6kg8n778nysv3b7j31bnh62h5srid35nhmvr76bzba4qdgx258"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -252077,8 +252867,8 @@ self: { }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.12.2"; - sha256 = "0i97y723vi2f5z94ripli8jfzqk540w80cfab3prylbm9j3s7rb7"; + version = "0.12.3"; + sha256 = "0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb"; libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; testHaskellDepends = [ base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit @@ -254568,8 +255358,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "5"; - editedCabalFile = "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6"; + revision = "6"; + editedCabalFile = "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -254680,8 +255470,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; - revision = "2"; - editedCabalFile = "1apgf91van2070m6jhj9w3h2xmr42r4kk0da9crq9994hd8zwny2"; + revision = "3"; + editedCabalFile = "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -255988,8 +256778,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; - revision = "2"; - editedCabalFile = "17cb7p0qywf2dsrq3g8qb3ssknd9wl5k0nc2pxz9gc3l8rxpkw51"; + revision = "3"; + editedCabalFile = "1wjy98ihhipzr34b310sgjjq3cc12aydhckbrgr21kxkzwglm4nv"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -257180,6 +257970,8 @@ self: { pname = "these"; version = "1.1.1.1"; sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; + revision = "1"; + editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -257196,6 +257988,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "these-lens_1_0_1_2" = callPackage + ({ mkDerivation, base, lens, these }: + mkDerivation { + pname = "these-lens"; + version = "1.0.1.2"; + sha256 = "1v3kj7j4bkywbmdbblwqs5gsj5s23d59sb3s27jf3bwdzf9d21p6"; + libraryHaskellDepends = [ base lens these ]; + description = "Lenses for These"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "these-optics" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { @@ -257207,6 +258011,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "these-optics_1_0_1_2" = callPackage + ({ mkDerivation, base, optics-core, these }: + mkDerivation { + pname = "these-optics"; + version = "1.0.1.2"; + sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; + libraryHaskellDepends = [ base optics-core these ]; + description = "Optics for These"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "these-skinny" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -257929,28 +258745,30 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.6.1"; - sha256 = "13n9s0s04bddl16xq86anz7a9fqcm7j3xfqn5y1mni5j1h7hn2k2"; + version = "1.7.1"; + sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc network parsec primitive random text transformers vector ]; - testHaskellDepends = [ base containers deepseq microspec parsec ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3; }) {}; - "tidal_1_7_1" = callPackage + "tidal_1_7_2" = 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 @@ -258200,6 +259018,8 @@ self: { pname = "time-compat"; version = "1.9.5"; sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii"; + revision = "1"; + editedCabalFile = "1f6r8cyfgzpfg9nrsqbf99pi44fyds9wcmgwxb4s0zmlb5dbv1m5"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -259601,8 +260421,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.5.0.1"; - sha256 = "0prqnbq75jrixx845z3hbqajfc63vgsdfdgrsxw0g29rx0x4hw2i"; + version = "0.5.0.2"; + sha256 = "1d28xk346h92imp6lnmy0g9mql8nd1zna1mnfs6mqhf38l8sm0k4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260156,8 +260976,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.3.1.0"; - sha256 = "17909a8aapbrsa0yb642ij80k64dg2dam1v3rsvc3rm07ik61x42"; + version = "1.3.2.0"; + sha256 = "0yj39mh4z3v3jqri38s3ylrglv657g3m7gqr2rz8ydlvx2draknc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260339,45 +261159,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.0.1"; + sha256 = "0clrkr7kxcky6l1gwnbznz013svn7254n8fkkb7mgvn93h94anky"; 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; @@ -260492,6 +261311,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; + revision = "1"; + editedCabalFile = "1cbpm16jk8x8xy0r3v8zdmwrdgxlp6zww03rmzbz0031hddpywrk"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -261941,8 +262762,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 @@ -262160,10 +262981,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; @@ -262498,27 +263317,24 @@ 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 + , blaze-html, blaze-markup, bytestring, charset, comonad + , containers, deepseq, fingertree, ghc-prim, hashable + , indexed-traversable, lens, mtl, parsers, prettyprinter , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers - , semigroups, transformers, unordered-containers, utf8-string + , transformers, unordered-containers, utf8-string }: mkDerivation { pname = "trifecta"; - version = "2.1"; - sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; - revision = "4"; - editedCabalFile = "0frzfh7xmaypbxcmszjvzbakz52p0fx79jg6ng0ygaaj62inv4ss"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "2.1.1"; + sha256 = "1lhzi0xxvilvgjy3yf3f85wfmrks562hhsnl0kg1xwji36rgwp6y"; 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 + hashable indexed-traversable lens mtl parsers prettyprinter + prettyprinter-ansi-terminal profunctors reducers transformers + unordered-containers utf8-string ]; - testHaskellDepends = [ base doctest parsers QuickCheck ]; + testHaskellDepends = [ base parsers QuickCheck ]; description = "A modern parser combinator library with convenient diagnostics"; license = lib.licenses.bsd3; }) {}; @@ -263542,16 +264358,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; @@ -263561,14 +264378,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; @@ -264106,8 +264924,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 ]; @@ -264702,33 +265520,6 @@ self: { }) {}; "type-natural" = callPackage - ({ mkDerivation, base, constraints, equational-reasoning, ghc - , ghc-typelits-knownnat, ghc-typelits-natnormalise - , ghc-typelits-presburger, integer-logarithms, QuickCheck - , quickcheck-instances, tasty, tasty-discover - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell - }: - mkDerivation { - pname = "type-natural"; - version = "1.0.0.0"; - sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0"; - libraryHaskellDepends = [ - base constraints equational-reasoning ghc ghc-typelits-knownnat - ghc-typelits-natnormalise ghc-typelits-presburger - integer-logarithms template-haskell - ]; - testHaskellDepends = [ - base equational-reasoning integer-logarithms QuickCheck - quickcheck-instances tasty tasty-discover tasty-expected-failure - tasty-hunit tasty-quickcheck template-haskell - ]; - testToolDepends = [ tasty-discover ]; - description = "Type-level natural and proofs of their properties"; - license = lib.licenses.bsd3; - }) {}; - - "type-natural_1_1_0_0" = callPackage ({ mkDerivation, base, constraints, equational-reasoning, ghc , ghc-typelits-knownnat, ghc-typelits-natnormalise , ghc-typelits-presburger, integer-logarithms, QuickCheck @@ -264752,7 +265543,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Type-level natural and proofs of their properties"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "type-of-html" = callPackage @@ -265327,17 +266117,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"; @@ -265784,8 +266572,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.5.1"; - sha256 = "091lks0jpp0m4wg56i03ih3n0n7kvs2fm511vcnypmwskflkkk0z"; + version = "0.7.6.0"; + sha256 = "0sakvmmf6p2ca0dbkwqdj5cv93gp78srw0zc4f1skcgndkmxwk6l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml @@ -266620,10 +267408,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 ]; @@ -266944,8 +267730,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; @@ -267580,6 +268366,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.2"; sha256 = "1yg3cacr56kk0r8vnqxa9cm1awb727qkysnhc7rn4h9pfb10a7sn"; + revision = "1"; + editedCabalFile = "017adjf6wbw56a81l69vd0gzhlvi6n1wplh85smq7l9m98wsh4wy"; libraryHaskellDepends = [ adjunctions base comonad containers universe-base ]; @@ -267809,6 +268597,23 @@ 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; + }) {}; + "unix-simple" = callPackage ({ mkDerivation, base, bytestring, zenhack-prelude }: mkDerivation { @@ -267937,8 +268742,8 @@ self: { }: mkDerivation { pname = "unliftio-messagebox"; - version = "1.0.2"; - sha256 = "0pl75f3wbcy31b4firqw0y2mdl3axjdwx0w1vckidprv8sncsrm7"; + version = "2.0.0"; + sha256 = "0gwykcv91hn2pwnpwyc9032h84rdid28x34n0896319hl1rg5w9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269357,6 +270162,7 @@ self: { ]; description = "A pragmatic time and date library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "utf" = callPackage @@ -269785,28 +270591,22 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion - , cryptohash-md5, cryptohash-sha1, entropy, HUnit - , mersenne-random-pure64, network-info, QuickCheck, random, tasty + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, text, time, uuid-types }: mkDerivation { pname = "uuid"; - version = "1.3.13"; - sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; - revision = "3"; - editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq"; + version = "1.3.14"; + sha256 = "1msj296faldr9fiwjqi9ixx3xl638mg6ffk7axic14wf8b9zw73a"; 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 + base bytestring 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; }) {}; @@ -269906,24 +270706,20 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, hashable, HUnit, QuickCheck, random, tasty, tasty-hunit + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder + , hashable, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "uuid-types"; - version = "1.0.3"; - sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj"; - revision = "3"; - editedCabalFile = "0znx08r25sgs5j7ix8i9aikhgad0kc9i6vgkg0g3jzxk5haal9sf"; + version = "1.0.4"; + sha256 = "01pc93z6in6g717mxkhl111qc842fz1c2z7ml6n5jhm7lg52ran2"; 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 + base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit + tasty-quickcheck ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; @@ -269946,8 +270742,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 ]; @@ -269957,7 +270753,7 @@ self: { testHaskellDepends = [ base Cabal HUnit microlens microlens-th text ]; - description = "Tweak dependencies in .cabal files"; + description = "Tweak .cabal files"; license = lib.licenses.mit; }) {}; @@ -270683,15 +271479,14 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, semigroups - , unordered-containers + ({ mkDerivation, base, containers, hashable, unordered-containers }: mkDerivation { pname = "vault"; - version = "0.3.1.4"; - sha256 = "0na31n56p6713az0vfhdrv53n03bb3yrnyszf3vxsjlgvrax472v"; + version = "0.3.1.5"; + sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; libraryHaskellDepends = [ - base containers hashable semigroups unordered-containers + base containers hashable unordered-containers ]; description = "a persistent store for values of arbitrary types"; license = lib.licenses.bsd3; @@ -271565,10 +272360,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"; @@ -271609,8 +272402,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.3.1.6"; - sha256 = "0s9d3g47qnzcpi2p1z60axrr53jbc6q4qyma88qxsrf6ava115ar"; + version = "0.3.1.7"; + sha256 = "1181gfxyxf2m3m23xg89kmmp8aizrm9sm908ydbkw885idh2k5x0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -271856,8 +272649,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 ]; @@ -272880,8 +273673,10 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.32"; - sha256 = "0ydbifik7xilb33phglpjkgf6r8vifipyyq0wb6111azzj7dmszs"; + version = "5.33"; + sha256 = "0qsx4lwlkp6mwyr7rm1r9dg5ic1lc1awqgyag0nj1qgj2gnv6nc9"; + revision = "1"; + editedCabalFile = "1in66nd2xkb6mxxzazny900pz1xj83iqsql42c0rwk72chnnb8cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272981,8 +273776,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.9.1"; - sha256 = "1rdhkxrjxcvdx3hd74xcgx28nd8ca8la5kclbxwbgciby8plpymv"; + version = "3.10"; + sha256 = "10bdm8rxak8kdiiqnjl5yw3n14zjr5gj1m9bpiiz0cabf72x54xx"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -273011,8 +273806,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.4.1"; - sha256 = "1kd8v3l6c1szip8d7aw03s9vs5bnwbm66c98wbvmbmwc46rrkksh"; + version = "0.4.2"; + sha256 = "0mf1jf5xv31818c7rarvz0aqc1qxgh7fqfp893pryhwwcr8r2qqa"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -277356,8 +278151,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"; @@ -277577,8 +278372,8 @@ self: { }: mkDerivation { pname = "with-utf8"; - version = "1.0.2.1"; - sha256 = "13zifhmhpdfwifw9bwyn9w5a29iph7h59jx13r0wiw5ry0g7qbif"; + version = "1.0.2.2"; + sha256 = "04ymb90yli9sbdl750yh0nvpn6crnrb2axhx8hrswz5g86cabcmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe-exceptions text ]; @@ -280247,6 +281042,36 @@ self: { broken = true; }) {}; + "xlsx_0_8_3" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.8.3"; + sha256 = "11g6bfir21wgafnkzzx26r6mz8m39isaz2yqw92k5ymdb1qhs95q"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + 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 ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -280489,8 +281314,6 @@ self: { libraryHaskellDepends = [ base mtl transformers xml ]; description = "Extension to the xml package to extract data from parsed xml"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-hamlet" = callPackage @@ -280616,6 +281439,8 @@ self: { pname = "xml-lens"; version = "0.3"; sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz"; + revision = "1"; + editedCabalFile = "0is48y2k6lsdwd2cqwvhxfjs7q5qccis8vcmw7cws18cb7vjks1x"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -281948,6 +282773,23 @@ 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; + }) {}; + "yahoo-web-search" = callPackage ({ mkDerivation, base, HTTP, network, xml }: mkDerivation { @@ -282764,8 +283606,7 @@ self: { ]; description = "Represent and parse yarn.lock files"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "yarn2nix" = callPackage @@ -282803,8 +283644,7 @@ self: { ]; description = "Convert yarn.lock files to nix expressions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "yarr" = callPackage @@ -282839,6 +283679,23 @@ self: { broken = true; }) {inherit (pkgs) libdevil;}; + "yasi" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "yasi"; + version = "0.1.1.1"; + sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Yet another string interpolator"; + license = lib.licenses.cc0; + }) {}; + "yate" = callPackage ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific , template-haskell, text, unordered-containers, vector @@ -283706,33 +284563,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, directory, file-embed, filepath - , fsnotify, http-client, http-client-tls, http-reverse-proxy - , http-types, network, optparse-applicative, process - , project-template, say, split, stm, streaming-commons, tar, text - , time, transformers, transformers-compat, unliftio - , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0.6"; - sha256 = "044xk75pymw6limz08zicxp4lw8jqf6f2ilj8i2qw2h419w3ry9f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal conduit conduit-extra containers - data-default-class directory file-embed filepath fsnotify - http-client http-client-tls http-reverse-proxy http-types network - optparse-applicative process project-template say split stm - streaming-commons tar text time transformers transformers-compat - unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib - ]; - description = "The yesod helper executable"; - license = lib.licenses.mit; - }) {}; - - "yesod-bin_1_6_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath , fsnotify, http-client, http-client-tls, http-reverse-proxy @@ -283757,7 +284587,6 @@ self: { ]; description = "The yesod helper executable"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -284520,6 +285349,32 @@ self: { broken = true; }) {}; + "yesod-page-cursor_2_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.4"; + sha256 = "1zckyjg3k8xi6lx1xgyh50d6v7hydv12c1j36w48xy296nsjwvv9"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { @@ -287038,8 +287893,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "1"; - editedCabalFile = "0pgrfx4vnc3m6rlmg5qj4skarq5y0ijz3swf3fyy57310lvifr0q"; + revision = "2"; + editedCabalFile = "17q1as97cazj2nkwdi31kkgaa3wrxpc8phdj6f9wr4jibbm3jyp6"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -287178,6 +288033,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "zip-stream_0_2_1_0" = callPackage + ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit + , conduit-extra, digest, directory, exceptions, filepath, mtl + , primitive, resourcet, text, time, transformers, transformers-base + , zlib + }: + mkDerivation { + pname = "zip-stream"; + version = "0.2.1.0"; + sha256 = "0fx8kj0ijm3555grhdns7agmi084584fh1v0mvkm4x696h1zzvli"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra digest + exceptions mtl primitive resourcet text time transformers-base zlib + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra directory filepath resourcet + text time transformers + ]; + description = "ZIP archive streaming using conduits"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "zipedit" = callPackage ({ mkDerivation, base, directory, mtl, process }: mkDerivation { @@ -287237,20 +288117,17 @@ self: { }) {}; "zippers" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest - , fail, lens, profunctors, semigroupoids, semigroups + ({ mkDerivation, base, criterion, fail, indexed-traversable, lens + , profunctors, semigroupoids, semigroups }: mkDerivation { pname = "zippers"; - version = "0.3"; - sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm"; - revision = "2"; - editedCabalFile = "131rmvifqf3dcvh9lnpjnm28ss7nzra1n2qnxa1fypnx1zmmljva"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.3.1"; + sha256 = "17z1zi9zd6a8g7sp4zyimgwdvhjj27hj4znbm4ps0kp73gadb953"; libraryHaskellDepends = [ - base fail lens profunctors semigroupoids semigroups + base fail indexed-traversable lens profunctors semigroupoids + semigroups ]; - testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion lens ]; description = "Traversal based zippers"; license = lib.licenses.bsd3; @@ -287319,8 +288196,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 = [ @@ -287793,6 +288670,29 @@ self: { broken = true; }) {}; + "zuul" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, filepath, http-client, http-client-tls + , optparse-generic, tasty, tasty-hunit, text, xdg-basedir + }: + mkDerivation { + pname = "zuul"; + version = "0.1.0.0"; + sha256 = "1agacvixl6s3np8jizmy9vbpzhbb0am9hs8qlc5sqvbg98qr8x1v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-client http-client-tls text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base containers directory filepath + optparse-generic text xdg-basedir + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A zuul client library"; + license = lib.licenses.asl20; + }) {}; + "zxcvbn-c" = callPackage ({ mkDerivation, base }: mkDerivation { diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/chibi/default.nix index 96c884ab602..92531eacd20 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/chibi/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/clips/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/clips/default.nix index d38fb8279f0..db6554874af 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/clips/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/clips/default.nix @@ -1,17 +1,19 @@ { 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 - ''; + 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"; @@ -23,7 +25,7 @@ stdenv.mkDerivation { easier to implement and maintain than an algorithmic solution. ''; license = licenses.publicDomain; - maintainers = [maintainers.league]; + maintainers = [ maintainers.league ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 790f8d1ef81..43b8fb4c6c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -1,53 +1,87 @@ { lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }: -with lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.2.3"; + version = "0.2.10"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "0lbdh3v3g3j00bn99bjhjj3gk1q9ks2alpvl9bxc00xpyw86f7z8"; + sha256 = "1c7f0z1hi0vcfz532r3fhr4c64jjqppf94idpa1jziz1dljkwk85"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0vh6k3dkzyk346jjzg6n4mdi65iybrmhb3js9lm73yc3ay2c5dyi"; + sha256 = "0j6k3vmdljf3bjmj5dywhxjmxcs1axscc8dlnw94g5rwf9bin0dn"; }; 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 \ - ${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/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix index 57da5e862e9..baf83c64776 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = "installPhase"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix index aaf368017ff..0e4beaa8508 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R21.nix index fdd034fc607..e1145090c86 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R21.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R22.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R22.nix index 7596ad9e2f1..8bfe111f065 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R22.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R23.nix index 53d1b49c375..8c07c09f221 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/R23.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 538b4224909..325d8e87e4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,7 +1,6 @@ { pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 -, openjdk8 ? null # javacSupport +, openjdk11 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , parallelBuild ? false @@ -17,9 +16,10 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk8 ] +, javacSupport ? false, javacPackages ? [ openjdk11 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd +, opensslPackage ? openssl , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" @@ -37,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk8 != null; +assert javacSupport -> openjdk11 != null; let inherit (lib) optional optionals optionalAttrs optionalString; @@ -52,25 +52,18 @@ in stdenv.mkDerivation ({ nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; - buildInputs = [ ncurses openssl ] + buildInputs = [ ncurses opensslPackage ] ++ optionals wxSupport wxPackages2 ++ 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 @@ -81,7 +74,7 @@ in stdenv.mkDerivation ({ ./otp_build autoconf ''; - configureFlags = [ "--with-ssl=${openssl.dev}" ] + configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ] ++ optional enableThreads "--enable-threads" ++ optional enableSmpSupport "--enable-smp-support" ++ optional enableKernelPoll "--enable-kernel-poll" @@ -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/infra/libkookie/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 0e3a0a46afd..114bc13f5d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/1.8.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/1.8.nix index 93eca9a73f1..6277312acc8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/1.8.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/1.8.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation rec { libtool ]; - patches = [ ./cpp-4.5.patch ]; + patches = [ + ./cpp-4.5.patch + ./CVE-2016-8605.patch + ]; preBuild = '' sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/CVE-2016-8605.patch b/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/CVE-2016-8605.patch new file mode 100644 index 00000000000..2fc281357ca --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/guile/CVE-2016-8605.patch @@ -0,0 +1,59 @@ +commit d514e3fc42eb14a1bc5846b27ef89f50ba3a5d48 +Author: Ludovic Courtès +Date: Tue Oct 11 10:14:26 2016 +0200 + + Remove 'umask' calls from 'mkdir'. + + Fixes . + + * libguile/filesys.c (SCM_DEFINE): Remove calls to 'umask' when MODE is + unbound; instead, use 0777 as the mode. Update docstring to clarify + this. + +diff --git a/libguile/filesys.c b/libguile/filesys.c +index c8acb13ef..921f765f1 100644 +--- a/libguile/filesys.c ++++ b/libguile/filesys.c +@@ -1,4 +1,5 @@ +-/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2008 Free Software Foundation, Inc. ++/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006, ++ * 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -791,26 +792,21 @@ SCM_DEFINE (scm_delete_file, "delete-file", 1, 0, 0, + SCM_DEFINE (scm_mkdir, "mkdir", 1, 1, 0, + (SCM path, SCM mode), + "Create a new directory named by @var{path}. If @var{mode} is omitted\n" +- "then the permissions of the directory file are set using the current\n" +- "umask. Otherwise they are set to the decimal value specified with\n" +- "@var{mode}. The return value is unspecified.") ++ "then the permissions of the directory are set to @code{#o777}\n" ++ "masked with the current umask (@pxref{Processes, @code{umask}}).\n" ++ "Otherwise they are set to the value specified with @var{mode}.\n" ++ "The return value is unspecified.") + #define FUNC_NAME s_scm_mkdir + { + int rv; +- mode_t mask; ++ mode_t c_mode; + +- if (SCM_UNBNDP (mode)) +- { +- mask = umask (0); +- umask (mask); +- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, 0777 ^ mask)); +- } +- else +- { +- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, scm_to_uint (mode))); +- } ++ c_mode = SCM_UNBNDP (mode) ? 0777 : scm_to_uint (mode); ++ ++ STRING_SYSCALL (path, c_path, rv = mkdir (c_path, c_mode)); + if (rv != 0) + SCM_SYSERROR; ++ + return SCM_UNSPECIFIED; + } + #undef FUNC_NAME diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/io/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/io/default.nix index d0a3b20e503..48462a333bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/io/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/j/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/j/default.nix index ab64505e091..8875a9cf55e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/j/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/j/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; + # Causes build failure due to warning + # https://github.com/jsoftware/jsource/issues/16 + NIX_CFLAGS_COMPILE = "-Wno-error=return-local-addr"; + buildPhase = '' export SOURCE_DIR=$(pwd) export HOME=$TMPDIR diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/janet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/janet/default.nix index ac1a52e1bba..0ab90c1e063 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.15.0"; + version = "1.15.3"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NLPmuS7HTPY8OfeppqVhrj4iVZix4orr1oYilcXaAqI="; + sha256 = "sha256-GWSPNz4IxEYxSRpDPbgCXmc7WYZNi8IGVqNhSEgUaeg="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/jruby/default.nix index f792471c061..4d8771b93eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/infra/libkookie/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.15.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj"; + sha256 = "sha256-no5dc8QtHa2KeVptw5vYfoj8iGP3bgZeQJnDLQhSBbA="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -pv $out/docs diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/jython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/jython/default.nix index 61cc8f9cd0f..38b599d339e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/jython/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix deleted file mode 100644 index d4e68b5cb76..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix deleted file mode 100644 index d16f068883a..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/build-env.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/build-env.nix new file mode 100644 index 00000000000..fee53b716da --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/build-octave-package.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/build-octave-package.nix new file mode 100644 index 00000000000..73a67769d6a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/default.nix index 6ad25d24eae..0a87c1ddcf0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/infra/libkookie/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.1.0"; - pname = "octave"; - src = fetchurl { - url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "0mqa1g3fq0q45mqc0didr8vl6bk7jzj6gjsf1522qqjq2r04xwvg"; + 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; + }; + + self = mkDerivation rec { + version = "6.2.0"; + pname = "octave"; + + src = fetchurl { + url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; + sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw="; + }; + + 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 + ] + ; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.isDarwin; - enableParallelBuilding = true; + enableParallelBuilding = true; - # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; + # 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") - ] + 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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/hooks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/hooks/default.nix new file mode 100644 index 00000000000..f47560921af --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh new file mode 100644 index 00000000000..64e87d68246 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh new file mode 100644 index 00000000000..032ea398ac5 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/with-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/with-packages.nix new file mode 100644 index 00000000000..f00befbb00d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/wrap-octave.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/wrap-octave.nix new file mode 100644 index 00000000000..1e4616136a1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/wrap.sh b/infra/libkookie/nixpkgs/pkgs/development/interpreters/octave/wrap.sh new file mode 100644 index 00000000000..a5969fca2a9 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/perl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/perl/default.nix index 75fe1bac8cb..66e0b284fc0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/php/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/php/generic.nix index 191d589aa90..659157e24c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/picolisp/default.nix index 341797fa3f4..623eefec416 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/picolisp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/pure/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/pure/default.nix index 19e6c93378f..863df66899b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/pure/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch new file mode 100644 index 00000000000..6c0ae468461 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index 85af394e3f6..37d43e33d8e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/find_library.patch b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/find_library.patch similarity index 100% rename from infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/find_library.patch rename to infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/find_library.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch index a1f9d68eb16..4324fc5ea61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 7bc6084f61d..1ae8d19ac58 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/default.nix index d6030a4bf1d..c212e37a484 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/infra/libkookie/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; diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index c2079fa84f9..eb45205ff73 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index f301fd15f09..460af1cc67b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , python-setup-hook , self @@ -31,9 +32,15 @@ let implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; executable = "pypy${if isPy3k then "3" else ""}"; - pythonForBuild = self; # Not possible to cross-compile with. sitePackages = "site-packages"; hasDistutilsCxxPatch = false; + + # Not possible to cross-compile with. + pythonOnBuildForBuild = throw "${pname} does not support cross compilation"; + pythonOnBuildForHost = self; + pythonOnBuildForTarget = throw "${pname} does not support cross compilation"; + pythonOnHostForHost = throw "${pname} does not support cross compilation"; + pythonOnTargetForTarget = throw "${pname} does not support cross compilation"; }; pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/tests.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/tests.nix index ff27ca8ec20..cfba04da938 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -101,6 +101,24 @@ let }; }; + # Tests to ensure overriding works as expected. + overrideTests = let + extension = self: super: { + foobar = super.numpy; + }; + in { + test-packageOverrides = let + myPython = let + self = python.override { + packageOverrides = extension; + inherit self; + }; + in self; + in assert myPython.pkgs.foobar == myPython.pkgs.numpy; myPython.withPackages(ps: with ps; [ foobar ]); + # overrideScope is broken currently + # test-overrideScope = let + # myPackages = python.pkgs.overrideScope extension; + # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); + }; - -in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests) +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests) diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/quickjs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/quickjs/default.nix index 23fe1dc7800..ac70a50eaa7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/quickjs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/quickjs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "quickjs"; - version = "2019-12-21"; + version = "2020-11-08"; src = fetchurl { url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p"; + sha256 = "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f"; }; makeFlags = [ "prefix=${placeholder "out"}" ]; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { # Programs exit with code 1 when testing help, so grep for a string set +o pipefail qjs --help 2>&1 | grep "QuickJS version" - qjsbn --help 2>&1 | grep "QuickJS version" qjscalc --help 2>&1 | grep "QuickJS version" set -o pipefail @@ -27,9 +26,7 @@ stdenv.mkDerivation rec { echo "console.log('Output from compiled program');" > "$temp" set -o verbose out=$(mktemp) && qjsc "$temp" -o "$out" && "$out" | grep -q "Output from compiled program" - out=$(mktemp) && qjsbnc "$temp" -o "$out" && "$out" | grep -q "Output from compiled program" out=$(mktemp) && qjsc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program" - out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program" ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/default.nix index 8d33962f914..48be64aa0b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -8,6 +8,7 @@ , libGL , libGLU , libjpeg +, ncurses , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? false @@ -46,7 +47,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.9"; # always change at once with ./minimal.nix + version = "8.0"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; + sha256 = "0lqqpa88v0br93qw7450a4blyi3pwn7sq2k04h0ikbsqrdnfj7lj"; }; FONTCONFIG_FILE = fontsConf; @@ -68,12 +69,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ncurses ]; preConfigure = '' unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname + for f in src/lt/configure src/cs/c/configure src/bc/src/string.c src/ChezScheme/workarea; do + substituteInPlace "$f" \ + --replace /usr/bin/uname ${coreutils}/bin/uname \ + --replace /bin/cp ${coreutils}/bin/cp \ + --replace /bin/ln ${coreutils}/bin/ln \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/true ${coreutils}/bin/true done mkdir src/build cd src/build diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index 9fd220e5b98..c954b4f05ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia"; + sha256 = "0qvfi6rg9cwzh716q5j7m30rqq9xysi6zsalqlpdqrzhnx8y54k0"; }; meta = oldAttrs.meta // { diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 5eccebf0245..42e82cd3a51 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/rascal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/rascal/default.nix index cd2b74db052..8b49a743b4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/rascal/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/rebol/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/rebol/default.nix deleted file mode 100644 index 39a4108e041..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 2678188e8cf..65189fda079 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub -, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison +, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix , makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo @@ -44,6 +44,7 @@ let , groff, docSupport ? true , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true + , jemalloc, jemallocSupport ? false # By default, ruby has 3 observed references to stdenv.cc: # # - If you run: @@ -94,6 +95,7 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) + ++ (op jemallocSupport jemalloc) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're @@ -134,6 +136,7 @@ let ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" ++ op (!jitSupport) "--disable-jit-support" ++ op (!docSupport) "--disable-install-doc" + ++ op (jemallocSupport) "--with-jemalloc" ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed @@ -243,14 +246,6 @@ let ) args; in self; in { - ruby_2_5 = generic { - version = rubyVersion "2" "5" "8" ""; - sha256 = { - src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc"; - git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2"; - }; - }; - ruby_2_6 = generic { version = rubyVersion "2" "6" "6" ""; sha256 = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/scheme48/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/scheme48/default.nix index ca34d5055c5..883b0b2f39a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/scheme48/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix index 81ebcedf7bc..e04069f6aec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index f80e18c7bb9..a1612680b25 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; + dontWrapQtApps = true; + meta = with lib; { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix index d76ceb3421d..37a7fee8a85 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index 60ce4d89f19..91e13ed32cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/java-modules/junit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/java-modules/junit/default.nix index 2cb9ab001c2..79f73879e6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/java-modules/junit/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix b/infra/libkookie/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix index eac127b6dcc..96d0031270b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix index 95d1b873edd..f724c2e0acf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,15 +2,19 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20200225.2"; + version = "20200923.3"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; + sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"; }; + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=17" + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 208c74981dc..8a8ab23d495 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index d240e7e3a9d..073ad3254a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; + dontWrapQtApps = true; + meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix index fe67cf04e60..6094c0b8f46 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix index 29781446c8f..670dee26b2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix index 9c636e0205d..821a9ea9226 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 79f09f48464..f074287ab16 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index 45caf0b36c5..616ad5b0c89 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/suil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/suil/default.nix index 0f4dd0f62c4..56008ae8dd6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/suil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/audio/suil/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); + dontWrapQtApps = true; + meta = with lib; { homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 23d7f9d8629..36315aa8678 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; }; + 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 = [ @@ -26,5 +34,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; + # https://github.com/awslabs/aws-c-common/issues/754 + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix index 4cfabc77bb2..18dddee6bde 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index e2074cc835a..373ea66a4b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -1,4 +1,4 @@ -{ 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"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { 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/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd..d6fbb97014d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix index 78ef4c2f336..fd4e2cfe9f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index dd72b7eb41d..700fe4f4686 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix index abff1268bfa..6158eb87511 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 7019d39b16c..aa3eeef48a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; + # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. + cmakeFlags = lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; + installPhase = '' mkdir -p $bin/bin $out/include $out/lib diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/caf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/caf/default.nix index fdc06df948d..944b5276c5a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/cfitsio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/cfitsio/default.nix index a430bc31793..a3263f653b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/cfitsio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/cfitsio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = "--with-bzip2=${bzip2.out}"; + configureFlags = [ "--with-bzip2=${bzip2.out}" ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch index 47f41972745..8a14fb3a5fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/civetweb/default.nix index 8a3474a491f..fbbfb6ba738 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/civetweb/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/crypto++/default.nix index 0402af92b3b..fe553cb37b9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/dlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dlib/default.nix index fa7d70d5213..096910b238b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/dxflib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/dxflib/default.nix index b2cd97398c6..09f2ad3ccad 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/dxflib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/dxflib/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix index 4709441a101..a8697207ed1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/entt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/entt/default.nix index 955dd2eeb36..7f98a9f1122 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/entt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0"; + sha256 = "sha256-XaQQOt3UekjE4QUUW6+W5M4tkTqeGjZDExJB1U1/gJ8="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/flite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/flite/default.nix index 24927fe853b..a80c317b06e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/flite/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix index 0d2983b1f84..474c990d517 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -37,7 +37,7 @@ let homepage = "http://fmtlib.net/"; downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; - license = licenses.bsd2; + license = licenses.mit; platforms = platforms.all; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix index 7b5fff29a28..adda15696e8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/g2o/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/g2o/default.nix index 675d994cf0e..0536ec95c6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU -, qtbase, libqglviewer, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas +, lapack, libGLU, qtbase, libqglviewer, makeWrapper }: mkDerivation rec { pname = "g2o"; - version = "20200410"; + version = "20201223"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; + sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8="; }; # Removes a reference to gcc that is only used in a debug message @@ -18,11 +18,13 @@ mkDerivation rec { separateDebugInfo = true; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; + buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; # Silence noisy warning CXXFLAGS = "-Wno-deprecated-copy"; + dontWrapQtApps = true; + cmakeFlags = [ # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" @@ -41,5 +43,7 @@ mkDerivation rec { license = with licenses; [ bsd3 lgpl3 gpl3 ]; maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; + # fatal error: 'qglviewer.h' file not found + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix index 8add81e2796..92c0ec293cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; + sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gecode/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gecode/default.nix index 46b13e6e37f..fc9835d85db 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gecode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gecode/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ bison flex ]; buildInputs = [ perl gmp mpfr ] ++ lib.optional enableGist qtbase; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/geos/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/geos/default.nix index 63806b31e25..19b03eb620c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.1"; + pname = "geos"; + version = "3.9.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; + 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/infra/libkookie/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 220b68fa18b..071e749b400 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index e2e0ba3bccf..38ef25770aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz b/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz similarity index 87% rename from infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz rename to infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz index f77e490ebf5..36aaf51cce9 100644 Binary files a/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz and b/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz differ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix index 54882ba6718..8bf78300739 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 74b94e68f56..a08997ea2cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 2cd1e783ea9..57acec4860a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv +, perl, gmp, autoconf, automake, libidn, p11-kit, libiconv , unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring @@ -71,7 +71,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index fdf42543281..af451281402 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 51b259a3ca8..326e5da0812 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; + dontWrapQtApps = true; + configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gsasl/default.nix index 48ee0ddd4a5..9b6562b9891 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gsasl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gsasl/default.nix @@ -1,11 +1,11 @@ { fetchurl, lib, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { - name = "gsasl-1.8.0"; + name = "gsasl-1.10.0"; src = fetchurl { url = "mirror://gnu/gsasl/${name}.tar.gz"; - sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; + sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; buildInputs = [ libidn kerberos ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 313a063cae8..89011b9230f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext -, config , pkg-config , python3 , gst-plugins-base @@ -81,6 +79,7 @@ , x265 , libxml2 , srt +, vo-aacenc }: assert faacSupport -> faac != null; @@ -99,6 +98,7 @@ in stdenv.mkDerivation rec { }; patches = [ + # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch ]; @@ -117,6 +117,8 @@ in stdenv.mkDerivation rec { 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 @@ -163,6 +165,7 @@ in stdenv.mkDerivation rec { libxml2 libintl srt + vo-aacenc ] ++ optionals enableZbar [ zbar ] ++ optionals faacSupport [ @@ -241,7 +244,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 diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index a032f5f5b5a..3ab25863a80 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -30,6 +30,7 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null +, qt5Support ? false, qt5 ? null , raspiCameraSupport ? false, libraspberrypi ? null , enableJack ? true, libjack2 , libXdamage @@ -102,7 +103,12 @@ stdenv.mkDerivation rec { ] ++ optionals gtkSupport [ # for gtksink gtk3 - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals qt5Support (with qt5; [ + qtbase + qtdeclarative + qtwayland + qtx11extras + ]) ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l @@ -118,7 +124,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps + ] ++ optionals (!qt5Support) [ + "-Dqt5=disabled" ] ++ optionals (!gtkSupport) [ "-Dgtk3=disabled" ] ++ optionals (!enableJack) [ @@ -131,7 +138,6 @@ stdenv.mkDerivation rec { "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only - "-Dpulse=disabled" # TODO check if we can keep this enabled ] ++ optionals (!raspiCameraSupport) [ "-Drpicamsrc=disabled" ]; @@ -150,6 +156,9 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; + # must be explicitely set since 5590e365 + dontWrapQtApps = true; + meta = with lib; { description = "GStreamer Good Plugins"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 5180df63460..159b03a26e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin lethalman worldofpeace ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 59b0b080a52..b05e9ea0393 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -55,7 +55,7 @@ assert cupsSupport -> cups != null; stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.2"; + version = "4.0.3"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "115w3mzwm1xsi1q85qvwfm2yxpsjs2rcajgddzbnwhjicyn0frv2"; + sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; }; nativeBuildInputs = [ @@ -226,7 +226,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin lethalman worldofpeace ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index b3615893b53..3f31a3f6db3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix index 329fa99fa1c..da29c0e07e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9"; + sha256 = "sha256-Fkntfk5AaWtS1x0fXfLSWW/9tvKcCBi1COqgNxurPmk="; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix index 34c3d26c55e..4ae17723275 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/68.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/68.nix new file mode 100644 index 00000000000..5aeba0f2628 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/icu/68.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "68.2"; + sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 666fcab989b..23550bbc807 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0zdk4afdrrr1539f2q15zja19j4wwfmpswzws2ffgflcnhywlxhr"; + sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix index 035356ac861..da4ba218fdf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix new file mode 100644 index 00000000000..e6e82bc0249 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix new file mode 100644 index 00000000000..e52da9f2eab --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix new file mode 100644 index 00000000000..b34abfd95c1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch deleted file mode 100644 index 70168001291..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix index 7a7d6a933bc..0484f4c59ba 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) - ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] + ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ] ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index ddf95ead249..5519a1fb766 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix index a820d947b7f..ed086dac90f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index b7754a186d1..90d3f1da6e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index 5c6ea732b69..01d6a7ba2b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.76/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' ) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix index fdfe28db6c0..26e5a83dc21 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: @@ -7,6 +7,13 @@ mkDerivation { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # https://mail.kde.org/pipermail/distributions/2021-January/000928.html + (fetchpatch { + url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch"; + sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kwidgetsaddons qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 66cd8ddf64f..a9b3c416624 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - qtbase, qtx11extras, + qtbase, qtx11extras, wayland, }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + buildInputs = [ qtx11extras wayland ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 434496c7b9a..642151913db 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -24,5 +24,10 @@ mkDerivation { patches = [ ./samba-search-path.patch ./kio-debug-module-loader.patch + # https://mail.kde.org/pipermail/distributions/2021-February/000938.html + (fetchpatch { + url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch"; + sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd"; + }) ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index dbc74b83112..8701a43b4d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,670 +1,670 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks { fetchurl, mirror }: { attica = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/attica-5.76.0.tar.xz"; - sha256 = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22"; - name = "attica-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/attica-5.78.0.tar.xz"; + sha256 = "0xlnsh9py1v7di305qic0kzpwbq0yw41rilkq1f8p9zsixl99w8m"; + name = "attica-5.78.0.tar.xz"; }; }; baloo = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/baloo-5.76.0.tar.xz"; - sha256 = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9"; - name = "baloo-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/baloo-5.78.0.tar.xz"; + sha256 = "1p8s0lgbqajpzbrc2pb1vzga0bsfwqjb4pzvvgqdlb419ijcjlpi"; + name = "baloo-5.78.0.tar.xz"; }; }; bluez-qt = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz"; - sha256 = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835"; - name = "bluez-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/bluez-qt-5.78.0.tar.xz"; + sha256 = "1g83sfvl8zmyc9l5kr2bb9pdfis01m1ib9pz6qq1k5zv5aq3cyz9"; + name = "bluez-qt-5.78.0.tar.xz"; }; }; breeze-icons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz"; - sha256 = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b"; - name = "breeze-icons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/breeze-icons-5.78.0.tar.xz"; + sha256 = "1fa9lirik0ic03nb56xmiirpbcg57l1b3q7dkn9r5h6scc0nsps2"; + name = "breeze-icons-5.78.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz"; - sha256 = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32"; - name = "extra-cmake-modules-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/extra-cmake-modules-5.78.0.tar.xz"; + sha256 = "1y8js21adfzl6g5q46gj7dl8q2jhfvx0ba3ipmbclkpj4461zppf"; + name = "extra-cmake-modules-5.78.0.tar.xz"; }; }; frameworkintegration = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz"; - sha256 = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb"; - name = "frameworkintegration-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/frameworkintegration-5.78.0.tar.xz"; + sha256 = "0rvi82fqck8jaxnrh5fd8m581civ174hpczanmw6n7birxvmk2wh"; + name = "frameworkintegration-5.78.0.tar.xz"; }; }; kactivities = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kactivities-5.76.0.tar.xz"; - sha256 = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422"; - name = "kactivities-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kactivities-5.78.0.tar.xz"; + sha256 = "11v7rcw6lk4xd28i9al5p7bxklw5hdm97hvszhh1qd7kfrzblkhi"; + name = "kactivities-5.78.0.tar.xz"; }; }; kactivities-stats = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz"; - sha256 = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14"; - name = "kactivities-stats-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kactivities-stats-5.78.0.tar.xz"; + sha256 = "0afnwswng85jfkpbmbmprkqfngjxv2qpds3s2xlb5nzrpl43hc7s"; + name = "kactivities-stats-5.78.0.tar.xz"; }; }; kapidox = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kapidox-5.76.0.tar.xz"; - sha256 = "8c6c9401059d34fa2d7f052e21387d803a1131a60fcd1305ddf5d5dfe22c6d97"; - name = "kapidox-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kapidox-5.78.0.tar.xz"; + sha256 = "1d8ia33nrsvg8gf9mna0r2f0sdi4c37p8mxl59hcfqdimy7inkvp"; + name = "kapidox-5.78.0.tar.xz"; }; }; karchive = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/karchive-5.76.0.tar.xz"; - sha256 = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a"; - name = "karchive-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/karchive-5.78.0.tar.xz"; + sha256 = "1lqjy040c5wb76fvnvdaxsgqm63bcx9bmjinvia1caqkh11a5rw2"; + name = "karchive-5.78.0.tar.xz"; }; }; kauth = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kauth-5.76.0.tar.xz"; - sha256 = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89"; - name = "kauth-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kauth-5.78.0.tar.xz"; + sha256 = "1c0xyv54g8gcxaaz602ai1v4jlk7xndc65qjad66qiig958b1czg"; + name = "kauth-5.78.0.tar.xz"; }; }; kbookmarks = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz"; - sha256 = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af"; - name = "kbookmarks-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kbookmarks-5.78.0.tar.xz"; + sha256 = "0b7g0fkyyqdwpfw53kdw73jcyk8wz5k2ipmwzlpx2fr5gs2v00c3"; + name = "kbookmarks-5.78.0.tar.xz"; }; }; kcalendarcore = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz"; - sha256 = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae"; - name = "kcalendarcore-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcalendarcore-5.78.0.tar.xz"; + sha256 = "1v97swaqf9bmdvfagzif1ihsnd5d900nzv8aadic0a7ax5zqi41h"; + name = "kcalendarcore-5.78.0.tar.xz"; }; }; kcmutils = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz"; - sha256 = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009"; - name = "kcmutils-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcmutils-5.78.0.tar.xz"; + sha256 = "1ly21k3lrn6fx1j4vp0km8z9sb2l0adx0rhp9c1sasr8aflmy5k8"; + name = "kcmutils-5.78.0.tar.xz"; }; }; kcodecs = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz"; - sha256 = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1"; - name = "kcodecs-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcodecs-5.78.0.tar.xz"; + sha256 = "0ypwx29v7gbcdpkvlpk0r5v7d8rd3xnqlnk1k11c75dvy3763d1n"; + name = "kcodecs-5.78.0.tar.xz"; }; }; kcompletion = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz"; - sha256 = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a"; - name = "kcompletion-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcompletion-5.78.0.tar.xz"; + sha256 = "1a9z252m7v2fhd71dnibczb8yjq090ylcysx5pgwhc2j3djp4fd7"; + name = "kcompletion-5.78.0.tar.xz"; }; }; kconfig = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kconfig-5.76.0.tar.xz"; - sha256 = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686"; - name = "kconfig-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kconfig-5.78.0.tar.xz"; + sha256 = "1fzzrypi8pxb0vprh65bpqrpgpwlwwlspf2mz5w83s90snbiwymj"; + name = "kconfig-5.78.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz"; - sha256 = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4"; - name = "kconfigwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kconfigwidgets-5.78.0.tar.xz"; + sha256 = "0fgclbyxjyjid21x2059wh7dns73acjnh4qrgzhg0nsx2h8cvm47"; + name = "kconfigwidgets-5.78.0.tar.xz"; }; }; kcontacts = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz"; - sha256 = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5"; - name = "kcontacts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcontacts-5.78.0.tar.xz"; + sha256 = "1xjm0l8did9qmjgfvy9hsa7jbfv5mqimnwl7iiz6gxvm8sm14gcw"; + name = "kcontacts-5.78.0.tar.xz"; }; }; kcoreaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz"; - sha256 = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6"; - name = "kcoreaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcoreaddons-5.78.0.tar.xz"; + sha256 = "01rvijlb3b3s5r3213am9zyk7xhfqbnfxnq175hggq0mbm6zjpv3"; + name = "kcoreaddons-5.78.0.tar.xz"; }; }; kcrash = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcrash-5.76.0.tar.xz"; - sha256 = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993"; - name = "kcrash-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcrash-5.78.0.tar.xz"; + sha256 = "0rrxzjxwi3kib0w86gc4gkkyzvnkg6l1x81ybclvk275zi724jkj"; + name = "kcrash-5.78.0.tar.xz"; }; }; kdav = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdav-5.76.0.tar.xz"; - sha256 = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72"; - name = "kdav-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdav-5.78.0.tar.xz"; + sha256 = "1iqh5z5rry644mcrlppbbf72nxli607varki61m1zgvcvwvaq00j"; + name = "kdav-5.78.0.tar.xz"; }; }; kdbusaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz"; - sha256 = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a"; - name = "kdbusaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdbusaddons-5.78.0.tar.xz"; + sha256 = "16fk4jpx93q4l0wf3vgxg7vxajjqmbxd91y08khfahr2fssx14ag"; + name = "kdbusaddons-5.78.0.tar.xz"; }; }; kdeclarative = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz"; - sha256 = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3"; - name = "kdeclarative-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdeclarative-5.78.0.tar.xz"; + sha256 = "15s75xfy8lvwvkd789vg6y3zcxafav46g7r97psn97ans6gk2na7"; + name = "kdeclarative-5.78.0.tar.xz"; }; }; kded = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kded-5.76.0.tar.xz"; - sha256 = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516"; - name = "kded-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kded-5.78.0.tar.xz"; + sha256 = "0lmxqax0x2hxllzhbvwgywdg483zarhs7f2i0d1ffigr3nn6q59m"; + name = "kded-5.78.0.tar.xz"; }; }; kdelibs4support = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz"; - sha256 = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d"; - name = "kdelibs4support-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kdelibs4support-5.78.0.tar.xz"; + sha256 = "1iclzch3sh0j73prm2ccjvd3z89hp4638kxdblzqqxxdyali9ycq"; + name = "kdelibs4support-5.78.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz"; - sha256 = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71"; - name = "kdesignerplugin-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kdesignerplugin-5.78.0.tar.xz"; + sha256 = "1chg3g8xc8nmlzg4niciphfrclmiqcfb6jxwajv1j8j3s3vk7wwz"; + name = "kdesignerplugin-5.78.0.tar.xz"; }; }; kdesu = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdesu-5.76.0.tar.xz"; - sha256 = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642"; - name = "kdesu-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdesu-5.78.0.tar.xz"; + sha256 = "072bnj6hxph864gn81hr24aklh7mq974fibglihwyak0zbml5yfm"; + name = "kdesu-5.78.0.tar.xz"; }; }; kdewebkit = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz"; - sha256 = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba"; - name = "kdewebkit-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kdewebkit-5.78.0.tar.xz"; + sha256 = "0mcnlc4s372ghdjypksdjh6casradsxwa47aaac4d4yg2qk7mqb1"; + name = "kdewebkit-5.78.0.tar.xz"; }; }; kdnssd = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz"; - sha256 = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753"; - name = "kdnssd-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdnssd-5.78.0.tar.xz"; + sha256 = "1rsjbi5x05ii17xl8zvcrfjmjsq0g6vqh90qflnyys6lzhyvs0sf"; + name = "kdnssd-5.78.0.tar.xz"; }; }; kdoctools = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz"; - sha256 = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4"; - name = "kdoctools-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdoctools-5.78.0.tar.xz"; + sha256 = "0qngw9li2am0phkys45cph3qj01fjhjhvp3dsk3ymr60szryw23s"; + name = "kdoctools-5.78.0.tar.xz"; }; }; kemoticons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz"; - sha256 = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99"; - name = "kemoticons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kemoticons-5.78.0.tar.xz"; + sha256 = "14alh2n5igk3cpm1j7ms7y0xph61qy5k3n2bw8y4y5wkb8qmqg3m"; + name = "kemoticons-5.78.0.tar.xz"; }; }; kfilemetadata = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz"; - sha256 = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68"; - name = "kfilemetadata-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kfilemetadata-5.78.0.tar.xz"; + sha256 = "111w47f74kmn81hvjxjhp6n6kc4533a76fzvrv6wbprqiwc6bncx"; + name = "kfilemetadata-5.78.0.tar.xz"; }; }; kglobalaccel = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz"; - sha256 = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4"; - name = "kglobalaccel-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kglobalaccel-5.78.0.tar.xz"; + sha256 = "08mqjdigb5lzx0kqhmw5m8gnvs01fzg3j0dan70v5203wbfnw69z"; + name = "kglobalaccel-5.78.0.tar.xz"; }; }; kguiaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz"; - sha256 = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125"; - name = "kguiaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kguiaddons-5.78.0.tar.xz"; + sha256 = "1l3ppihibhcjajmd55dr6mcc1xd4ni2iw2rdpk2l11ran4nys2dd"; + name = "kguiaddons-5.78.0.tar.xz"; }; }; kholidays = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kholidays-5.76.0.tar.xz"; - sha256 = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b"; - name = "kholidays-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kholidays-5.78.0.tar.xz"; + sha256 = "147ma06mrbydf2gyrh526bjh1f0xlnxiw89xp6n3wq0qmmdvhs17"; + name = "kholidays-5.78.0.tar.xz"; }; }; khtml = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz"; - sha256 = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4"; - name = "khtml-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/khtml-5.78.0.tar.xz"; + sha256 = "0pai60cbl8p01xb97191nyzmsf7q00vcqvy8cdr8gfvrlx8k7dhn"; + name = "khtml-5.78.0.tar.xz"; }; }; ki18n = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ki18n-5.76.0.tar.xz"; - sha256 = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a"; - name = "ki18n-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/ki18n-5.78.0.tar.xz"; + sha256 = "0mafvkrgmdcj869dzqmgphdwhl6a2bf2lw99w7frxh2qw4n2sd8k"; + name = "ki18n-5.78.0.tar.xz"; }; }; kiconthemes = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz"; - sha256 = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3"; - name = "kiconthemes-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kiconthemes-5.78.0.tar.xz"; + sha256 = "0ssd1298pqm0g46m92b5d4yfrqxgmwf465lcbia41lndjd6px27v"; + name = "kiconthemes-5.78.0.tar.xz"; }; }; kidletime = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kidletime-5.76.0.tar.xz"; - sha256 = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62"; - name = "kidletime-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kidletime-5.78.0.tar.xz"; + sha256 = "0aw6g6p3bmp32zk22fwp2f1d20vbf7921ixnyf7a0w535r58d5ma"; + name = "kidletime-5.78.0.tar.xz"; }; }; kimageformats = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz"; - sha256 = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d"; - name = "kimageformats-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kimageformats-5.78.0.tar.xz"; + sha256 = "0gv2w49cdzji8h9swaazpmbn0qqzn4ncnxj7f9rqp686q17czm7c"; + name = "kimageformats-5.78.0.tar.xz"; }; }; kinit = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kinit-5.76.0.tar.xz"; - sha256 = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546"; - name = "kinit-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kinit-5.78.0.tar.xz"; + sha256 = "16shlmm6q0vaf05gkrgqpmjrs5fgb8jrfgq331x7ic567hhzv4vv"; + name = "kinit-5.78.0.tar.xz"; }; }; kio = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kio-5.76.0.tar.xz"; - sha256 = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b"; - name = "kio-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kio-5.78.0.tar.xz"; + sha256 = "086nhyjk5sjvp97fs6kkmc99jh2303sbmpfki1qvcwzdq6idn4g2"; + name = "kio-5.78.0.tar.xz"; }; }; kirigami2 = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz"; - sha256 = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a"; - name = "kirigami2-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kirigami2-5.78.0.tar.xz"; + sha256 = "0667wcxyhil332g6gk12bjg5y0c1zk15354wx6mg8krxl3i2nkjy"; + name = "kirigami2-5.78.0.tar.xz"; }; }; kitemmodels = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz"; - sha256 = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0"; - name = "kitemmodels-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kitemmodels-5.78.0.tar.xz"; + sha256 = "1yn8gi7dml7mxyk93fzx5id2pckw6qbbkifwzmhq5i3vzpq1qdja"; + name = "kitemmodels-5.78.0.tar.xz"; }; }; kitemviews = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz"; - sha256 = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001"; - name = "kitemviews-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kitemviews-5.78.0.tar.xz"; + sha256 = "10ysirhlgbzyiybb1ap111w89v3czing43ap10n5pldgh1c8ky05"; + name = "kitemviews-5.78.0.tar.xz"; }; }; kjobwidgets = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz"; - sha256 = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf"; - name = "kjobwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kjobwidgets-5.78.0.tar.xz"; + sha256 = "0cdy7w14wr08xf9na1jzbrwjvmiw5q2ciniafzf9cn55yxrvmhwv"; + name = "kjobwidgets-5.78.0.tar.xz"; }; }; kjs = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz"; - sha256 = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a"; - name = "kjs-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kjs-5.78.0.tar.xz"; + sha256 = "0sjnwj6x7dgvqh333yii5vlh7pbl1kc7zrbdjkqi38cfnbcf2w4h"; + name = "kjs-5.78.0.tar.xz"; }; }; kjsembed = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz"; - sha256 = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88"; - name = "kjsembed-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kjsembed-5.78.0.tar.xz"; + sha256 = "0r8hxbqn5k0wsk4swym7hi15mnhd9dyvcgz8lycqnvlrz0walvr9"; + name = "kjsembed-5.78.0.tar.xz"; }; }; kmediaplayer = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz"; - sha256 = "3185da877c2529c6e209cb382593bbb4778f80aee1b1a29b384b3f05ff99ed89"; - name = "kmediaplayer-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kmediaplayer-5.78.0.tar.xz"; + sha256 = "0yy0k2cgchj1pnk2q7gq4iihscf6rgiwdpfn6i0i8zcczkm2gyls"; + name = "kmediaplayer-5.78.0.tar.xz"; }; }; knewstuff = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz"; - sha256 = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b"; - name = "knewstuff-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/knewstuff-5.78.0.tar.xz"; + sha256 = "1fb1ka7ljfw4wyf8sy0r5vy9nmji286p26wjzgsf2rzzskaspc6m"; + name = "knewstuff-5.78.0.tar.xz"; }; }; knotifications = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knotifications-5.76.0.tar.xz"; - sha256 = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2"; - name = "knotifications-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/knotifications-5.78.0.tar.xz"; + sha256 = "0f93xql467jbz964lpjrsip77wf0s8qygggkjb85y8xgpcdw4zrr"; + name = "knotifications-5.78.0.tar.xz"; }; }; knotifyconfig = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz"; - sha256 = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e"; - name = "knotifyconfig-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/knotifyconfig-5.78.0.tar.xz"; + sha256 = "0nzs76ii447xv3dqcg14a045xc74bnvwghfdmlb0vmh22p3a60fz"; + name = "knotifyconfig-5.78.0.tar.xz"; }; }; kpackage = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpackage-5.76.0.tar.xz"; - sha256 = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772"; - name = "kpackage-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kpackage-5.78.0.tar.xz"; + sha256 = "0d0vfh3ifaj2xifw370rfapw2yf24h7f8xwbhmx787dr6w86m47c"; + name = "kpackage-5.78.0.tar.xz"; }; }; kparts = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kparts-5.76.0.tar.xz"; - sha256 = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d"; - name = "kparts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kparts-5.78.0.tar.xz"; + sha256 = "1np1vshzihh2r51gzy54yvm6h898ffw5b20c3r6jaa0837g3mlvp"; + name = "kparts-5.78.0.tar.xz"; }; }; kpeople = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpeople-5.76.0.tar.xz"; - sha256 = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545"; - name = "kpeople-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kpeople-5.78.0.tar.xz"; + sha256 = "0ccc10qfhw69s12sfgpql988pf7pssx9k8j9xcywil4y7xidk05i"; + name = "kpeople-5.78.0.tar.xz"; }; }; kplotting = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kplotting-5.76.0.tar.xz"; - sha256 = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e"; - name = "kplotting-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kplotting-5.78.0.tar.xz"; + sha256 = "00wd3rgp4c0sngfbdz613792sidsykbnazsq05lf4pk46py4xcvc"; + name = "kplotting-5.78.0.tar.xz"; }; }; kpty = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpty-5.76.0.tar.xz"; - sha256 = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7"; - name = "kpty-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kpty-5.78.0.tar.xz"; + sha256 = "1nhijlp98bnnqj9c0i3g1xfpdhghw7241av4wzwhhxny67addlf3"; + name = "kpty-5.78.0.tar.xz"; }; }; kquickcharts = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz"; - sha256 = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2"; - name = "kquickcharts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kquickcharts-5.78.0.tar.xz"; + sha256 = "1zq5bp3w42sqvlvkc7vx6l7h142ihzgzqpa2435j9apvx0kvjqhp"; + name = "kquickcharts-5.78.0.tar.xz"; }; }; kross = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz"; - sha256 = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291"; - name = "kross-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kross-5.78.0.tar.xz"; + sha256 = "07ylcvkz5xf6b9n65373a8zpp5nsby5c99l912bdxf05hrjcw8b1"; + name = "kross-5.78.0.tar.xz"; }; }; krunner = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/krunner-5.76.0.tar.xz"; - sha256 = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda"; - name = "krunner-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/krunner-5.78.0.tar.xz"; + sha256 = "00hy62g9i9vdzgv9ljfqjv0m45lrsmxynmp3fyp5c3amj9r64pkm"; + name = "krunner-5.78.0.tar.xz"; }; }; kservice = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kservice-5.76.0.tar.xz"; - sha256 = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf"; - name = "kservice-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kservice-5.78.0.tar.xz"; + sha256 = "181maly1xij1jp7f0x9ajbv5q6qszqd273sdz1snkg5j4398mric"; + name = "kservice-5.78.0.tar.xz"; }; }; ktexteditor = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz"; - sha256 = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2"; - name = "ktexteditor-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/ktexteditor-5.78.0.tar.xz"; + sha256 = "1r148n3nx3jyw2vn4rfxdl2mkywr5fn78s5ya7vq44pw2bmwar2n"; + name = "ktexteditor-5.78.0.tar.xz"; }; }; ktextwidgets = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz"; - sha256 = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84"; - name = "ktextwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/ktextwidgets-5.78.0.tar.xz"; + sha256 = "1gpqxvlmqm5nj5kgx2dmvl8ynjqw995wnpl9ja5c82d8bczkn4z8"; + name = "ktextwidgets-5.78.0.tar.xz"; }; }; kunitconversion = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz"; - sha256 = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c"; - name = "kunitconversion-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kunitconversion-5.78.0.tar.xz"; + sha256 = "17a3lpc60qn9qd53mlrjxwg5gyqvq0vnnz9wdrak481nf2c0qycc"; + name = "kunitconversion-5.78.0.tar.xz"; }; }; kwallet = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwallet-5.76.0.tar.xz"; - sha256 = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc"; - name = "kwallet-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwallet-5.78.0.tar.xz"; + sha256 = "1a8n5d9y9qwcb4d9zbr1xhk3w390n7f6mmx52nq5akna51zrjc4p"; + name = "kwallet-5.78.0.tar.xz"; }; }; kwayland = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwayland-5.76.0.tar.xz"; - sha256 = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7"; - name = "kwayland-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwayland-5.78.0.tar.xz"; + sha256 = "052avcafjnib55s2lp1fzhx7dk9mlyg4v143gfp9j8wvlqaa8sxb"; + name = "kwayland-5.78.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz"; - sha256 = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6"; - name = "kwidgetsaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwidgetsaddons-5.78.0.tar.xz"; + sha256 = "0b2y9ilk2zz4zw2m1lcwrmn3hni5jh6kalclx5l9fi98686b1az4"; + name = "kwidgetsaddons-5.78.0.tar.xz"; }; }; kwindowsystem = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz"; - sha256 = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7"; - name = "kwindowsystem-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwindowsystem-5.78.0.tar.xz"; + sha256 = "003jypnib16qpm7l76zqbhhbqq2g23hm245l9dskbansxpncmfbc"; + name = "kwindowsystem-5.78.0.tar.xz"; }; }; kxmlgui = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz"; - sha256 = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82"; - name = "kxmlgui-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kxmlgui-5.78.0.tar.xz"; + sha256 = "05yxgxbvv8anl4m40jwwfx183y69fdljj4g7daip0nk7hs4vc37q"; + name = "kxmlgui-5.78.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz"; - sha256 = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de"; - name = "kxmlrpcclient-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kxmlrpcclient-5.78.0.tar.xz"; + sha256 = "0591c23sjwfhrf7d7z6bgikjal1h70vpjx7xmr1ypwck6pxj8z2x"; + name = "kxmlrpcclient-5.78.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz"; - sha256 = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1"; - name = "modemmanager-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/modemmanager-qt-5.78.0.tar.xz"; + sha256 = "09y3pjav7dzfmplacwn0j281d59rdhlad16myaxh6hbf9zdkmnyr"; + name = "modemmanager-qt-5.78.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz"; - sha256 = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90"; - name = "networkmanager-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/networkmanager-qt-5.78.0.tar.xz"; + sha256 = "0wfyczlki8sb2wydyslpi111y4hfc6xvnar8cxj75bsn83pd9wya"; + name = "networkmanager-qt-5.78.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz"; - sha256 = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1"; - name = "oxygen-icons5-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/oxygen-icons5-5.78.0.tar.xz"; + sha256 = "1xp3zg59srxfc0z5cf45x7am98rsjq3p3ms2975il03389w55kr9"; + name = "oxygen-icons5-5.78.0.tar.xz"; }; }; plasma-framework = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz"; - sha256 = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a"; - name = "plasma-framework-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/plasma-framework-5.78.0.tar.xz"; + sha256 = "10c4d7mvnjdpjcjzxy8r5k1h3pxw9d4h9ii8bkngb2kjfblf3bj6"; + name = "plasma-framework-5.78.0.tar.xz"; }; }; prison = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/prison-5.76.0.tar.xz"; - sha256 = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78"; - name = "prison-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/prison-5.78.0.tar.xz"; + sha256 = "0ygsdjcxr7l7jgllf6c38rbpc4byikg7zx71dzmas7ikg4axylfk"; + name = "prison-5.78.0.tar.xz"; }; }; purpose = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/purpose-5.76.0.tar.xz"; - sha256 = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d"; - name = "purpose-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/purpose-5.78.0.tar.xz"; + sha256 = "13v2w4kx7ir9wqyahn6rlq7li7kxigxppffjccwpfihzpnyig029"; + name = "purpose-5.78.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz"; - sha256 = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3"; - name = "qqc2-desktop-style-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/qqc2-desktop-style-5.78.0.tar.xz"; + sha256 = "0a9kxfrvx0qv079vd9vx4924vs5g8qbicdp1wfv3c80ilbmn1sik"; + name = "qqc2-desktop-style-5.78.0.tar.xz"; }; }; solid = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/solid-5.76.0.tar.xz"; - sha256 = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d"; - name = "solid-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/solid-5.78.0.tar.xz"; + sha256 = "1qgx9fsaxsypjfzyp3dq79skp7vhhv59ssqb1aq4168gdsai15qj"; + name = "solid-5.78.0.tar.xz"; }; }; sonnet = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/sonnet-5.76.0.tar.xz"; - sha256 = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b"; - name = "sonnet-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/sonnet-5.78.0.tar.xz"; + sha256 = "1jw00bkhjf029yr6qh7mkdpizcc96103fsf68ydkbykfqsb0xry2"; + name = "sonnet-5.78.0.tar.xz"; }; }; syndication = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/syndication-5.76.0.tar.xz"; - sha256 = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292"; - name = "syndication-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/syndication-5.78.0.tar.xz"; + sha256 = "0sy2419xrkb5yqj70x2gakb53hqz7j5631pjkvai92gvk01bcbd1"; + name = "syndication-5.78.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz"; - sha256 = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3"; - name = "syntax-highlighting-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/syntax-highlighting-5.78.0.tar.xz"; + sha256 = "1m6ngf6nij3p09p7dhngjr9jhmc6dl12vd2x4dkj5fs8wlfbfplb"; + name = "syntax-highlighting-5.78.0.tar.xz"; }; }; threadweaver = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz"; - sha256 = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039"; - name = "threadweaver-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/threadweaver-5.78.0.tar.xz"; + sha256 = "1llqfmpbq0mysa1h7vx16v020zw776sqkrh85kah9478bj7ffwnr"; + name = "threadweaver-5.78.0.tar.xz"; }; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix index 837333407b2..315a38197a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/kpmcore/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = with lib.maintainers; [ peterhoeg ]; # The build requires at least Qt 5.14: diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix index 129b5785198..66bdcc03b96 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/lcms2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 8a9c80a6175..61d87211e0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libaom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libaom/default.nix index e35f8385915..5483909689d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "2.0.0"; + version = "2.0.2"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy"; + sha256 = "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0"; }; patches = [ ./outputs.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libav/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libav/default.nix index ad95edb68cb..a3de9225d1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libav/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libav/default.nix @@ -61,7 +61,7 @@ let "--enable-avplay" "--enable-shared" "--enable-runtime-cpudetect" - "--cc=cc" + "--cc=${stdenv.cc.targetPrefix}cc" (enableFeature enableGPL "gpl") (enableFeature enableGPL "swscale") (enableFeature mp3Support "libmp3lame") diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix index 8c33e6f1b6d..173422fa71e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"; + sha256 = "sha256-7p0w94Od33vjTI5wGLxmDC5P2hebAl7OwJPl1lANhKs="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix index ef9823130f4..c7d48468336 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libbap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libbap/default.nix index 7c458bae19c..b8e71c2dfd3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 11a65006422..584ea93293e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index a84f010b9e6..7ce8d6e7f83 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libcdr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcdr/default.nix index 087c928b79c..b987c3dbb25 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcdr/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix index 341754376aa..cb494f69fd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix index bd8e8bd4aaf..81b84e0f181 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s="; + sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcommuni/default.nix index 0b0cc325a35..532c91a0eda 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcommuni/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcommuni/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ]; + dontWrapQtApps = true; + preConfigure = '' sed -i -e 's|/bin/pwd|pwd|g' configure ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcutl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libcutl/default.nix index 7a5c3984929..ed6aae0f308 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libcutl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdatrie/default.nix index f4e2df36d91..257673b1a96 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdatrie/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix index e44f3e37d20..75d4f76b31f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_DOC=OFF" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 5ce811e9fea..7219bcbdeb5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdmtx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdmtx/default.nix index 994f010252f..c26ccc347f9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdmtx/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix index e575624f815..b4ba311165a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix index c3a4986c832..d4a8b8f6f21 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libetpan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libetpan/default.nix index b4b48dcb777..572c90b27b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libetpan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libetpan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, fetchpatch , autoconf, automake, libtool, openssl, pkg-config }: @@ -13,6 +13,28 @@ stdenv.mkDerivation rec { sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; }; + patches = [ + # The following two patches are fixing CVE-2020-15953, as reported in the + # issue tracker: https://github.com/dinhvh/libetpan/issues/386 + # They might be removed for the next version bump. + + # CVE-2020-15953: Detect extra data after STARTTLS response and exit + # https://github.com/dinhvh/libetpan/pull/387 + (fetchpatch { + name = "cve-2020-15953-imap.patch"; + url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch"; + sha256 = "1h9ds2z4jii40a0i3z6hsnzx1ldmd2jqidsxp2y2ksyp1ijcgabn"; + }) + + # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit + # https://github.com/dinhvh/libetpan/pull/388 + (fetchpatch { + name = "cve-2020-15953-pop3-smtp.patch"; + url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch"; + sha256 = "0lq829djar7nb3fai3vdzirmks3w2lfagzqc809lx2lln6y213a0"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ openssl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix index daae6984ab2..33b3f0b32e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libevdev/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch new file mode 100644 index 00000000000..134c64441d3 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix index f3f89209707..36f956e7772 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch index 84ee18084c2..7dfad497800 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index 170bb116a8a..ced1c3e7bb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl, coreutils }: stdenv.mkDerivation rec { pname = "libfaketime"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz"; - sha256 = "18s2hjm4sbrlg6sby944z87yslnq9s85p7j892hyr42qrlvq4a06"; + sha256 = "sha256-V9AYEVA2HAqbXI7vBbETkvYTStosLZmOkuY9rtY5ZHw="; }; 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/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch new file mode 100644 index 00000000000..b88245dfe8f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix index f3f7313accb..979ba7eea53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index 69b7bdc7d1e..a666a7db523 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 6c6d73740f2..80cd5bc13cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -1,18 +1,27 @@ { lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap -, buildPackages +, buildPackages, fetchpatch }: assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.7"; + version = "1.9.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3"; + 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,8 +36,10 @@ 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 "--disable-asm"; + ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 # Necessary to generate correct assembly when compiling for aarch32 on # aarch64 diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index 88ba7dacc22..31a9579a892 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index 39d0b185660..da53a9916d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.38"; + version = "1.41"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q"; + sha256 = "0hi7jbcs1l9kxzhiqcs2iivsb048642mwaimgqyh1hy3bas7ic34"; }; postPatch = '' @@ -66,7 +66,8 @@ in stdenv.mkDerivation (rec { doCheck = true; # not cross meta = with lib; { - homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; + homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; description = "A small library that defines common error values for all GnuPG components"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 5ab6dde09d7..43092f71c57 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -9,7 +9,6 @@ , docbook_xsl , docbook_xml_dtd_43 , gtk3 -, gnome3 , glade , dbus , xvfb_run diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libheif/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libheif/default.nix index b0872b9da1e..71dfca5e643 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhsts/default.nix new file mode 100644 index 00000000000..df53e7d294f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhsts/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitLab, fetchurl, autoconf-archive, autoreconfHook, pkg-config, python3 }: +let + chromium_version = "90.0.4417.1"; + + hsts_list = fetchurl { + url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json"; + sha256 = "09f24n30x5dmqk8zk7k2glcilgr27832a3304wj1yp97158sqsfx"; + }; + +in +stdenv.mkDerivation rec { + pname = "libhsts"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "rockdaboot"; + repo = pname; + rev = "libhsts-${version}"; + sha256 = "0gbchzf0f4xzb6zjc56dk74hqrmdgyirmgxvvsqp9vqn9wb5kkx4"; + }; + + postPatch = '' + pushd tests + cp ${hsts_list} transport_security_state_static.json + sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json + popd + patchShebangs src/hsts-make-dafsa + ''; + + nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config python3 ]; + + outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Library to easily check a domain against the Chromium HSTS Preload list"; + homepage = "https://gitlab.com/rockdaboot/libhsts"; + license = with licenses; [ mit bsd3 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libhsts/update.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhsts/update.sh new file mode 100755 index 00000000000..f80966e08c9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libhsts/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -euo pipefail -x + +cd "$(dirname "$0")" + +chromium_version=$(curl -s "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') +sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json") + +sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \ + -e "0,/sha256/s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + --in-place ./default.nix diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libical/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libical/default.nix index 7f5e739a99c..fa396e96650 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 83a5a462ee0..1c8502da492 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "1543h1i59k2hbj2g8shcl8fvhz2silipacynwjgw412r38hkr33j"; + sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ="; }; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 2426dfebe8a..f2d4e00d1aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libjwt/default.nix new file mode 100644 index 00000000000..9c7d624e7f6 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libktorrent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libktorrent/default.nix index 610efa7ed4f..825fe87fe2f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libktorrent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libktorrent/default.nix @@ -27,6 +27,8 @@ in stdenv.mkDerivation rec { inherit mainVersion; }; + dontWrapQtApps = true; + meta = with lib; { description = "A BitTorrent library used by KTorrent"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblastfm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblastfm/default.nix index 10cdb301479..5183c47bc06 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblastfm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblastfm/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 3989cc59e4d..caf03696013 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -13,6 +13,12 @@ in stdenv.mkDerivation rec { sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj"; }; + postPatch = '' + substituteInPlace blas/Makefile \ + --replace "ar rcv" "${stdenv.cc.targetPrefix}ar rcv" \ + --replace "ranlib" "${stdenv.cc.targetPrefix}ranlib" + ''; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index 078865198a4..05ae1af2e25 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo="; + sha256 = "sha256-UjcHbSUKX3wpfjMcNaQz7qrw3CBeBw5Ns1PJuhDzQKI="; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 850c7aa1df0..9695b221cb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnbd/default.nix new file mode 100644 index 00000000000..6ad0435a84e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index 025ddf8e7b1..44f0f8d62ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.1.8"; + version = "1.1.9"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4"; + sha256 = "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libnixxml/default.nix index abbffcf0f94..40459dbca22 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libnixxml/default.nix +++ b/infra/libkookie/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="; }; + + preConfigure = '' + ./bootstrap + ''; + configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + doCheck = false; - postPatch = '' - ./bootstrap - ''; 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/infra/libkookie/nixpkgs/pkgs/development/libraries/libofx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libofx/default.nix index 10197bd8db0..f46a2039464 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libofx/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix deleted file mode 100644 index 1cbfe44ef4e..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix new file mode 100644 index 00000000000..e024874eabe --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libpcap/default.nix index 0b30bf6c2b0..c04d4a001a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index a5b6e3b117e..e55cda51748 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,20 +3,19 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8="; + sha256 = "sha256-VlKJrGZOMmnWFmdwV3SchBfyRsHM78eNV+uWONLZbJI="; }; outputs = [ "out" "dev" "doc" ]; 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/infra/libkookie/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix index 4fc50f20730..65d7a83a838 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase libGLU ] ++ lib.optional stdenv.isDarwin AGL; + dontWrapQtApps = true; + postPatch = '' cd QGLViewer ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 7bd3fa97029..42d8cbf2859 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 10b2451e7c8..24cd29dcb10 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ="; + sha256 = "sha256-TAfo4BkNHE8r32FPT2iDjddq2lk1yC9DrRGZurSO48c="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 82761dc3d00..7d9aa52e596 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.41.0"; + version = "2.42.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0ngv9fgja72vg7hq1aiwpa7x4dhniawhpd8mqm85pqkjxiph8s1k"; + sha256 = "sha256-8r8j0g7EaSUWujX+BNdkIJhzaLITMLsozjhOtQBriTA="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/librep/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/librep/default.nix index 74c45f00adc..cd007c5fe57 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/librep/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libressl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libressl/default.nix index d67342eebc1..b7724d27a06 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/librseq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/librseq/default.nix index 12b9b4109c7..82e6c54bb2c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/librseq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/librseq/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Userspace library for the Linux Restartable Sequence API"; homepage = "https://github.com/compudj/librseq"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix index c810034f847..1e5cdb38948 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libshout/default.nix @@ -4,11 +4,11 @@ # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.4"; + name = "libshout-2.4.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"; + sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index eac383fae0d..c933d92f325 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix index 20cb80b1ff8..4189ba9c6fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libsodium/default.nix index db2cd044592..64ae1713fd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch new file mode 100644 index 00000000000..2c315067f41 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libspnav/default.nix new file mode 100644 index 00000000000..9bd0a67041b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libthai/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libthai/default.nix index ad00906bb8c..97745813ef2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libthai/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix index d69c8d670c4..69410cf2b98 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libuv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libuv/default.nix index a4447ed3378..6b1a0120e49 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 100f79ae4e8..0ec0b0693a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchgit , makeWrapper, autoreconfHook, fetchpatch -, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils +, coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils , iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { buildInputs = [ bash-completion pkg-config - libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl + libxml2 gnutls perl python3 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ audit libpciaccess lvm2 util-linux systemd libnl numad zfs @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - patchShebangs . # fixes /usr/bin/python references + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix index f4418ec1bc4..88b1f327145 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.7"; + version = "1.8"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-kF4Q3ACiVlUbEjS2YqwHA42QknKMLqX9US31PmXtS/I="; + sha256 = "sha256-vkBkOE4aVX/6xKjslkqlZkh5jdYVEawvvBLpj8PpuiA="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwnck/default.nix index c0019ee268a..fd7d80574a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -23,5 +23,8 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libwnck"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ johnazoidberg ]; + # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found + # #include + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxc/default.nix index 0a93babb459..f78cd09c0ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.0"; + version = "5.1.2"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7"; + sha256 = "1bcj7x0kaal62m41v9hxb4h1d2cxs2ynvsfqqg7c5yi7829nvapb"; }; buildInputs = [ gfortran ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix new file mode 100644 index 00000000000..4df5bde2287 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index c0785b34e89..70dd9cb7bbf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -2,6 +2,8 @@ , xkeyboard_config, libxcb, libxml2 , python3 , libX11 +# To enable the "interactive-wayland" subcommand of xkbcli: +, withWaylandSupport ? false, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,18 +15,23 @@ stdenv.mkDerivation rec { sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852"; }; + patches = [ + ./fix-cross-compilation.patch + ]; + outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]; - buildInputs = [ xkeyboard_config libxcb libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] + ++ lib.optional withWaylandSupport wayland; + buildInputs = [ xkeyboard_config libxcb libxml2 ] + ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; checkInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dx-locale-root=${libX11.out}/share/X11/locale" - "-Denable-wayland=false" - "-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output) + "-Denable-wayland=${lib.boolToString withWaylandSupport}" ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch new file mode 100644 index 00000000000..55730554a90 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index 47c436f..536c60b 100644 +--- a/meson.build ++++ b/meson.build +@@ -440,13 +440,12 @@ if build_tools + if get_option('enable-wayland') + wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) + wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) +- wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) +- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() ++ if not wayland_client_dep.found() or not wayland_protocols_dep.found() + error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. + You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') + endif + +- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner = find_program('wayland-scanner', native: true) + wayland_scanner_code_gen = generator( + wayland_scanner, + output: '@BASENAME@-protocol.c', diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxslt/default.nix index eff9f2b2b79..650e17d3179 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt +{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2.dev ] ++ lib.optional stdenv.isDarwin gettext - ++ lib.optionals pythonSupport [ libxml2.py python ] + ++ lib.optionals pythonSupport [ libxml2.py python3 ] ++ lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ lib.optional pythonSupport "--with-python=${python}" + ] ++ lib.optional pythonSupport "--with-python=${python3}" ++ lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python.libPrefix} "$py" + moveToOutput ${python3.libPrefix} "$py" ''; passthru = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libzip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libzip/default.nix index c65a9b6f583..ddefa16c2c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchurl, cmake, perl, zlib }: +{ lib, stdenv +, cmake +, fetchpatch +, fetchurl +, perl +, zlib +}: stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.1"; + version = "1.7.3"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; + sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf"; }; - # Fix pkg-config file paths - postPatch = '' - sed -i CMakeLists.txt \ - -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ - -e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#' - ''; + # Remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch"; + sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a"; + }) + ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/lime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/lime/default.nix index 3a16b5202c4..e6996a53c83 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/log4cplus/default.nix index 1e16ee96ae7..e9ef841b65d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/log4cplus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - name = "log4cplus-2.0.5"; + name = "log4cplus-2.0.6"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "05gb0crf440da3vcaxavglzvsldw8hsvxq3xvvj73mzniv3bz3dk"; + sha256 = "sha256-GpY6/Q+IPWLelGsYkn0jgFH9R5NuQV6r7/4rE5fxbso="; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix new file mode 100644 index 00000000000..e98903e3a83 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix new file mode 100644 index 00000000000..1740b9ae580 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/maxflow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/maxflow/default.nix new file mode 100644 index 00000000000..9c53a16d372 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 3cda9ff3006..6cdc24770d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch new file mode 100644 index 00000000000..e60a4ffa308 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch @@ -0,0 +1,33 @@ +From 8ac29b952e638ec1ea8c3734a3b91253e50c336d Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Sun, 24 Jan 2021 21:10:29 -0800 +Subject: [PATCH 4/4] Hack to address build failure when using newer macOS SDKs + with older deployment targets + +Signed-off-by: Jeremy Huddleston Sequoia +--- + include/c11/threads_posix.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h +index 45cb6075e6e..355d725f7da 100644 +--- a/include/c11/threads_posix.h ++++ b/include/c11/threads_posix.h +@@ -382,7 +382,13 @@ tss_set(tss_t key, void *val) + + /*-------------------- 7.25.7 Time functions --------------------*/ + // 7.25.6.1 +-#ifndef HAVE_TIMESPEC_GET ++#if !defined(HAVE_TIMESPEC_GET) || defined(__APPLE__) ++ ++#ifdef __APPLE__ ++#include ++#define timespec_get(ts, b) mesa_timespec_get(ts, b) ++#endif ++ + static inline int + timespec_get(struct timespec *ts, int base) + { +-- +2.29.2 (Apple Git-129) + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix index 11d6cdd1b2a..e7c87bbc2c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.3"; + version = "20.3.4"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0mnic7mfv5lgnn3swj7lbif8bl8pi2czlgr01jhq5s9q90nj2kpp"; + sha256 = "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"; }; prePatch = "patchShebangs ."; @@ -65,6 +65,10 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) + ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. + # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 + ./aarch64-darwin.patch ]; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/muparserx/default.nix index ef6b254b8a3..4d3036d4cfb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/muparserx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + # selftest fails + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/mysocketw/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/mysocketw/default.nix index 3b5da68a59d..52d294525a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/mysocketw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/mysocketw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - makeFlags = [ "PREFIX=$(out)" "CXX=c++" ]; + makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/neardal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/neardal/default.nix index 5e02a9fd522..43f63d91a61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/neardal/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix new file mode 100644 index 00000000000..5a680b9da9a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/notcurses/default.nix index 7b9bffb9bc9..09169019a12 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix index 8c98d7ae9bb..7b02e3497f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib +, sqlite, ninja +, darwin, fixDarwinDylibNames, buildPackages +, useP11kit ? true, p11-kit , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -139,6 +142,11 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; + postInstall = lib.optionalString useP11kit '' + # Replace built-in trust with p11-kit connection + ln -sf ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi.so + ''; + postFixup = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix index 23d82d4ba2f..ee3cf93bc21 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { else "generic" # "chooses options that should be OK for most platforms" }" - "CXX=c++" + "CXX=${stdenv.cc.targetPrefix}c++" ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix index 58e5e401359..f9ae9d5ffe6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-l6rG8f+JAWfAJxEZPKRHZo2k8x9WbtSJC3gGCSMHYfs="; + sha256 = "sha256-1k+AWmpAiHcQVEB5kUaMtNWhOnTBnmJiNU8zL1J/PEk="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix index 4386542ff20..ab09931579c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/oatpp/default.nix index 084f3c4a935..e9f92a31f2c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/oatpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/oatpp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "oatpp"; - version = "1.2.0"; + version = "1.2.5"; src = fetchFromGitHub { owner = "oatpp"; repo = "oatpp"; rev = version; - sha256 = "05rm0m5zf1b5ky8prf6yni2074bz6yjjbrc2qk96fb48fc1198gw"; + sha256 = "sha256-Vtdz03scx0hvY1yeM7yfSxCVKzi84OQ1Oh9b922movE="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix index b79de9278d4..251a3f9f55b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; - makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"]; postFixup = '' ${lib.optionalString (stdenv.isLinux) '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix index 4fbc34bcce6..ca3a081aee0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.1"; + version = "3.2.2"; - src = fetchurl { - url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr"; + src = fetchFromGitLab { + domain = "gitlab.matrix.org"; + owner = "matrix-org"; + repo = pname; + rev = version; + sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy"; }; nativeBuildInputs = [ cmake ]; doCheck = true; - meta = { + meta = with lib; { description = "Implements double cryptographic ratchet and Megolm ratchet"; - license = lib.licenses.asl20; homepage = "https://gitlab.matrix.org/matrix-org/olm"; - platforms = with lib.platforms; darwin ++ linux; + license = licenses.asl20; + maintainers = with maintainers; [ tilpner oxzi ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 2b399e9ebc2..c87fc4fca79 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq"; + sha256 = "sha256-PZ8r1eNfz4dVxlbtQJSrxiw/Hk6E6wSDapkMy7ux9fI="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix index 1ef27bf5831..d7a8b4497f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Khronos OpenCL headers version ${version}"; homepage = "https://www.khronos.org/registry/cl/"; - license = licenses.mit; + license = licenses.asl20; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencsg/default.nix index 53adbdf414f..7625db9a595 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opencsg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/opencsg/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { rmdir $out/bin || true ''; + dontWrapQtApps = true; + postFixup = lib.optionalString stdenv.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix index a71b2a61910..44a0e017a2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index 8eeff3de943..da7e9c755a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix index ce4374be331..2edf02e738f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 9228424797e..83eb77b603c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/ortp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/ortp/default.nix index 196cac4bcaf..d9d26d0b537 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix index 17a3af68a80..9ba581e3a40 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osm-gps-map"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; - sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9"; + sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index 249ce4e3629..3e21415b4c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { # on system paths being set. patches = [ ./gst-plugin-paths.patch ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE = let gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 07e6ccf1f34..b874c2e1d01 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { extra-cmake-modules ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix index 88a6af658dd..877bf973194 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + dontWrapQtApps = true; + preConfigure = '' cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index 5646f4e02ba..4c6906c9c2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -70,8 +70,8 @@ in { name = "G4PARTICLEXS"; - version = "3.1"; - sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0"; + version = "3.1.1"; + sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6"; envvar = "PARTICLEXS"; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 159c746fecd..8d2f2f1ef55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -21,6 +21,7 @@ # For enableQT. , qtbase +, wrapQtAppsHook # For enableXM. , motif @@ -48,12 +49,12 @@ let in stdenv.mkDerivation rec { - version = "10.7.0"; + version = "10.7.1"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz"; - sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz"; + sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; @@ -87,7 +88,13 @@ stdenv.mkDerivation rec { "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals enableQT [ + wrapQtAppsHook + ]; + + dontWrapQtApps = !enableQT; buildInputs = [ libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] @@ -101,6 +108,8 @@ stdenv.mkDerivation rec { postFixup = '' # Don't try to export invalid environment variables. sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh + '' + lib.optionalString enableQT '' + wrapQtAppsHook ''; setupHook = ./geant4-hook.sh; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index d3f6bcb7474..0a7e9b4d948 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index ce905bff17c..7cacab9bdf4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { mathastext pgf relsize + sansmath sfmath siunitx xcolor diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix index d5a272955f4..ed92889b5b2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix index fdd45b4bb0d..fc566d91e91 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -19,13 +19,16 @@ , libsndfile , vulkan-headers , vulkan-loader +, ncurses , makeFontsConf , callPackage , nixosTests +, withMediaSession ? true , gstreamerSupport ? true, gst_all_1 ? null , ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null +, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null, fdk_aac ? null , nativeHspSupport ? true +, nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true }: @@ -36,111 +39,117 @@ let }; mesonBool = b: if b then "true" else "false"; -in -stdenv.mkDerivation rec { - pname = "pipewire"; - version = "0.3.18"; - - outputs = [ - "out" - "lib" - "pulse" - "jack" - "dev" - "doc" - "installedTests" - ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "pipewire"; - rev = version; - sha256 = "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g"; - }; - patches = [ - # Break up a dependency cycle between outputs. - ./alsa-profiles-use-libdir.patch - # Move installed tests into their own output. - ./installed-tests-path.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./pipewire-pulse-path.patch - # Add flag to specify configuration directory (different from the installation directory). - ./pipewire-config-dir.patch - ]; - - nativeBuildInputs = [ - doxygen - graphviz - meson - ninja - pkg-config - ]; - - buildInputs = [ - alsaLib - dbus - glib - libjack2 - libsndfile - udev - vulkan-headers - vulkan-loader - valgrind - systemd - ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] - ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dman=false" # we don't have xmltoman - "-Dexamples=true" # only needed for `pipewire-media-session` - "-Dudevrulesdir=lib/udev/rules.d" - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" - "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dgstreamer=${mesonBool gstreamerSupport}" - "-Dffmpeg=${mesonBool ffmpegSupport}" - "-Dbluez5=${mesonBool bluezSupport}" - "-Dbluez5-backend-native=${mesonBool nativeHspSupport}" - "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" - "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" - "-Dpipewire_config_dir=/etc/pipewire" - ]; - - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - - doCheck = true; - - postInstall = '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "bin/pipewire-pulse" "$pulse" - ''; - - passthru.tests = { - installedTests = nixosTests.installed-tests.pipewire; - - # This ensures that all the paths used by the NixOS module are found. - test-paths = callPackage ./test-paths.nix { - paths-out = [ - "share/alsa/alsa.conf.d/50-pipewire.conf" - ]; - paths-lib = [ - "lib/alsa-lib/libasound_module_pcm_pipewire.so" - "share/alsa-card-profile/mixer" - ]; + self = stdenv.mkDerivation rec { + pname = "pipewire"; + version = "0.3.21"; + + outputs = [ + "out" + "lib" + "pulse" + "jack" + "dev" + "doc" + "mediaSession" + "installedTests" + ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "pipewire"; + rev = version; + hash = "sha256:2YJzPTMPIoQQeNja3F53SD4gtpdSlbD/i77hBWiQfuQ="; }; - }; - meta = with lib; { - description = "Server and user space API to deal with multimedia pipelines"; - homepage = "https://pipewire.org/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar ]; + patches = [ + # Break up a dependency cycle between outputs. + ./alsa-profiles-use-libdir.patch + # Move installed tests into their own output. + ./installed-tests-path.patch + # Change the path of the pipewire-pulse binary in the service definition. + ./pipewire-pulse-path.patch + # Add flag to specify configuration directory (different from the installation directory). + ./pipewire-config-dir.patch + ]; + + nativeBuildInputs = [ + doxygen + graphviz + meson + ninja + pkg-config + ]; + + buildInputs = [ + alsaLib + dbus + glib + libjack2 + libsndfile + ncurses + udev + vulkan-headers + vulkan-loader + valgrind + systemd + ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dman=false" # we don't have xmltoman + "-Dexamples=${mesonBool withMediaSession}" # only needed for `pipewire-media-session` + "-Dudevrulesdir=lib/udev/rules.d" + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dpipewire_pulse_prefix=${placeholder "pulse"}" + "-Dlibjack-path=${placeholder "jack"}/lib" + "-Dgstreamer=${mesonBool gstreamerSupport}" + "-Dffmpeg=${mesonBool ffmpegSupport}" + "-Dbluez5=${mesonBool bluezSupport}" + "-Dbluez5-backend-hsp-native=${mesonBool nativeHspSupport}" + "-Dbluez5-backend-hfp-native=${mesonBool nativeHfpSupport}" + "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" + "-Dpipewire_config_dir=/etc/pipewire" + ]; + + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + doCheck = true; + + postInstall = '' + 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 = { + installedTests = nixosTests.installed-tests.pipewire; + + # This ensures that all the paths used by the NixOS module are found. + test-paths = callPackage ./test-paths.nix { + paths-out = [ + "share/alsa/alsa.conf.d/50-pipewire.conf" + ]; + paths-lib = [ + "lib/alsa-lib/libasound_module_pcm_pipewire.so" + "share/alsa-card-profile/mixer" + ]; + }; + }; + + meta = with lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = "https://pipewire.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; + }; }; -} + +in self diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch index 6ac86b111ee..99782e1bb21 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch @@ -1,19 +1,22 @@ diff --git a/meson_options.txt b/meson_options.txt -index 4b9e46b8..9d73ed06 100644 +index 050a4c31..c481e76c 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -147,3 +147,6 @@ option('pw-cat', +@@ -148,6 +148,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') + 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 29fc93d4..f78946f2 100644 +index 46dfbbc8..0d975cec 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build -@@ -6,7 +6,7 @@ install_data( +@@ -9,7 +9,7 @@ install_data( systemd_config = configuration_data() systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix new file mode 100644 index 00000000000..86ef2af96e7 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix deleted file mode 100644 index 0da6e15eb27..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix deleted file mode 100644 index be425b39401..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ /dev/null @@ -1,30 +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 ]; - - 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/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/0.61.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/0.61.nix index a49bfad7ab3..9b89283972d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/0.61.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/0.61.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/default.nix index 3f2b8453d7f..f3fae283e87 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "20.12.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0dbv1y9i5ahg6namz6gw2d0njnmrigr4a80dbxvnqad4q232banh"; + sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM="; }; outputs = [ "out" "dev" ]; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + dontWrapQtApps = true; + cmakeFlags = [ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/protolock/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/protolock/default.nix index ef1fa6efec7..7d423ac0347 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/pyotherside/default.nix index 58d38651a76..da327ae13fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/pyotherside/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/pyotherside/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { python3 qtbase qtquickcontrols qtsvg ncurses ]; + dontWrapQtApps = true; + patches = [ ./qml-path.patch ]; installTargets = [ "sub-src-install_subtargets" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/python-qt/default.nix index bd778f1a945..0fe0806b1eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "PYTHON_PATH=${python}/bin" "PYTHON_LIB=${python}/lib"]; + dontWrapQtApps = true; + unpackCmd = "unzip $src"; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index d1b545884b5..e53404557fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; + dontWrapQtApps = true; + # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin patches = lib.optional stdenv.isDarwin ./move-project.patch ; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix index 88c94543045..f5257ad0e8e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ qmake ]; buildInputs = [ qtdeclarative ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index 75f95a53800..7914af08df6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qoauth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qoauth/default.nix index 8afa19c229f..2b0be6f0b3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qoauth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qoauth/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; + dontWrapQtApps = true; + meta = with lib; { description = "Qt library for OAuth authentication"; inherit (qtbase.meta) platforms; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index 26a3c2e36d3..314bdabdb55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + dontWrapQtApps = true; postPatch = '' substituteInPlace qscintilla.pro \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/builder.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/builder.sh deleted file mode 100644 index 460ae17766a..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - - -preConfigure() { - - # Patch some of the configure files a bit to get of global paths. - # (Buildings using stuff in those paths will fail anyway, but it - # will cause ./configure misdetections). - for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do - echo "patching $i..." - substituteInPlace "$i" \ - --replace " /lib" " /FOO" \ - --replace "/usr" "/FOO" - done -} - - -# !!! TODO: -system-libmng -configureFlags="-prefix $out $configureFlags" -dontAddPrefix=1 - -configureScript=configureScript -configureScript() { - echo yes | ./configure $configureFlags - export LD_LIBRARY_PATH=$(pwd)/lib -} - - -postInstall() { - # Qt's `make install' is broken; it copies ./bin/qmake, which - # is a symlink to ./qmake/qmake. So we end up with a dangling - # symlink. - rm $out/bin/qmake - cp -p qmake/qmake $out/bin -} - - -genericBuild diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/default.nix deleted file mode 100644 index b2d818a2972..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, fetchurl -, xftSupport ? true, libXft ? null -, xrenderSupport ? true, libXrender ? null -, xrandrSupport ? true, libXrandr ? null -, xineramaSupport ? true, libXinerama ? null -, cursorSupport ? true, libXcursor ? null -, threadSupport ? true -, mysqlSupport ? false, libmysqlclient ? null -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGL ? null, libGLU ? null, libXmu ? null -, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which -}: - -assert xftSupport -> libXft != null; -assert xrenderSupport -> xftSupport && libXrender != null; -assert xrandrSupport -> libXrandr != null; -assert cursorSupport -> libXcursor != null; -assert mysqlSupport -> libmysqlclient != null; -assert openglSupport -> libGL != null && libGLU != null && libXmu != null; - -stdenv.mkDerivation { - name = "qt-3.3.8"; - - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2"; - sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; - }; - - nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; - - hardeningDisable = [ "format" ]; - - configureFlags = let - mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; - in [ - "-v" - "-system-zlib" "-system-libpng" "-system-libjpeg" - "-qt-gif" - "-I${xorgproto}/include" - (mk threadSupport "thread") - (mk xrenderSupport "xrender") - (mk xrandrSupport "xrandr") - (mk xineramaSupport "xinerama") - (mk xrandrSupport "xrandr") - (mk xftSupport "xft") - ] ++ lib.optionals openglSupport [ - "-dlopen-opengl" - "-L${libGL}/lib" "-I${libGLU}/include" - "-L${libXmu.out}/lib" "-I${libXmu.dev}/include" - ] ++ lib.optionals xrenderSupport [ - "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" - ] ++ lib.optionals xrandrSupport [ - "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - ] ++ lib.optionals xineramaSupport [ - "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" - ] ++ lib.optionals cursorSupport [ - "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" - ] ++ lib.optionals mysqlSupport [ - "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" - ] ++ lib.optionals xftSupport [ - "-L${libXft.out}/lib" "-I${libXft.dev}/include" - "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include" - "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include" - ]; - - patches = [ - # Don't strip everything so we can get useful backtraces. - ./strip.patch - - # Build on NixOS. - ./qt-pwd.patch - - # randr.h and Xrandr.h need not be in the same prefix. - ./xrandr.patch - - # Make it build with gcc 4.6.0 - ./qt3-gcc4.6.0.patch - ]; - - passthru = {inherit mysqlSupport;}; - - meta = with lib; { - license = with licenses; [ gpl2 qpl ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch deleted file mode 100644 index 763f785726b..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN qt-x11-free-3.3.3/configure qt-x11-free-3.3.3.new/configure ---- qt-x11-free-3.3.3/configure 2004-06-14 11:18:55.000000000 +0200 -+++ qt-x11-free-3.3.3.new/configure 2005-11-12 19:39:43.000000000 +0100 -@@ -16,9 +16,9 @@ - relconf=`basename $0` - # the directory of this script is the "source tree" - relpath=`dirname $0` --relpath=`(cd $relpath; /bin/pwd)` -+relpath=`(cd $relpath; pwd)` - # the current directory is the "build tree" or "object tree" --outpath=`/bin/pwd` -+outpath=`pwd` - - # later cache the command line in config.status - OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"` diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch deleted file mode 100644 index c1a903c130c..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -I picked it here: -https://bugs.archlinux.org/task/23915 - ---- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100 -@@ -50,6 +50,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include - #include - #include - #endif ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100 -@@ -48,6 +48,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include - #include - #include - #endif diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh deleted file mode 100644 index db1a2529ff5..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export QTDIR=@out@ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/strip.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/strip.patch deleted file mode 100644 index a0c9fa73889..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/strip.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rc qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf -*** qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf 2004-08-05 16:42:57.000000000 +0200 ---- qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf 2005-03-02 12:25:55.000000000 +0100 -*************** -*** 85,90 **** - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_STRIP = strip -! QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- 85,90 ---- - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_STRIP = strip -! QMAKE_STRIPFLAGS_LIB += --strip-debug - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch deleted file mode 100644 index 0389c7fdd06..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rc qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test qt-x11-free-3.3.6/config.tests/x11/xrandr.test -*** qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test 2006-09-14 14:00:08.000000000 +0200 ---- qt-x11-free-3.3.6/config.tests/x11/xrandr.test 2006-09-14 14:10:39.000000000 +0200 -*************** -*** 52,69 **** - INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include" - F= - for INCDIR in $INCDIRS; do -! if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then - F=yes -! XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 -! [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" - break - fi - done - if [ -z "$F" ] - then - XRANDR=no -! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" - fi - fi - ---- 52,69 ---- - INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include" - F= - for INCDIR in $INCDIRS; do -! if [ -f $INCDIR/$INC2 ]; then - F=yes -! # XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 -! [ "$VERBOSE" = "yes" ] && echo " Found $INC2 in $INCDIR" - break - fi - done - if [ -z "$F" ] - then - XRANDR=no -! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC2 anywhere in $INCDIRS" - fi - fi - diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index 261374b7d93..63e893ea69f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/infra/libkookie/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 @@ -136,7 +137,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -188,6 +189,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch new file mode 100644 index 00000000000..73463d7567a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 14b99fab4e2..45cf6209ea0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/infra/libkookie/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 @@ -149,7 +150,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -199,6 +200,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch new file mode 100644 index 00000000000..73463d7567a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 6333f889b68..fdb68d89bc3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/infra/libkookie/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 @@ -182,6 +183,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch new file mode 100644 index 00000000000..73463d7567a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 7f6ddb76ad5..741225a5aa8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -3,6 +3,9 @@ qmakeFlags=( ${qmakeFlags-} ) qmakePrePhase() { + qmakeFlags_orig=( "${qmakeFlags[@]}" ) + + # These flags must be added _before_ the flags specified in the derivation. qmakeFlags=( \ "PREFIX=$out" \ "NIX_OUTPUT_OUT=$out" \ @@ -11,8 +14,15 @@ qmakePrePhase() { "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ - "${qmakeFlags[@]}" \ ) + + if [ -n "@debug@" ]; then + qmakeFlags+=( "CONFIG+=debug" ) + else + qmakeFlags+=( "CONFIG+=release" ) + fi + + qmakeFlags+=( "${qmakeFlags_orig[@]}" ) } prePhases+=" qmakePrePhase" diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 9f2a9f06f1a..1b57d676e1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,3 +1,14 @@ +if [[ -n "${__nix_qtbase-}" ]]; then + # Throw an error if a different version of Qt was already set up. + if [[ "$__nix_qtbase" != "@dev@" ]]; then + echo >&2 "Error: detected mismatched Qt dependencies:" + echo >&2 " @dev@" + echo >&2 " $__nix_qtbase" + exit 1 + fi +else # Only set up Qt once. +__nix_qtbase="@dev@" + qtPluginPrefix=@qtPluginPrefix@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ @@ -5,6 +16,20 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ +# Disable debug symbols if qtbase was built without debugging. +# This stops -dev paths from leaking into other outputs. +if [ -z "@debug@" ]; then + NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" +fi + +# Integration with CMake: +# Set the CMake build type corresponding to how qtbase was built. +if [ -n "@debug@" ]; then + cmakeBuildType="Debug" +else + cmakeBuildType="Release" +fi + providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] } @@ -19,7 +44,12 @@ export QMAKEPATH QMAKEMODULES= export QMAKEMODULES +declare -Ag qmakePathSeen=() qmakePathHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qmakePathSeen[$1]-}" ]; then return; fi + qmakePathSeen[$1]=1 if [ -d "$1/mkspecs" ] then QMAKEMODULES="${QMAKEMODULES}${QMAKEMODULES:+:}/mkspecs" @@ -34,7 +64,12 @@ envBuildHostHooks+=(qmakePathHook) # package depending on the building package. (This is necessary in case # the building package does not provide runtime dependencies itself and so # would not be propagated to the user environment.) +declare -Ag qtEnvHostTargetSeen=() qtEnvHostTargetHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qtEnvHostTargetSeen[$1]-}" ]; then return; fi + qtEnvHostTargetSeen[$1]=1 if providesQtRuntime "$1" && [ "z${!outputBin}" != "z${!outputDev}" ] then propagatedBuildInputs+=" $1" @@ -64,3 +99,14 @@ postPatchMkspecs() { if [ -z "${dontPatchMkspecs-}" ]; then postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" fi + +qtPreHook() { + # Check that wrapQtAppsHook is used, or it is explicitly disabled. + if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then + echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + exit 1 + fi +} +prePhases+=" qtPreHook" + +fi diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 7356c8ee356..ce4d78fbb50 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -1,3 +1,6 @@ +if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then +__nix_wrapQtAppsHook=1 # Don't run this hook more than once. + # Inherit arguments given in mkDerivation qtWrapperArgs=( ${qtWrapperArgs-} ) @@ -100,3 +103,5 @@ wrapQtAppsHook() { } fixupOutputHooks+=(wrapQtAppsHook) + +fi diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix index 2c6333cb020..98f9a05fac7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,21 +9,6 @@ args: let args_ = { - qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] - ++ (args.qmakeFlags or []); - - NIX_CFLAGS_COMPILE = toString ( - optional (!debug) "-DQT_NO_DEBUG" - ++ lib.toList (args.NIX_CFLAGS_COMPILE or [])); - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ - ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) - ]; - - enableParallelBuilding = args.enableParallelBuilding or true; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ wrapQtAppsHook ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 24f1d6f81a2..0d0bef342b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -22,6 +22,7 @@ libGL, buildExamples ? false, buildTests ? false, + debug ? false, developerBuild ? false, decryptSslTraffic ? false }: @@ -33,12 +34,14 @@ let compareVersion = v: builtins.compareVersions version v; qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; + debugSymbols = debug || developerBuild; in stdenv.mkDerivation { name = "qtbase-${version}"; inherit qtCompatVersion src version; + debug = debugSymbols; propagatedBuildInputs = [ @@ -241,6 +244,7 @@ stdenv.mkDerivation { "-I" "${icu.dev}/include" "-pch" ] + ++ lib.optional debugSymbols "-debug" ++ lib.optionals (compareVersion "5.11.0" < 0) [ "-qml-debug" @@ -397,6 +401,8 @@ stdenv.mkDerivation { -e "/^host_bins=/ c host_bins=$dev/bin" ''; + dontStrip = debugSymbols; + setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 7e5582cca48..9613eed2874 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -229,6 +229,8 @@ qtModule { description = "A web engine based on the Chromium web browser"; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + # This build takes a long time; particularly on slow architectures + timeout = 24 * 3600; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 0481f000c6c..930ed9d67ba 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -34,6 +34,8 @@ mkDerivation (args // { fixQtBuiltinPaths . '*.pr?' ''; + dontWrapQtApps = args.dontWrapQtApps or true; + postFixup = '' if [ -d "''${!outputDev}/lib/pkgconfig" ]; then find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix index 91f85371106..ce69c855ac2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; enableParallelBuilding = true; NIX_QT_SUBMODULE = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/{bin,lib,share/qt-installer-framework} diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 6da4abb756e..3da0587210d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; + dontWrapQtApps = true; + patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix index 3558201015c..9dbc2491ad9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase protobuf ]; + dontWrapQtApps = true; + postPatch = '' # Fix plugin dir substituteInPlace pbfplugin.pro \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 831c51fa234..f5398d92dfc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/Martchus/qtutilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix index 652c49aa6ca..5bc30db059e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { buildInputs = [ qtwebkit hunspell ]; + dontWrapQtApps = true; + postPatch = '' sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/quazip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/quazip/default.nix index 3f186314d01..a12d6cafe4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + dontWrapQtApps = true; + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/qwt/6.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/qwt/6.nix index edfd3b4e24a..e5fad490f6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/qwt/6.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/qwt/6.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix index b649b1d9c11..e5657bcb3c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index a42941cbb68..7a9818bce97 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix index 618c91421b6..433da05d088 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/rinutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/rinutils/default.nix new file mode 100644 index 00000000000..35e48140fdd --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/s2geometry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/s2geometry/default.nix new file mode 100644 index 00000000000..afd5ffa0a0a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/s2n/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix similarity index 74% rename from infra/libkookie/nixpkgs/pkgs/development/libraries/s2n/default.nix rename to infra/libkookie/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 3ec66ebf52d..2d3ebc6cb41 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/s2n/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 254ce08dc60..703a7f2e344 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix index d99149c0e96..b8aac46d919 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }: +{ callPackage, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -6,35 +6,6 @@ let }; in rec { - cudnn_cudatoolkit_7 = generic rec { - # Old URL is v4 instead of v4.0 for some reason... - version = "4"; - cudatoolkit = cudatoolkit_7; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz"; - sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd"; - }; - - cudnn_cudatoolkit_7_5 = generic rec { - version = "6.0"; - cudatoolkit = cudatoolkit_7_5; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; - sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; - }; - - cudnn6_cudatoolkit_8 = generic rec { - version = "6.0"; - cudatoolkit = cudatoolkit_8; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; - sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; - }; - - cudnn_cudatoolkit_8 = generic rec { - version = "7.0.5"; - cudatoolkit = cudatoolkit_8; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; - }; - cudnn_cudatoolkit_9_0 = generic rec { version = "7.3.0"; cudatoolkit = cudatoolkit_9_0; @@ -82,11 +53,21 @@ in rec { cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; cudnn_cudatoolkit_11_0 = generic rec { - version = "8.0.2"; + version = "8.1.0"; cudatoolkit = cudatoolkit_11_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz"; - sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; + # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: + # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions + srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz"; + sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; + }; + + cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_1; + }; + + cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_2; }; - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index 59c0b7f4498..566a17c6147 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -25,9 +25,12 @@ stdenv.mkDerivation { installPhase = '' function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1 } - fixRunPath lib64/libcudnn.so + + for lib in lib64/lib*.so; do + fixRunPath $lib + done mkdir -p $out cp -a include $out/include @@ -38,13 +41,7 @@ stdenv.mkDerivation { # See the explanation in addOpenGLRunpath. postFixup = '' for lib in $out/lib/lib*.so; do - # patchelf fails on libcudnn_cnn_infer due to it being too big. - # Most programs will still get the RPATH since they link to - # other things. - # (https://github.com/NixOS/patchelf/issues/222) - if [ "$(basename $lib)" != libcudnn_cnn_infer.so ]; then - addOpenGLRunpath $lib - fi + addOpenGLRunpath $lib done ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 9631f3931ca..241eb5a3721 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -8,11 +8,17 @@ , fixDarwinDylibNames , cudaSupport -, nvidia_x11 +, cudatoolkit_10_2 +, cudnn_cudatoolkit_10_2 }: let - version = "1.7.1"; + # The binary libtorch distribution statically links the CUDA + # toolkit. This means that we do not need to provide CUDA to + # this derivation. However, we should ensure on version bumps + # that the CUDA toolkit for `passthru.tests` is still + # up-to-date. + 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"; @@ -24,12 +30,7 @@ in stdenv.mkDerivation { nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] - else [ addOpenGLRunpath patchelf ] - ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; - - buildInputs = [ - stdenv.cc.cc - ] ++ lib.optionals cudaSupport [ nvidia_x11 ]; + else [ patchelf ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; dontBuild = true; dontConfigure = true; @@ -56,9 +57,7 @@ in stdenv.mkDerivation { ''; postFixup = let - libPaths = [ stdenv.cc.cc.lib ] - ++ lib.optionals cudaSupport [ nvidia_x11 ]; - rpath = lib.makeLibraryPath libPaths; + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; in lib.optionalString stdenv.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." @@ -108,12 +107,17 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests.cmake = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { + inherit cudaSupport; + cudatoolkit = cudatoolkit_10_2; + cudnn = cudnn_cudatoolkit_10_2; + }; meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. + maintainers = with maintainers; [ danieldk ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 7f815a31a51..bfb708531df 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix index e69807871f4..60f9b5ad884 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -1,6 +1,28 @@ -{ stdenv, cmake, libtorch-bin, symlinkJoin }: +{ lib +, stdenv +, cmake +, libtorch-bin +, linkFarm +, symlinkJoin -stdenv.mkDerivation { +, cudaSupport +, cudatoolkit +, cudnn +}: +let + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + + # We do not have access to /run/opengl-driver/lib in the sandbox, + # so use a stub instead. + cudaStub = linkFarm "cuda-stub" [{ + name = "libcuda.so.1"; + path = "${cudatoolkit}/lib/stubs/libcuda.so"; + }]; + +in stdenv.mkDerivation { pname = "libtorch-test"; version = libtorch-bin.version; @@ -8,7 +30,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ libtorch-bin ]; + buildInputs = [ libtorch-bin ] ++ + lib.optionals cudaSupport [ cudnn ]; + + cmakeFlags = lib.optionals cudaSupport + [ "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit_joined}" ]; doCheck = true; @@ -17,6 +43,7 @@ stdenv.mkDerivation { ''; checkPhase = '' - ./test + LD_LIBRARY_PATH=${cudaStub}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \ + ./test ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index b8e3999ffe8..c5960dddf51 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -1,8 +1,40 @@ { lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: -with lib; +assert let majorIs = lib.versions.major cudatoolkit.version; + in majorIs == "9" || majorIs == "10" || majorIs == "11"; -let version = "2.5.4"; +let + version = "2.5.4"; + + # We define a specific set of CUDA compute capabilities here, + # because CUDA 11 does not support compute capability 3.0. Also, + # we use it to enable newer capabilities that are not enabled + # by magma by default. The list of supported architectures + # can be found in magma's top-level CMakeLists.txt. + cudaCapabilities = rec { + cuda9 = [ + "Kepler" # 3.0, 3.5 + "Maxwell" # 5.0 + "Pascal" # 6.0 + "Volta" # 7.0 + ]; + + cuda10 = [ + "Turing" # 7.5 + ] ++ cuda9; + + cuda11 = [ + "sm_35" # sm_30 is not supported by CUDA 11 + "Maxwell" # 5.0 + "Pascal" # 6.0 + "Volta" # 7.0 + "Turing" # 7.5 + "Ampere" # 8.0 + ]; + }; + + capabilityString = lib.strings.concatStringsSep "," + cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; in stdenv.mkDerivation { pname = "magma"; @@ -17,6 +49,8 @@ in stdenv.mkDerivation { buildInputs = [ cudatoolkit libpthreadstubs lapack blas ]; + cmakeFlags = [ "-DGPU_TARGET=${capabilityString}" ]; + doCheck = false; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 5bfef9e8ba3..34ebc36ebb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4="; + sha256 = "sha256-vpg7nh5A5pbou7frj2N208oK5nWubYKTZUA4Ww7uwVs="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 53c117233d2..2b6eb5705cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,40 +1,84 @@ -{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which -, lsb-release, glog, protobuf, cbc, zlib -, ensureNewerSourcesForZipFilesHook, python, swig }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, abseil-cpp +, bzip2 +, zlib +, lsb-release +, which +, protobuf +, cbc +, ensureNewerSourcesForZipFilesHook +, python +, swig4 +}: stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.7"; + version = "8.1"; + disabled = python.pythonOlder "3.6"; # not supported upstream src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv"; + sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg"; }; + patches = [ + # This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect + # USE_SCIP=OFF and then failing to find scip/scip.h + (fetchpatch { + url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch"; + sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0"; + }) + ]; + # The original build system uses cmake which does things like pull # in dependencies through git and Makefile creation time. We # obviously don't want to do this so instead we provide the # dependencies straight from nixpkgs and use the make build method. + + # Cbc is linked against bzip2 and declares this in its pkgs-config file, + # but this makefile doesn't use pkgs-config, so we also have to add lbz2 configurePhase = '' + substituteInPlace makefiles/Makefile.third_party.unix.mk \ + --replace 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK)' \ + 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK) -lbz2' + cat < Makefile.local - UNIX_ABSL_DIR=${abseil-cpp} - UNIX_GFLAGS_DIR=${gflags} - UNIX_GLOG_DIR=${glog} - UNIX_PROTOBUF_DIR=${protobuf} - UNIX_CBC_DIR=${cbc} + UNIX_ABSL_DIR=${abseil-cpp} + UNIX_PROTOBUF_DIR=${protobuf} + UNIX_CBC_DIR=${cbc} + USE_SCIP=OFF EOF ''; + # Many of these 'samples' (which are really the tests) require using SCIP, and or-tools 8.1 + # will just crash if SCIP is not found because it doesn't fall back to using one of + # the available solvers: https://github.com/google/or-tools/blob/b77bd3ac69b7f3bb02f55b7bab6cbb4bab3917f2/ortools/linear_solver/linear_solver.cc#L427 + # We don't compile with SCIP because it does not have an open source license. + # See https://github.com/google/or-tools/issues/2395 + preBuild = '' + for file in ortools/linear_solver/samples/*.cc; do + if grep -q SCIP_MIXED_INTEGER_PROGRAMMING $file; then + substituteInPlace $file --replace SCIP_MIXED_INTEGER_PROGRAMMING CBC_MIXED_INTEGER_PROGRAMMING + fi; + done + + substituteInPlace ortools/linear_solver/samples/simple_mip_program.cc \ + --replace 'SCIP' 'CBC' + ''; makeFlags = [ "prefix=${placeholder "out"}" "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py" ]; buildFlags = [ "cc" "pypi_archive" ]; - checkTarget = "test_cc"; doCheck = true; + checkTarget = "test_cc"; installTargets = [ "install_cc" ]; # The upstream install_python target installs to $HOME. @@ -43,14 +87,30 @@ stdenv.mkDerivation rec { (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python') ''; + enableParallelBuilding = true; + nativeBuildInputs = [ - cmake lsb-release swig which zlib python + cmake + lsb-release + swig4 + which ensureNewerSourcesForZipFilesHook - python.pkgs.setuptools python.pkgs.wheel + python.pkgs.setuptools + python.pkgs.wheel + ]; + buildInputs = [ + zlib + bzip2 + python ]; propagatedBuildInputs = [ - abseil-cpp gflags glog protobuf cbc - python.pkgs.protobuf python.pkgs.six + abseil-cpp + protobuf + + python.pkgs.protobuf + python.pkgs.six + python.pkgs.absl-py + python.pkgs.mypy-protobuf ]; outputs = [ "out" "python" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix index 0d1a331798c..8f3e1aba350 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libbasename = "libzn_poly"; libext = stdenv.targetPlatform.extensions.sharedLibrary; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/serf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/serf/default.nix index dbdc9ce2871..5b603e6a0c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/serf/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/serf/scons.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/serf/scons.patch index a7eefe7d5c1..acfece7ef5f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/serf/scons.patch +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/silgraphite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/silgraphite/default.nix deleted file mode 100644 index 06cf7587616..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 448270183a5..37ea3b65728 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "1x5f8b5s67kf9sjx04rp81q0f3dlnqfngn3h0lrfnphipald5fji"; + sha256 = "sha256-azRuLB03NvW+brw7A/kbgkjoDUlk1p7Ch4zZD55QiMQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/sonic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sonic/default.nix index 38dcee84a92..ba3164db11a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/soqt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/soqt/default.nix index 2be6c662145..fe7901bddd5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/soqt/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/coin3d/soqt"; license = licenses.bsd3; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 7b6c98bebe8..0fe1ce442fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index b423e557a56..7e43fc7f5c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/tecla/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tecla/default.nix index 6d8a334ce3f..a0a1ac0360e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tecla/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix index b606c56445e..dbbaca7e11a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus -, telepathy-farstream, telepathy-glib, fetchpatch }: +, telepathy-farstream, telepathy-glib }: let inherit (python3Packages) python dbus-python; @@ -20,6 +20,8 @@ in stdenv.mkDerivation rec { # On 0.9.7, they do not even build with QT4 cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + dontWrapQtApps = true; + doCheck = false; # giving up for now meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/termbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/termbox/default.nix index e809240bcd1..51c2ca1c808 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/termbox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/termbox/default.nix @@ -1,31 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "termbox"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitHub { - owner = "nsf"; + owner = "termbox"; repo = "termbox"; rev = "v${version}"; - sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs"; + sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; }; - # patch which updates the `waf` version used to build - # to make the package buildable on Python 3.7 - patches = [ - (fetchpatch { - url = "https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch"; - sha256 = "1s5747v51sdwvpsg6k9y1j60yn9f63qnylkgy8zrsifjzzd5fzl6"; - }) - ]; - - nativeBuildInputs = [ python3 wafHook ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { description = "Library for writing text-based user interfaces"; license = licenses.mit; - homepage = "https://github.com/nsf/termbox#readme"; - downloadPage = "https://github.com/nsf/termbox/releases"; + homepage = "https://github.com/termbox/termbox#readme"; + downloadPage = "https://github.com/termbox/termbox/releases"; maintainers = with maintainers; [ fgaz ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 4e6e49d68c4..0fa1ea8bd39 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; + sha256 = "sha256-xzzWB20vhnneiqJqZAeSUjZouqhPPg2bGaot1IQDMEo="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index fa506733c16..42e6e920be4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch new file mode 100644 index 00000000000..86cdcd1541e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/tweeny/default.nix index 8340e47fbf9..0afc82321d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/tweeny/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/tweeny/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tweeny"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mobius3"; repo = "tweeny"; rev = "v${version}"; - sha256 = "0zk7p21i54hfz0l50617i3gxhxh0n9yy86n2fxg8m26cvf4yhsj7"; + sha256 = "sha256-VmvOMK+FjYZXKH9kPUT2L7pmJMPSr5eXptCcoGWK+qo="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch new file mode 100644 index 00000000000..0937ac6e308 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch @@ -0,0 +1,74 @@ +From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001 +From: Tadeo Kondrak +Date: Mon, 25 Jan 2021 11:17:44 -0700 +Subject: [PATCH] Call weak function to allow adding preloaded plugins after + compile + +--- + src/core/vscore.cpp | 19 +++++++++++++++++++ + src/core/vscore.h | 5 +++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp +index 2d29844d..35c509ed 100644 +--- a/src/core/vscore.cpp ++++ b/src/core/vscore.cpp +@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { + freeDepth--; + } + ++extern "C" { ++void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data); ++ ++struct VSLoadPluginsNixCallbackData { ++ VSCore *core; ++ const char *filter; ++}; ++ ++static void VSLoadPluginsNixCallback(void *data, const char *path) { ++ auto callbackData = static_cast(data); ++ callbackData->core->loadAllPluginsInPath(path, callbackData->filter); ++} ++} ++ + VSCore::VSCore(int threads) : + coreFreed(false), + numFilterInstances(1), +@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) : + } // If neither exists, an empty string will do. + #endif + ++ if (VSLoadPluginsNix != nullptr) { ++ VSLoadPluginsNixCallbackData data{this, filter.c_str()}; ++ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data); ++ } ++ + VSMap *settings = readSettings(configFile); + const char *error = vs_internal_vsapi.getError(settings); + if (error) { +diff --git a/src/core/vscore.h b/src/core/vscore.h +index 74df8a84..3efac811 100644 +--- a/src/core/vscore.h ++++ b/src/core/vscore.h +@@ -582,6 +582,9 @@ public: + VSFunction() : functionData(nullptr), func(nullptr) {} + }; + ++extern "C" { ++static void VSLoadPluginsNixCallback(void *data, const char *path); ++} + + struct VSPlugin { + private: +@@ -683,6 +686,8 @@ public: + + explicit VSCore(int threads); + void freeCore(); ++ ++ friend void VSLoadPluginsNixCallback(void *data, const char *path); + }; + + #endif // VSCORE_H +-- +2.30.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 93f8d3c5ae5..8ef209fe805 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper +, 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 { @@ -21,13 +19,17 @@ stdenv.mkDerivation rec { sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; + patches = [ + ./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (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") @@ -36,12 +38,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { + passthru = rec { # If vapoursynth is added to the build inputs of mpv and then # used in the wrapping of it, we want to know once inside the # wrapper, what python3 version was used to build vapoursynth so # the right python3.sitePackages will be used there. inherit python3; + + withPlugins = import ./plugin-interface.nix { + inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand + vapoursynth makeWrapper withPlugins; + }; }; postInstall = '' @@ -54,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; - maintainers = with maintainers; [ rnhmjoj tadeokondrak ]; + maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix index f9ebed19752..5cd4b4608ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,43 +1,59 @@ -{ lib, mkDerivation, fetchFromBitbucket +{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: -mkDerivation rec { - pname = "vapoursynth-editor"; - version = "R19"; - - src = fetchFromBitbucket { - owner = "mystery_keeper"; - repo = pname; - rev = lib.toLower version; - sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; +let + unwrapped = mkDerivation rec { + pname = "vapoursynth-editor"; + version = "R19"; + + src = fetchFromBitbucket { + owner = "mystery_keeper"; + repo = pname; + rev = lib.toLower version; + sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase vapoursynth qtwebsockets ]; + + dontWrapQtApps = true; + + preConfigure = "cd pro"; + + preFixup = '' + cd ../build/release* + mkdir -p $out/bin + for bin in vsedit{,-job-server{,-watcher}}; do + mv $bin $out/bin + wrapQtApp $out/bin/$bin + done + ''; + + passthru = { inherit withPlugins; }; + + meta = with lib; { + description = "Cross-platform editor for VapourSynth scripts"; + homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase vapoursynth qtwebsockets ]; - - dontWrapQtApps = true; - - preConfigure = "cd pro"; - - preFixup = '' - cd ../build/release* + withPlugins = plugins: let + vapoursynthWithPlugins = vapoursynth.withPlugins plugins; + in runCommand "${unwrapped.name}-with-plugins" { + buildInputs = [ makeWrapper ]; + passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); }; + } '' mkdir -p $out/bin for bin in vsedit{,-job-server{,-watcher}}; do - mv $bin $out/bin - - wrapQtApp $out/bin/$bin \ - --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \ - --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib + makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \ + --prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \ + --prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib done ''; - - meta = with lib; { - description = "Cross-platform editor for VapourSynth scripts"; - homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; - license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; - platforms = platforms.all; - }; -} +in + withPlugins [] diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix new file mode 100644 index 00000000000..55b2b03c893 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -0,0 +1,112 @@ +{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand +, vapoursynth, makeWrapper, withPlugins }: + +plugins: let + pythonEnvironment = python3.buildEnv.override { + extraLibs = plugins; + }; + + getRecursivePropagatedBuildInputs = pkgs: lib.flatten + (map + (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + pkgs); + + deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + + pluginsEnv = buildEnv { + name = "vapoursynth-plugins-env"; + pathsToLink = [ "/lib/vapoursynth" ]; + paths = deepPlugins; + }; + + pluginLoader = let + source = writeText "vapoursynth-nix-plugins.c" '' + void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) { + ${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins} + } + ''; + in + runCommandCC "vapoursynth-plugin-loader" { + executable = true; + preferLocalBuild = true; + allowSubstitutes = false; + } '' + mkdir -p $out/lib + $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" + ''; + + ext = stdenv.targetPlatform.extensions.sharedLibrary; +in +runCommand "${vapoursynth.name}-with-plugins" { + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit python3; + withPlugins = plugins': withPlugins (plugins ++ plugins'); + }; +} '' + mkdir -p \ + $out/bin \ + $out/lib/pkgconfig \ + $out/lib/vapoursynth \ + $out/${python3.sitePackages} + + for textFile in \ + lib/pkgconfig/vapoursynth{,-script}.pc \ + lib/libvapoursynth.la \ + lib/libvapoursynth-script.la \ + ${python3.sitePackages}/vapoursynth.la + do + substitute ${vapoursynth}/$textFile $out/$textFile \ + --replace "${vapoursynth}" "$out" + done + + for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do + ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"} + done + + for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do + ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"} + done + + for binaryFile in \ + lib/libvapoursynth${ext} \ + lib/libvapoursynth-script${ext}.0.0.0 + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="$old_rpath:$out/lib" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + patchelf \ + --add-needed libvapoursynth-nix-plugins${ext} \ + $out/$binaryFile + done + + for binaryFile in \ + ${python3.sitePackages}/vapoursynth${ext} \ + bin/.vspipe-wrapped + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + done + + ln -s \ + ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \ + $out/lib/libvapoursynth-nix-plugins${ext} + ln -s ${vapoursynth}/include $out/include + ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext} + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext}.0 + + makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \ + --prefix PYTHONPATH : $out/${python3.sitePackages} +'' diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix new file mode 100644 index 00000000000..fb8dd43fe03 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/vtk/generic.nix index 273bff8852e..f4d1f3c4077 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$(pwd)/lib"; ''; + dontWrapQtApps = true; + # Shared libraries don't work, because of rpath troubles with the current # nixpkgs cmake approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. @@ -91,5 +93,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; 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; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix index 7ec8936267b..fb7d1972c02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -28,19 +28,14 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; + sha256 = "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"; }; patches = [ - # Fix documentation to be reproducible. - (fetchpatch { - url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch"; - sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2"; - }) (substituteAll { src = ./0001-add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 9bf91da6cd9..490adf8e325 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 48178e77409..4635a80152d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 151c74f0b70..da60f2b27fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index cab35852831..2b425300b31 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -7,7 +7,6 @@ , libxml2 , glib , pipewire -, fontconfig , flatpak , gsettings-desktop-schemas , acl @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.8.0"; + version = "1.8.1"; outputs = [ "out" "installedTests" ]; @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1f1f79hy259lm017zaq4rpvys8zkmjspqily4a3lbnm77zk3y079"; + sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8="; }; patches = [ @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib pipewire - fontconfig flatpak acl dbus diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index a3c35d123b6..b37dfbdd707 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/misc/resholve/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/resholve/deps.nix index 86bcba57075..6a1d9c77b5a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/misc/resholve/deps.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/resholve/resholve.nix index e8b4ed2cfb2..4d039770ce0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/misc/resholve/resholve.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/misc/umr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/misc/umr/default.nix new file mode 100644 index 00000000000..158cef2eed1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index fd78fa9ac0f..5db3538563f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/mobile/genymotion/default.nix index 5602f598e9d..1aa81132c26 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index f471dc977b3..601cac372c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 0742247893c..52257bfd461 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index 965a385ac56..78044752b54 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/node-packages/generate.sh b/infra/libkookie/nixpkgs/pkgs/development/node-packages/generate.sh index 5f9936c5124..e7a15d5d869 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/node-packages/generate.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/node-packages/generate.sh @@ -2,8 +2,13 @@ set -eu -o pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix) - +node2nix=$(nix-build ../../.. -A nodePackages.node2nix) cd ${DIR} rm -f ./node-env.nix ${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix +# using --no-out-link in nix-build argument would cause the +# gc to run before the script finishes +# which would cause a failure +# it's safer to just remove the link after the script finishes +# see https://github.com/NixOS/nixpkgs/issues/112846 for more details +rm ./result diff --git a/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.json b/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.json index ebf641fedf4..829c2f67fd7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -22,6 +22,8 @@ , "cdktf-cli" , "clean-css-cli" , "clubhouse-cli" +, "coc-clangd" +, "coc-cmake" , "coc-css" , "coc-diagnostic" , "coc-emmet" @@ -39,6 +41,7 @@ , "coc-metals" , "coc-pairs" , "coc-prettier" +, "coc-pyright" , "coc-python" , "coc-r-lsp" , "coc-rls" @@ -48,6 +51,7 @@ , "coc-solargraph" , "coc-stylelint" , "coc-tabnine" +, "coc-texlab" , "coc-tslint" , "coc-tslint-plugin" , "coc-tsserver" @@ -88,6 +92,7 @@ , "flood" , "forever" , "fx" +, "ganache-cli" , "get-graphql-schema" , "git-run" , "git-ssb" diff --git a/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.nix index 92c9b8f453d..b8af4a775bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/infra/libkookie/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.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.1"; + version = "0.1102.2"; 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.2.tgz"; + sha512 = "FE7DeT13elqDlELF23QqvEFnT2BkxeC5t31/QW85IN/OR5Tf/q7XEpj7giJXyzKFQ60M3ZzbznZyRz0EqtfaBQ=="; }; }; "@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.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.2.1"; + version = "11.2.2"; 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.2.tgz"; + sha512 = "LUDO1AdIjereiMh0j5p9xJcdr9ifhbWCPxlZqfu5wHzUfhCx9gO2Lvjp6rZXQ3OedXg5IZUnyxHlzkszQOsgiw=="; }; }; "@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.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.2.1"; + version = "11.2.2"; 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.2.tgz"; + sha512 = "6bIxMwafz/+lwdtcshwOuFfhxTMU4RLma1uxBS34DXupMauPGl0IIXAy5cK9dXPlHLxuGsjeBiOM6eq033RLgw=="; }; }; "@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.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.17"; + version = "7.13.0"; 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.0.tgz"; + sha512 = "zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw=="; }; }; "@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.4" = { + name = "_at_babel_slash_helper-define-polyfill-provider"; + packageName = "@babel/helper-define-polyfill-provider"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.4.tgz"; + sha512 = "K5V2GaQZ1gpB+FTXM4AFVG2p1zzhm67n9wrQCJYNzvuLzQybhJyftW7qeDd2uUxPDNdl5Rkon1rOAeUeNDZ28Q=="; + }; + }; + "@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.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.17"; + version = "7.13.4"; 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.4.tgz"; + sha512 = "uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA=="; }; }; "@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.8" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.17"; + version = "7.13.8"; 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.8.tgz"; + sha512 = "6UbZ7P0FuuJiiUyRCfDgLw4PIG9bR2x6swHocv4qNZItkhXad0WsN6YX0deILuyZY2++meDKiDMuSVcejDZN0Q=="; }; }; "@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.8" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.8.tgz"; + sha512 = "Sso1xOpV4S3ofnxW2DsWTE5ziRk62jEAKLGuQ+EJHC+YHTbFG38QUTixO3JVa1cYET9gkJhO1pMu+/+2dDhKvw=="; + }; + }; "@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.8" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz"; + sha512 = "CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg=="; + }; + }; "@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" = { @@ -1696,13 +1723,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=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; }; }; "@evocateur/libnpmaccess-3.1.2" = { @@ -1759,15 +1786,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 +1795,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 +1822,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.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/dev-tools/-/dev-tools-0.13.82.tgz"; - sha512 = "Uq3HoRP0/+w/c6LHdRAMEPLqO3NZS4cailJCYR/MXcZ6xGMrAOjBZwB64H7SP12ADyzhjOsISvr+JG5SE/lRRA=="; + url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.0.0.tgz"; + sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; "@expo/image-utils-0.3.10" = { @@ -1840,22 +1867,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 +1894,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 +1921,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 +1948,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 +1984,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.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.161.0"; + version = "7.162.0"; 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.0.tgz"; + sha512 = "RRZ7a3st/ApdTV5Mzv6OYw5WOqiycRxAkEBLWS52WLEDRySUq8Z5xK9Z/SnnrOxAX1WSZY8VNn72eEWyv8MW2Q=="; }; }; - "@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 +2092,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 +2146,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 +2173,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" = { @@ -2839,13 +2866,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.21.0" = { + "@jsii/spec-1.22.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "OI9LOxU3YhVyzUVvzh5nKDCalFZm0CjPaCdo6X/lL0TaVcpkYyJ8qDRuGF8WCW9PJEORkOhBwC7ySoFl/RVv9A=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3469,13 +3496,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 +3514,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-9.1.3" = { + "@netlify/build-9.5.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "9.1.3"; + version = "9.5.0"; 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.5.0.tgz"; + sha512 = "1CEl1gd7B83IpmMRSATkVrODE3fuw9bBUKnGAU+QA0JS219SXLHrSaYj1Uu+lsLSbOnaTeTVMrfXl5+dMzOoEQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3523,13 +3550,13 @@ let sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw=="; }; }; - "@netlify/functions-utils-1.3.13" = { + "@netlify/functions-utils-1.3.14" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.13"; + version = "1.3.14"; 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.14.tgz"; + sha512 = "5i3PbQxLpwqS1HNiAuxlGGA/Zsr5yjJm9J69GyQI5yW70aga1NwnY6teyAmGSksSYGR5BkPSKPhBhUCm6AzXKA=="; }; }; "@netlify/git-utils-1.0.8" = { @@ -3613,13 +3640,13 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-2.3.0" = { + "@netlify/zip-it-and-ship-it-2.4.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "2.3.0"; + version = "2.4.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.4.0.tgz"; + sha512 = "ApuQqnm5x97mFaUEQmmkogcH3MtvPmX1W6MI3Yp4pBXBtRjqTbkrUOiEq97mNnvRR3zEvR8kTLOY7Hd7lAL4bQ=="; }; }; "@node-red/editor-api-1.2.9" = { @@ -3883,6 +3910,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"; @@ -3928,13 +3964,13 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-5.1.0" = { + "@octokit/openapi-types-5.2.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "5.1.0"; + version = "5.2.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.2.1.tgz"; + sha512 = "Bf7MBvQ1nMpv15ANaQtRBsC7YnwQFPM0eUztp3luQs9L6sBEiQ6ArM1Wx5CG+N7tXETtd0oE0DMcU4wbLlCZIw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4018,13 +4054,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.10.0" = { + "@octokit/types-6.11.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.10.0"; + version = "6.11.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.11.1.tgz"; + sha512 = "UiSRTG2lrFbMUMwhKNR0uSV33Fzv4bNu1n5iFuuNOg80XCh0VYNhR4TQWgrkLhVxdDuej6s61aP3eQvVm6K6uA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4117,310 +4153,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 +4666,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 +4774,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.1" = { + "@schematics/angular-11.2.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.1"; + version = "11.2.2"; 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.2.tgz"; + sha512 = "TcxPy58adUnkirGXyZVVSMuKkA0eIz2PWSQWEgB9l7kO+5LvDOn+RMoc6AVx0s/bU9nH+eozBUJ1XAD/E8QnYQ=="; }; }; "@schematics/schematics-0.1102.0" = { @@ -4765,13 +4792,13 @@ let sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA=="; }; }; - "@schematics/update-0.1102.1" = { + "@schematics/update-0.1102.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.1"; + version = "0.1102.2"; 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.2.tgz"; + sha512 = "Nz8kjeixzDnOw00bnZznq3qrbIv8yWEWNb9eDkRBqgOUXQwlhKJY/sYBK58JF2D+conaRVuEqMsBlX08GlFtIA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4801,13 +4828,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.7.0" = { + "@serverless/components-3.7.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.7.0"; + version = "3.7.1"; 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.1.tgz"; + sha512 = "f938wGpjGWW4slLVwswLlne8hEUPmzBeFiJ3eylwpRAKLUSOTOmdgiumAKXhqiBtxdqUgDp1hTpvimu0X44jdQ=="; }; }; "@serverless/core-1.1.2" = { @@ -4846,13 +4873,13 @@ 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" = { @@ -5395,6 +5422,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"; @@ -5539,15 +5575,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 +5638,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"; @@ -5728,15 +5746,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,15 +5791,6 @@ let sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; }; }; - "@types/filesize-5.0.0" = { - name = "_at_types_slash_filesize"; - packageName = "@types/filesize"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/filesize/-/filesize-5.0.0.tgz"; - sha512 = "zgn1Kmm6VfqruG9STpwpZiSnpzHjF9hlvHVw+5hhM20xRCOIgjxnXJxOoLuZ/aWS6v/M5d6fvXFbbVQfBe4cMg=="; - }; - }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -5800,24 +5800,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"; @@ -6448,15 +6430,6 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/rimraf-2.0.4" = { - name = "_at_types_slash_rimraf"; - packageName = "@types/rimraf"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz"; - sha512 = "8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q=="; - }; - }; "@types/sass-1.16.0" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; @@ -6574,15 +6547,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"; @@ -6745,13 +6709,13 @@ let sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-4.15.1" = { + "@typescript-eslint/eslint-plugin-4.15.2" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "uiQQeu9tWl3f1+oK0yoAv9lt/KXO24iafxgQTkIYO/kitruILGx3uH+QtIAHqxFV+yIsdnJH+alel9KuE3J15Q=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6763,13 +6727,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.15.1" = { + "@typescript-eslint/experimental-utils-4.15.2" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "Fxoshw8+R5X3/Vmqwsjc8nRO/7iTysRtDqx6rlfLZ7HbT8TZhPeQqbPjTyk2RheH3L8afumecTQnUc9EeXxohQ=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6781,22 +6745,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.15.1" = { + "@typescript-eslint/parser-4.15.2" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "SHeF8xbsC6z2FKXsaTb1tBCf0QZsjJ94H6Bo51Y1aVEZ4XAefaw5ZAilMoDPlGghe+qtq7XdTiDlGfVTOmvA+Q=="; }; }; - "@typescript-eslint/scope-manager-4.15.1" = { + "@typescript-eslint/scope-manager-4.15.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "Zm0tf/MSKuX6aeJmuXexgdVyxT9/oJJhaCkijv0DvJVT3ui4zY6XYd6iwIo/8GEZGy43cd7w1rFMiCLHbRzAPQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -6808,13 +6772,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.15.1" = { + "@typescript-eslint/types-4.15.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "r7lW7HFkAarfUylJ2tKndyO9njwSyoy6cpfDKWPX6/ctZA+QyaYscAHXVAfJqtnY6aaTwDYrOhp+ginlbc7HfQ=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -6835,13 +6799,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.15.1" = { + "@typescript-eslint/typescript-estree-4.15.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "cGR8C2g5SPtHTQvAymEODeqx90pJHadWsgTtx6GbnTWKqsg7yp6Eaya9nFzUd4KrKhxdYTTFBiYeTPQaz/l8bw=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -6853,76 +6817,76 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.15.1" = { + "@typescript-eslint/visitor-keys-4.15.2" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.15.1"; + version = "4.15.2"; 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.15.2.tgz"; + sha512 = "TME1VgSb7wTwgENN5KVj4Nqg25hP8DisXxNBojM4Nn31rYaNDIocNm5cmjOFfh42n7NVERxWrDFoETO/76ePyg=="; }; }; - "@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" = { @@ -6997,76 +6961,76 @@ let sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA=="; }; }; - "@vue/compiler-core-3.0.5" = { + "@vue/compiler-core-3.0.6" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "O7QzQ39DskOoPpEDWRvKwDX7Py9UNT7SvLHvBdIfckGA3OsAEBdiAtuYQNcVmUDeBajm+08v5wyvHWBbWgkilQ=="; }; }; - "@vue/compiler-dom-3.0.5" = { + "@vue/compiler-dom-3.0.6" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "q1wfHzYwvDRAhBlx+Qa+n3Bu5nHr1qL/j0UbpNlbQDwIlt9zpvmXUrUCL+i55Bh5lLKvSe+mNo0qlwNEApm+jA=="; }; }; - "@vue/compiler-sfc-3.0.5" = { + "@vue/compiler-sfc-3.0.6" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "g1tkswnhtiJpj4ELQ3SzeGxtOd0t8E5GkT+n2VlElEnTI1BzueSvr41D5QthnUS+TNWZd52ZnPtdaNz+Lfum1w=="; }; }; - "@vue/compiler-ssr-3.0.5" = { + "@vue/compiler-ssr-3.0.6" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "Y4amPwRevUiiNQDho0cq1Ith9q6UU5N6CD6YiXkHIboFPeXEiGvH3ULJWjFzlGqn1eUV1AReNJpFJrhjtQNc7g=="; }; }; - "@vue/reactivity-3.0.5" = { + "@vue/reactivity-3.0.6" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "hX8PnZayNMoljWSYrZW0OclQnRaMoHxvi5eeFVFPDr7+tzBeiftmmozKttxxCLoDxBWX1B4gNc237DIcYU63Lw=="; }; }; - "@vue/runtime-core-3.0.5" = { + "@vue/runtime-core-3.0.6" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "x6N38P0DeMyrHiAxCE/rACHTyydOzlg8IyUIPkSJ4rrSkuJnAtFKQicK6fm8NuD21dwdPr8KcZ4Cn4xaqL1JJg=="; }; }; - "@vue/runtime-dom-3.0.5" = { + "@vue/runtime-dom-3.0.6" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "Y6y4Tak9//VXB2mp2NVQxbwC4a5xsnJpotpo8yBAB3qB3L4v4HQLpqxSkwThRwI6Y6Z7dydX/sgfraqLBE8BWg=="; }; }; - "@vue/shared-3.0.5" = { + "@vue/shared-3.0.6" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "c37C60HpelUZIx+SNZVEINSxkFzQYhIXFg5AynnIA4QDBmY4iSPoACfGSwSUTCTKImukPeCgY2oqRJVP3R1Mnw=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -8446,6 +8410,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"; @@ -10579,13 +10552,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.848.0" = { + "aws-sdk-2.853.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.848.0"; + version = "2.853.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.853.0.tgz"; + sha512 = "3cifeifeMHKtpvQ6OcrA9j34BEdvWmLlSGzZU/mZf9nYcV+22PPXjwpVhPh9BvfC2S77upKNbMgnkv4u50aQKw=="; }; }; "aws-sign2-0.6.0" = { @@ -10903,6 +10876,33 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; + "babel-plugin-polyfill-corejs2-0.1.8" = { + name = "babel-plugin-polyfill-corejs2"; + packageName = "babel-plugin-polyfill-corejs2"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.8.tgz"; + sha512 = "kB5/xNR9GYDuRmVlL9EGfdKBSUVI/9xAU7PCahA/1hbC2Jbmks9dlBBYjHF9IHMNY2jV/G2lIG7z0tJIW27Rog=="; + }; + }; + "babel-plugin-polyfill-corejs3-0.1.6" = { + name = "babel-plugin-polyfill-corejs3"; + packageName = "babel-plugin-polyfill-corejs3"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.6.tgz"; + sha512 = "IkYhCxPrjrUWigEmkMDXYzM5iblzKCdCD8cZrSAkQOyhhJm26DcG+Mxbx13QT//Olkpkg/AlRdT2L+Ww4Ciphw=="; + }; + }; + "babel-plugin-polyfill-regenerator-0.1.5" = { + name = "babel-plugin-polyfill-regenerator"; + packageName = "babel-plugin-polyfill-regenerator"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.5.tgz"; + sha512 = "EyhBA6uN94W97lR7ecQVTvH9F5tIIdEw3ZqHuU4zekMlW82k5cXNXniiB7PRxQm06BqAjVr4sDT1mOy4RcphIA=="; + }; + }; "babel-plugin-styled-components-1.12.0" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; @@ -12199,22 +12199,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 +12811,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" = { @@ -13702,13 +13702,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001190" = { + "caniuse-lite-1.0.30001192" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001190"; + version = "1.0.30001192"; 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.30001192.tgz"; + sha512 = "63OrUnwJj5T1rUmoyqYTdRWBqFFxZFlyZnRRjDR8NSUQFB6A+j/uBORU/SyJ5WzDLg4SPiZH40hQCBNdZ/jmAw=="; }; }; "canvas-2.6.1" = { @@ -13828,13 +13828,13 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.8" = { + "cdk8s-1.0.0-beta.9" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; 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.9.tgz"; + sha512 = "jWqgWCrZ2ez/o644fHMEex5qOxgAWK+RnFwiYHf9AEDeT7ww94mGjcSU7k6HdLpOFMA8oiyFzKxlj2HM8JIw3A=="; }; }; "cdktf-0.1.0" = { @@ -15268,13 +15268,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.21.0" = { + "codemaker-1.22.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "0c77XXwpCOR9SrlKqNtaBhvzi0zo2tYuiUMuTISq+qclyunpDzgkKH27SxyGG1Ju6gNtv10bME7A/8zlWstICw=="; }; }; "codepage-1.4.0" = { @@ -15421,13 +15421,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" = { @@ -16087,6 +16087,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,13 +16312,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.29" = { + "constructs-3.3.43" = { name = "constructs"; packageName = "constructs"; - version = "3.3.29"; + version = "3.3.43"; 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.43.tgz"; + sha512 = "4Fi9XuoYAPkVrimpU/fo3SOUxB3cS/WjP77DGeJl1o0vsYsggqeBHRLK6GxRG7vpmnOhiyDlBIazJkMuR6YWuQ=="; }; }; "constructs-3.3.5" = { @@ -16799,22 +16808,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" = { @@ -17582,13 +17591,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" = { @@ -19112,13 +19121,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 +19265,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 +19589,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" = { @@ -20723,13 +20714,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-to-chromium-1.3.671" = { + "electron-to-chromium-1.3.675" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.671"; + version = "1.3.675"; 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.675.tgz"; + sha512 = "GEQw+6dNWjueXGkGfjgm7dAMtXfEqrfDG3uWcZdeaD4cZ3dKYdPRQVruVXQRXtPLtOr5GNVVlNLRMChOZ611pQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20824,13 +20815,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" = { @@ -21436,13 +21427,13 @@ let sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; }; }; - "es-module-lexer-0.3.26" = { + "es-module-lexer-0.4.0" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "0.3.26"; + version = "0.4.0"; 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.0.tgz"; + sha512 = "iuEGihqqhKWFgh72Q/Jtch7V2t/ft8w8IPP2aEN8ArYKO+IWyo6hsi96hCdgyeEDQIV3InhYQ9BlwUFPGXrbEQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -21589,13 +21580,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.8.50" = { + "esbuild-0.8.53" = { name = "esbuild"; packageName = "esbuild"; - version = "0.8.50"; + version = "0.8.53"; 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.53.tgz"; + sha512 = "GIaYGdMukH58hu+lf07XWAeESBYFAsz8fXnrylHDCbBXKOSNtFmoYA8PhSeSF+3/qzeJ0VjzV9AkLURo5yfu3g=="; }; }; "esc-exit-2.0.2" = { @@ -21796,13 +21787,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" = { @@ -22300,6 +22291,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 +22363,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 +22669,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 +22768,13 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-7.3.0" = { + "express-openapi-7.4.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.3.0"; + version = "7.4.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.4.0.tgz"; + sha512 = "pwFIbxXcs0oQ+meXRVK6FIBSgUFlOzvkLT6p64JkMzKopRCWYykVzwU4ojWHNRUax9/RnnOQMtdJMJ7yWsM6OA=="; }; }; "express-session-1.17.1" = { @@ -23326,13 +23326,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" = { @@ -24307,13 +24307,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" = { @@ -26072,13 +26072,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 +26324,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" = { @@ -27035,13 +27035,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 +27332,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"; @@ -28062,13 +28071,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 +28341,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 +28359,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 +28512,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" = { @@ -29592,6 +29601,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"; @@ -30654,13 +30672,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" = { @@ -31545,49 +31563,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.21.0" = { + "jsii-1.22.0" = { name = "jsii"; packageName = "jsii"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "iBYlf/wSCsaohM14JSpN3NsIrfsqWi0FXrKvW0tU52z+ED/ZyNQWJKT/JfGuO+EAd5GpjPmpK7r4R9ZGGQW0rQ=="; }; }; - "jsii-pacmak-1.21.0" = { + "jsii-pacmak-1.22.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "s1X++lvN8oPTE2e8XI4qADBZ7MUXjfzw0Bjr2at5XwhW8QaSSnGe2KHuqjj0JTUhdlVsRar9JlWXKDwMraYBww=="; }; }; - "jsii-reflect-1.21.0" = { + "jsii-reflect-1.22.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "EsPL/mXNaUsBeF50IHOMizX3R2B8mcKCBEhxvfptXpgMT6BzssNUK4v9MC7tY3c3fR8CNs2dr+I2Bqdgs0ogOg=="; }; }; - "jsii-rosetta-1.21.0" = { + "jsii-rosetta-1.22.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "d+f5vwbaAQCQI+EJLnfSTGYsTWYeUdzb3NJvRLEKiR0y31DWVuMU7y7c+IKrXjNY8vOvphWjPgZ21ECV6/r54g=="; }; }; - "jsii-srcmak-0.1.222" = { + "jsii-srcmak-0.1.238" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.222"; + version = "0.1.238"; 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.238.tgz"; + sha512 = "l1qlMC6IfGGZ46gERs06dBzbJWtkzKPWKm59Qx3cy4VOktB5jxpT48VEi8DpM3SbrIcm7Ga79kJRi9eRHpYaug=="; }; }; "json-bigint-0.2.3" = { @@ -31842,13 +31860,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" = { @@ -36388,6 +36406,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 +36649,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" = { @@ -37621,13 +37648,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 +37675,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" = { @@ -39090,13 +39117,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" = { @@ -39234,13 +39261,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" = { @@ -40000,13 +40027,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 +40234,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 +40288,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 +40360,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.161.0" = { + "office-ui-fabric-react-7.162.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.161.0"; + version = "7.162.0"; 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.0.tgz"; + sha512 = "KLvT9qREaFAH0/TJFaCDMHstZ86yVi4EvG938RyHpzsdbI/ciHjQby7PvfAL5M4l1zAzV52qFjfKL5o4naqCLw=="; }; }; "omggif-1.0.10" = { @@ -40513,13 +40540,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.21.0" = { + "oo-ascii-tree-1.22.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.21.0"; + version = "1.22.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.22.0.tgz"; + sha512 = "IoB8ybGGYKZ2hu4TQts9+AB2T4VHu3Bf896mOt3m1XzV9Xo5fZvO29rFn7Xfy3SaVzm6IjbaXGcxUcCHhz7hRQ=="; }; }; "opal-runtime-1.0.11" = { @@ -40630,13 +40657,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.3.0" = { + "openapi-framework-7.4.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.3.0"; + version = "7.4.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.4.0.tgz"; + sha512 = "F3cxFsKqgojwQryCsv5gAnU3J9Mol2+xCmN8b0m3z2xLlD58bZ88gsOJVLftcxb3F6sRgLZwzdQZztP2LAKKiw=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -40684,13 +40711,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 +40729,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 +41089,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 +41233,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" = { @@ -43556,6 +43574,15 @@ let sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg=="; }; }; + "postcss-8.2.6" = { + name = "postcss"; + packageName = "postcss"; + version = "8.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.2.6.tgz"; + sha512 = "xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -43727,13 +43754,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 +43781,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 +43808,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 +43835,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 +43862,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"; @@ -44348,13 +44411,13 @@ let sha1 = "b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"; }; }; - "pretty-bytes-5.5.0" = { + "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz"; - sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; }; }; "pretty-error-2.1.2" = { @@ -45050,13 +45113,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 +45842,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,6 +45896,15 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; + "pyright-1.1.116" = { + name = "pyright"; + packageName = "pyright"; + version = "1.1.116"; + src = fetchurl { + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.116.tgz"; + sha512 = "SdsLo/bahs+ncCYIY7E4bL/B+ZuI/OdKJudNuUFAJciXEkkkp2ICzpzQSt0n4ZeYsPfqb5g48QoGo7x4a+LDcQ=="; + }; + }; "q-0.9.7" = { name = "q"; packageName = "q"; @@ -46031,13 +46103,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" = { @@ -46238,13 +46310,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" = { @@ -46526,13 +46598,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" = { @@ -46706,13 +46778,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" = { @@ -47795,13 +47867,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" = { @@ -48497,13 +48569,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" = { @@ -48830,6 +48902,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"; @@ -49505,15 +49586,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"; @@ -50081,13 +50153,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.35.1" = { + "simple-git-2.35.2" = { name = "simple-git"; packageName = "simple-git"; - version = "2.35.1"; + version = "2.35.2"; 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.35.2.tgz"; + sha512 = "UjOKsrz92Bx7z00Wla5V6qLSf5X2XSp0sL2gzKw1Bh7iJfDPDaU7gK5avIup0yo1/sMOSUMQer2b9GcnF6nmTQ=="; }; }; "simple-markdown-0.4.4" = { @@ -50135,13 +50207,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" = { @@ -50351,13 +50423,13 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; - "slugify-1.4.6" = { + "slugify-1.4.7" = { name = "slugify"; packageName = "slugify"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.4.6.tgz"; - sha512 = "ZdJIgv9gdrYwhXqxsH9pv7nXxjUEyQ6nqhngRxoAAOlmMGA28FDq5O4/5US4G2/Nod7d1ovNcgURQJ7kHq50KQ=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz"; + sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; }; }; "smart-buffer-4.1.0" = { @@ -50495,13 +50567,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" = { @@ -50612,13 +50684,13 @@ let sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g=="; }; }; - "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" = { @@ -50702,13 +50774,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" = { @@ -51665,13 +51737,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-1.17.1" = { + "ssb-db2-1.18.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "1.17.1"; + version = "1.18.0"; 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.0.tgz"; + sha512 = "SMTNiuWfeIKyOtHI5FcUwOZkfLlJzFWyYTFqA0VXtYtZLAMzfXK+phqbJMZW1ReUXYgFlYZS+w+2oDGj4A8elA=="; }; }; "ssb-ebt-5.6.7" = { @@ -52754,22 +52826,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" = { @@ -52781,31 +52853,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" = { @@ -53564,13 +53636,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.173" = { + "svelte2tsx-0.1.175" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.173"; + version = "0.1.175"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.173.tgz"; - sha512 = "MJv77O61uaLimWeTYUdog9HBJZNDBRBe66Z8oVdZn1H7hhkhnYMWDWutwwPN5QfKkLxZpiIKyw7zTrU69wS9ew=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.175.tgz"; + sha512 = "A3G2piBjQdUQzHu0aHu7jT3i3QCGaUsmdgXzkPTeFT8k6OUigSW/9Pzx9IoiUZ3btXNrqN0q5vNW2kBxcPLoiQ=="; }; }; "sver-compat-1.5.0" = { @@ -53699,13 +53771,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.43.0" = { + "swagger-ui-dist-3.44.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.43.0"; + version = "3.44.0"; 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.0.tgz"; + sha512 = "xqz5rNDKexAEIYST50+Z4fUu7CbJVpALoRJdKOZfddQX+0hAjN9T9bVGRlI054gst62F8SqQAcS84tdcwmSe8A=="; }; }; "swagger2openapi-6.2.3" = { @@ -53825,13 +53897,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" = { @@ -55716,15 +55788,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"; @@ -56229,6 +56292,15 @@ let sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; }; }; + "typescript-4.2.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz"; + sha512 = "tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -56706,13 +56778,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" = { @@ -58219,15 +58291,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"; @@ -58795,13 +58858,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" = { @@ -58831,22 +58894,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" = { @@ -58894,6 +58957,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"; @@ -58948,13 +59020,13 @@ let sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; }; }; - "vscode-jsonrpc-6.0.0-next.2" = { + "vscode-jsonrpc-6.1.0-next.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "6.0.0-next.2"; + version = "6.1.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz"; - sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.2.tgz"; + sha512 = "nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA=="; }; }; "vscode-languageclient-4.0.1" = { @@ -58966,13 +59038,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0" = { + "vscode-languageclient-7.1.0-next.4" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0"; + version = "7.1.0-next.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz"; - sha512 = "P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.1.0-next.4.tgz"; + sha512 = "Gal+DvbI1KIwO1z90MvSnghMCVBCGlwdpOVIS0Hhmep7rjHUOwuC5Df7YlVkpzfPm+RCRyZQnUSJ19VNrnxxhA=="; }; }; "vscode-languageserver-3.5.1" = { @@ -59047,15 +59119,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"; @@ -59092,13 +59155,13 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.4" = { + "vscode-languageserver-protocol-3.17.0-next.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.4"; + version = "3.17.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz"; - sha512 = "6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.5.tgz"; + sha512 = "LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -59182,6 +59245,15 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; + "vscode-languageserver-types-3.17.0-next.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.1.tgz"; + sha512 = "VGzh06oynbYa6JbTKUbxOEZN7CYEtWhN7DK5wfzUpeCJl8X8xZX39g2PVfpqXrIEduu7dcJgK007KgnX9tHNKA=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -59308,13 +59380,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.5" = { + "vue-3.0.6" = { name = "vue"; packageName = "vue"; - version = "3.0.5"; + version = "3.0.6"; 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.6.tgz"; + sha512 = "fgjbe/+f1EsqG7ZbaFSnxdzQXF2DKoFCdJlPxZZJy9XMtyXS6SY8pGzLi8WYb4zmsPLHvTZz4bHW30kFDk7vfA=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -59785,13 +59857,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.114.1" = { + "webtorrent-0.115.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.114.1"; + version = "0.115.0"; 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.0.tgz"; + sha512 = "KYiWsUMdI/qXABrgm3LU+dqsaeyOWx66etJXjiGFyuKWD0tMCwcECdUBdBKcnKPFNQnfuu9sjCPnrWGncF9C5Q=="; }; }; "well-known-symbols-2.0.0" = { @@ -59812,13 +59884,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" = { @@ -61253,13 +61325,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" = { @@ -61487,13 +61559,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" = { @@ -61790,15 +61862,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.1"; + version = "11.2.2"; 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.2.tgz"; + sha512 = "rOVBzDzrMuOgJY43O46/7yYbncx0egGfr+DMJDQdazePGH1H3INN/eA9gkVcVK53ztCYb9X1sbZKOs9TUhF6nw=="; }; 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.2" + sources."@angular-devkit/core-11.2.2" + sources."@angular-devkit/schematics-11.2.2" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.6" // { dependencies = [ @@ -61811,11 +61883,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.2" + sources."@schematics/update-0.1102.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -62031,7 +62103,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" @@ -62267,7 +62339,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" @@ -62548,7 +62620,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" @@ -62602,10 +62674,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" @@ -62613,7 +62685,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" @@ -62623,14 +62695,7 @@ 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" @@ -62678,7 +62743,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" @@ -62692,7 +62757,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.30001192" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -62704,7 +62769,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" @@ -62713,7 +62778,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.675" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -62728,7 +62793,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" @@ -62761,9 +62826,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" @@ -62815,7 +62882,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" @@ -62823,7 +62890,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" @@ -62871,14 +62940,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" @@ -62976,128 +63040,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.0" + 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.4" + (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.4" + 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" @@ -63113,66 +63173,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.8" // { 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.8" (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.0" + sources."@babel/types-7.13.0" ]; }) sources."@babel/types-7.10.4" @@ -63353,24 +63412,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.6" // { 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.6" + (sources."@vue/compiler-sfc-3.0.6" // { 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.6" + sources."@vue/reactivity-3.0.6" + sources."@vue/runtime-core-3.0.6" + sources."@vue/runtime-dom-3.0.6" + sources."@vue/shared-3.0.6" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -63508,6 +63567,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.8" + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -63590,7 +63652,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.1.0" @@ -63690,7 +63752,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" @@ -63720,8 +63782,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" ]; @@ -63742,7 +63804,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" @@ -63817,7 +63879,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.675" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -63901,7 +63963,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" @@ -63978,7 +64040,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" @@ -64043,7 +64105,7 @@ in }) 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" // { @@ -64078,7 +64140,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" @@ -64332,7 +64394,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 = [ @@ -64343,7 +64405,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" @@ -64469,17 +64531,17 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-8.2.6" // { 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" @@ -64497,7 +64559,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" // { @@ -64580,7 +64642,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" @@ -64711,9 +64773,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" @@ -64906,7 +64968,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.5" + sources."vue-3.0.6" ]; }) sources."watch-1.0.2" @@ -65091,12 +65153,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.12.17" + sources."@babel/generator-7.13.0" 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.4" 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" @@ -65172,48 +65234,56 @@ in }; 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.0" // { 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.4" 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.30001192" 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."electron-to-chromium-1.3.675" 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" @@ -65257,6 +65327,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 = [ @@ -65270,7 +65341,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" @@ -65636,7 +65707,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" // { @@ -65648,7 +65719,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" @@ -65679,7 +65750,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" @@ -65693,19 +65764,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-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" @@ -65715,7 +65786,7 @@ 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-symbols-1.0.2" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -65747,7 +65818,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" @@ -65774,7 +65845,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" @@ -65810,8 +65881,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" @@ -65901,7 +65972,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" @@ -66024,7 +66095,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" @@ -66149,7 +66220,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" @@ -66358,7 +66429,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" @@ -66582,7 +66653,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" @@ -66731,13 +66802,13 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; 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.9.tgz"; + sha512 = "S9ER79LVYYGKPoD3Xwm27E5+GBWseLdQ9oKbzIPuJplz++SapOhuHnAYIr9m4nuriQYq4grYonkwaaBQWiGyrA=="; }; dependencies = [ - sources."@jsii/spec-1.21.0" + sources."@jsii/spec-1.22.0" sources."@types/node-10.17.54" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -66747,10 +66818,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.9" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.21.0" // { + (sources."codemaker-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -66789,7 +66860,7 @@ 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-symbols-1.0.2" sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" @@ -66807,31 +66878,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.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.21.0" // { + (sources."jsii-pacmak-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.21.0" // { + (sources."jsii-reflect-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.21.0" // { + (sources."jsii-rosetta-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.222" // { + (sources."jsii-srcmak-0.1.238" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -66853,7 +66924,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.22.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -66879,10 +66950,10 @@ 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" @@ -66907,7 +66978,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -66928,7 +66999,7 @@ in sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA=="; }; dependencies = [ - sources."@jsii/spec-1.21.0" + sources."@jsii/spec-1.22.0" sources."@skorfmann/terraform-cloud-1.9.1" sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" @@ -66986,7 +67057,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."constructs-3.3.29" + sources."constructs-3.3.43" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" @@ -67019,7 +67090,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" @@ -67031,7 +67102,7 @@ in sources."graceful-fs-4.2.6" sources."has-1.0.3" 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" @@ -67070,7 +67141,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.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67078,10 +67149,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.21.0" // { + (sources."jsii-pacmak-1.22.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.21.0" + sources."codemaker-1.22.0" sources."decamelize-5.0.0" sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67089,7 +67160,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.21.0" // { + (sources."jsii-reflect-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67097,7 +67168,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.21.0" // { + (sources."jsii-rosetta-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67105,7 +67176,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.222" // { + (sources."jsii-srcmak-0.1.238" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67162,11 +67233,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.22.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -67218,11 +67289,11 @@ 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" @@ -67250,7 +67321,7 @@ 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" @@ -67351,7 +67422,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" @@ -67364,7 +67435,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 = [ @@ -67384,6 +67455,42 @@ in bypassCache = true; reconstructLock = true; }; + coc-clangd = nodeEnv.buildNodePackage { + name = "coc-clangd"; + packageName = "coc-clangd"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.9.0.tgz"; + sha512 = "QmYLkObs561ld4vqvivzgVpGGpjsx+d0+x2slqKPvB80juKfaZbfcBxttkcAa6giB6qKFU4njhyz4pP54JebZg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "clangd extension for coc.nvim"; + homepage = "https://github.com/clangd/coc-clangd#readme"; + license = "Apache-2.0 WITH LLVM-exception"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + coc-cmake = nodeEnv.buildNodePackage { + name = "coc-cmake"; + packageName = "coc-cmake"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.1.1.tgz"; + sha512 = "1cWC11FqQG6qUNi08xIBgojxR/Q4P2dCbcvVAQup4moCXYpTwF1YdtRmdLNBY6mpSw/5U7A1Sh/8FffrxIgj7A=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "coc.nvim extension for cmake language"; + homepage = "https://github.com/voldikss/coc-cmake#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; @@ -67463,10 +67570,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.2.1"; + version = "2.2.2"; 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.2.2.tgz"; + sha512 = "XM0bJ/dzVatUh6/BOFI/DbfaD4cC9mF+MvVGEmYI+4Xx/wAafWfHrnnpVA7y1mrZ6qTPYtIOCrHW7uXL73dbsA=="; }; buildInputs = globalBuildInputs; meta = { @@ -67529,7 +67636,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.1.5" + sources."typescript-4.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -67650,10 +67757,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" @@ -67699,7 +67806,7 @@ in 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" @@ -67716,7 +67823,7 @@ 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-symbols-1.0.2" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."ieee754-1.2.1" @@ -67793,8 +67900,8 @@ 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" @@ -67830,10 +67937,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 = { @@ -67848,15 +67955,15 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.20"; + version = "1.1.21"; 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.21.tgz"; + sha512 = "KgGvNm7vnJTUfOx7V4PDEoDJRHUMrUqkqdJy/YPk6AaW/fYhm32RGGiwDfcC3WtMv6Xo+d/zCxq5QYj8Pt0q2w=="; }; 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/eslint-visitor-keys-1.0.0" @@ -67928,7 +68035,7 @@ 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.30001192" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -67985,7 +68092,7 @@ 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" // { @@ -68025,7 +68132,7 @@ 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.675" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -68546,7 +68653,7 @@ in sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - 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" @@ -68627,7 +68734,7 @@ in sources."kind-of-5.1.0" ]; }) - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."strip-ansi-6.0.0" ]; @@ -68804,6 +68911,27 @@ in bypassCache = true; reconstructLock = true; }; + coc-pyright = nodeEnv.buildNodePackage { + name = "coc-pyright"; + packageName = "coc-pyright"; + version = "1.1.116"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.116.tgz"; + sha512 = "KI+f2ZI5xYRrbRjejstDfQlY0U5zaEKhQT16SXywzoS49MPsP++yEw0Om6155JopMrKNE2Qo60P0awInopzSAg=="; + }; + dependencies = [ + sources."pyright-1.1.116" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Pyright extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-pyright#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; @@ -68866,10 +68994,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.33.0"; + version = "0.35.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.35.0.tgz"; + sha512 = "iivHZAR6Xec7Tc0sSzEbJaJgnUrLGgb5pVisJgWoHlPDe/KsxYM9JRlKmBqqmcYs9Bmu2vc8j+3Af7ODwW8+2A=="; }; buildInputs = globalBuildInputs; meta = { @@ -68902,10 +69030,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 = { @@ -68943,28 +69071,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.0" + 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.4" 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" @@ -68990,7 +69121,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.30001192" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69006,7 +69137,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" @@ -69028,7 +69159,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.675" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69040,7 +69171,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" @@ -69123,7 +69254,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" @@ -69173,6 +69304,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" ]; }) @@ -69194,7 +69326,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" // { @@ -69210,7 +69342,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" @@ -69230,7 +69362,7 @@ 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" @@ -69256,7 +69388,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; @@ -69285,6 +69417,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-texlab = nodeEnv.buildNodePackage { + name = "coc-texlab"; + packageName = "coc-texlab"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-2.3.0.tgz"; + sha512 = "1Nph3BgqAbANW1LWa49kscQdt8i55fB304YohKvA2y78DlvxIfG0J7UnbIz+R1HQX0TpvwWdD/wzFP6ll68l8w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "TexLab extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-texlab#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-tslint = nodeEnv.buildNodePackage { name = "coc-tslint"; packageName = "coc-tslint"; @@ -69296,7 +69446,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" @@ -69349,10 +69499,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" @@ -69382,13 +69532,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.2" ]; buildInputs = globalBuildInputs; meta = { @@ -69411,12 +69561,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" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -69450,7 +69600,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-plugin-vue-7.6.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -69539,7 +69689,7 @@ 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" @@ -69560,7 +69710,7 @@ 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.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."vls-0.5.10" @@ -69640,10 +69790,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" @@ -69655,16 +69805,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 = [ @@ -69677,16 +69829,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; @@ -69737,10 +69883,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" @@ -69755,7 +69901,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" @@ -69803,7 +69949,7 @@ in 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" @@ -69917,7 +70063,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" ]; }) @@ -70045,7 +70191,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" // { @@ -70314,7 +70460,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" @@ -70333,7 +70479,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" @@ -70379,7 +70525,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" @@ -70418,7 +70564,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" ]; }) @@ -70465,7 +70611,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."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" @@ -70893,7 +71039,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" @@ -70986,10 +71132,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" @@ -71553,7 +71699,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" @@ -71823,7 +71969,7 @@ 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" @@ -71859,7 +72005,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" @@ -72086,32 +72232,43 @@ 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.0" 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.4" + 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" @@ -72137,6 +72294,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 = [ @@ -72152,6 +72310,7 @@ in sources."quick-lru-4.0.1" ]; }) + sources."caniuse-lite-1.0.30001192" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -72162,6 +72321,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" // { @@ -72185,13 +72345,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.675" 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" @@ -72204,13 +72366,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" @@ -72282,6 +72444,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" @@ -72374,7 +72537,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" @@ -72435,20 +72598,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.0" + 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" @@ -72508,13 +72671,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" @@ -72615,7 +72778,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" // { @@ -72663,7 +72826,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" @@ -72818,7 +72981,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" @@ -72872,7 +73035,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" @@ -72893,7 +73056,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" ]; }) @@ -72943,7 +73106,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 = [ @@ -72991,7 +73154,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" @@ -73131,7 +73294,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" // { @@ -73312,7 +73475,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" @@ -73482,7 +73645,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.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -73492,7 +73655,7 @@ in sources."openapi-types-7.2.3" ]; }) - (sources."openapi-framework-7.3.0" // { + (sources."openapi-framework-7.4.0" // { dependencies = [ sources."openapi-types-7.2.3" ]; @@ -73507,12 +73670,12 @@ in 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" ]; @@ -73629,7 +73792,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" @@ -74116,20 +74279,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" @@ -74239,7 +74402,7 @@ 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" @@ -74272,22 +74435,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" @@ -74318,7 +74481,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 = [ @@ -74399,7 +74562,7 @@ 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" @@ -74452,66 +74615,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.0" 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.4" // { + 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.4" + 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" @@ -74529,47 +74697,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.8" // { 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" // { @@ -74579,29 +74748,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.8" 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" @@ -74612,27 +74779,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" @@ -74645,17 +74817,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" @@ -74737,18 +74909,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" @@ -74771,10 +74931,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" @@ -74783,18 +74939,14 @@ 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" // { dependencies = [ sources."source-map-0.6.1" @@ -74859,11 +75011,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" @@ -74879,7 +75027,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" @@ -74890,7 +75038,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" // { @@ -74907,11 +75055,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" @@ -74919,6 +75063,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.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" 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" @@ -74948,7 +75099,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" @@ -75023,7 +75174,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -75092,7 +75243,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -75143,18 +75294,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" ]; @@ -75163,7 +75315,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" @@ -75243,7 +75395,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" @@ -75257,18 +75408,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" @@ -75302,10 +75444,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.675" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."emoji-regex-8.0.0" @@ -75353,7 +75495,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" @@ -75379,7 +75521,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" ]; @@ -75406,7 +75548,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" @@ -75426,10 +75568,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" @@ -75499,13 +75648,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" @@ -75535,7 +75684,7 @@ in }) 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-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -75604,18 +75753,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" @@ -75752,7 +75900,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" @@ -75801,16 +75949,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" @@ -75909,7 +76057,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" @@ -75924,7 +76072,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" @@ -75955,7 +76103,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 = [ @@ -75978,7 +76126,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" @@ -76008,8 +76156,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" // { @@ -76059,14 +76207,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" @@ -76084,19 +76228,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" @@ -76231,7 +76367,7 @@ in sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-4.1.0" sources."prepend-http-3.0.1" - sources."pretty-bytes-5.5.0" + sources."pretty-bytes-5.6.0" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -76253,7 +76389,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" @@ -76282,7 +76418,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" @@ -76300,13 +76436,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" ]; }) @@ -76315,7 +76450,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" @@ -76415,11 +76550,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 = [ @@ -76428,9 +76559,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" @@ -76452,19 +76583,23 @@ 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" ]; }) - sources."slugify-1.4.6" + sources."slugify-1.4.7" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -76562,9 +76697,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 = [ @@ -76619,14 +76754,18 @@ in 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" @@ -76640,11 +76779,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" @@ -76904,10 +77045,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" ]; }) @@ -76992,10 +77135,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" ]; @@ -77421,7 +77560,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" @@ -77697,7 +77836,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" @@ -77765,10 +77904,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" @@ -77777,7 +77916,7 @@ 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" ]; @@ -77814,7 +77953,6 @@ 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" @@ -77894,7 +78032,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" ]; @@ -78414,7 +78552,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" ]; @@ -78575,7 +78713,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" ]; }) @@ -78640,13 +78778,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 = { @@ -78669,7 +78807,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" @@ -78793,7 +78931,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" @@ -78804,7 +78942,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" @@ -78825,7 +78963,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 = { @@ -79003,7 +79141,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 = [ @@ -79261,7 +79399,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" ]; @@ -79275,6 +79413,24 @@ in bypassCache = true; reconstructLock = true; }; + ganache-cli = nodeEnv.buildNodePackage { + name = "ganache-cli"; + packageName = "ganache-cli"; + version = "6.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.12.2.tgz"; + sha512 = "bnmwnJDBDsOWBUP8E/BExWf85TsdDEFelQSzihSJm9VChVO1SHp94YXLP5BlA4j/OTxp0wR4R1Tje9OHOuAJVw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "

NOTICE: testrpc is now ganache-cli. Use it just as you would testrpc.

"; + homepage = "https://github.com/trufflesuite/ganache-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -79540,15 +79696,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" @@ -79562,7 +79718,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.1.1" + sources."ajv-formats-1.5.1" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -79605,8 +79762,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" @@ -79620,7 +79781,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" @@ -79631,7 +79792,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" @@ -79677,7 +79837,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" @@ -79698,7 +79858,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" ]; @@ -79766,11 +79926,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" @@ -79786,7 +79947,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" @@ -79814,7 +79975,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 = { @@ -79838,7 +79999,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" @@ -79872,7 +80033,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" ]; @@ -79887,7 +80048,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" @@ -80048,7 +80209,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" @@ -80090,7 +80251,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."http-cache-semantics-4.1.0" sources."http-errors-1.8.0" sources."http-signature-1.2.0" @@ -80302,7 +80463,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" ]; @@ -80329,14 +80490,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" @@ -80383,7 +80544,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 = { @@ -80667,10 +80828,10 @@ in makam = nodeEnv.buildNodePackage { name = "makam"; packageName = "makam"; - version = "0.7.39"; + version = "0.7.40"; src = fetchurl { - url = "https://registry.npmjs.org/makam/-/makam-0.7.39.tgz"; - sha512 = "6XvSBJfpz1Jr5UHajYsKKLDlFcdYuhVmOJu3IqKsD14BcYoi+oZ+wfta8CVbKvRJDT7mF7e9dzCei8+nlsA3kA=="; + url = "https://registry.npmjs.org/makam/-/makam-0.7.40.tgz"; + sha512 = "EfuAPhLvKuN2ruOqyDpG8epeaDzAKg/6K5BgaDMaivJ9+DC84eI7PsluBYe01cuEJGaOoQCtO2mGKwMy7o2DNw=="; }; buildInputs = globalBuildInputs; meta = { @@ -80876,7 +81037,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" @@ -81091,7 +81252,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 = [ @@ -81482,7 +81643,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 = [ @@ -81876,7 +82037,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" @@ -81930,7 +82091,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" @@ -82742,7 +82903,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" @@ -82773,7 +82934,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" @@ -82845,9 +83006,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" @@ -82857,7 +83018,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" @@ -82867,7 +83028,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" @@ -82877,35 +83038,35 @@ 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."@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.3" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -82995,8 +83156,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" @@ -83046,7 +83207,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 = [ @@ -83098,7 +83259,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 = { @@ -83288,7 +83449,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.853.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -83449,7 +83610,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" @@ -84034,7 +84195,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.17" + sources."@babel/parser-7.13.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -84415,7 +84576,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" @@ -84450,7 +84611,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 = { @@ -84548,7 +84709,7 @@ 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" @@ -84600,7 +84761,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" @@ -84622,7 +84783,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" @@ -84639,7 +84800,7 @@ in sources."ws-7.4.3" 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 = { @@ -84686,7 +84847,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" @@ -85016,7 +85177,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."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -85118,7 +85279,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.1.0" + sources."@octokit/openapi-types-5.2.1" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -85144,7 +85305,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.10.0" + sources."@octokit/types-6.11.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" @@ -85513,7 +85674,7 @@ in 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-symbols-1.0.2" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -85654,7 +85815,7 @@ in sources."semver-7.3.4" sources."type-fest-0.18.1" sources."yallist-4.0.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; }) sources."merge2-1.4.1" @@ -85793,7 +85954,7 @@ in 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."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" @@ -85841,7 +86002,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-queue-1.0.3" - 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" @@ -85940,8 +86101,8 @@ in sources."strip-ansi-4.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."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -86072,7 +86233,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" @@ -86955,51 +87116,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.0" 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.4" + 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.4" 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" @@ -87015,46 +87177,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.8" 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.8" 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.8" 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" @@ -87121,7 +87283,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" // { @@ -87164,6 +87326,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.8" + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" 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" @@ -87203,7 +87368,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 = [ @@ -87245,7 +87410,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.30001192" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -87294,7 +87459,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 = [ @@ -87317,7 +87482,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" ]; @@ -87325,7 +87490,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" @@ -87340,6 +87505,7 @@ in }) (sources."cross-spawn-6.0.5" // { dependencies = [ + sources."semver-5.7.1" sources."which-1.3.1" ]; }) @@ -87361,17 +87527,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.675" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."emoji-regex-7.0.3" @@ -87499,7 +87665,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 = [ @@ -87569,11 +87735,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" @@ -87610,14 +87772,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" @@ -87634,7 +87793,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" @@ -87668,7 +87827,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" @@ -87678,8 +87837,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" @@ -87742,7 +87905,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" @@ -87822,7 +87985,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" // { @@ -87947,6 +88110,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" ]; }) @@ -88560,16 +88724,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/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" @@ -88626,7 +88790,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" @@ -88644,7 +88808,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" @@ -88673,7 +88837,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" @@ -88722,23 +88886,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."@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.0" + 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.147" 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" @@ -88805,7 +88969,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.4.0" sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -88865,17 +89029,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.0" 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.4.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-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" @@ -88956,7 +89120,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.0" sources."tail-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -89016,7 +89180,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" ]; }) @@ -89083,7 +89247,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" ]; }) @@ -89093,7 +89257,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" ]; }) @@ -89240,61 +89404,66 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.8.4"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.4.tgz"; - sha512 = "LHuNVJ11NtTgDSzlFJc+AGrZTbRd61RgzXRk+LulKIYZOB20x6tYPLCfwMsHlvNUXJIhA6Mve+QEu4hB7M41Bw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.10.2.tgz"; + sha512 = "OPdLNdrk0CDnPdQ6DNrJTLwDf9Nzay5VLlcApuEQQ+twvAhW1cA30YDwX6t5pr+tSA+MpxWEFmWdRNMgbaZ1oQ=="; }; 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.0" 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.4" // { + 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.4" + 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" @@ -89308,58 +89477,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.8" // { 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.8" 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.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -89385,7 +89554,7 @@ in sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.13" + sources."@netlify/functions-utils-1.3.14" (sources."@netlify/git-utils-1.0.8" // { dependencies = [ sources."braces-3.0.2" @@ -89426,7 +89595,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.4.0" // { dependencies = [ sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -89542,7 +89711,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" @@ -89560,7 +89729,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.1.0" + sources."@octokit/openapi-types-5.2.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -89585,7 +89754,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.10.0" + sources."@octokit/types-6.11.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -89680,7 +89849,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.853.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -89688,6 +89857,13 @@ in ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" + (sources."babel-plugin-polyfill-corejs2-0.1.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" sources."backoff-2.5.0" sources."bail-1.0.5" sources."balanced-match-1.0.0" @@ -89741,7 +89917,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.30001192" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -89828,7 +90004,7 @@ 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."colorette-1.2.2" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -89873,7 +90049,7 @@ 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" ]; @@ -89998,7 +90174,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.675" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -90009,7 +90185,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.53" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -90087,7 +90263,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" @@ -90115,7 +90291,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" @@ -90200,7 +90376,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" // { @@ -90288,7 +90464,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" @@ -90407,6 +90587,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" @@ -90524,7 +90705,7 @@ in 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" // { @@ -90742,7 +90923,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" @@ -90757,7 +90938,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" @@ -90885,7 +91066,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" @@ -90969,14 +91150,14 @@ in 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.2" 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" ]; @@ -91010,6 +91191,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" @@ -91647,7 +91829,7 @@ in sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" sources."@node-red/editor-api-1.2.9" sources."@node-red/editor-client-1.2.9" (sources."@node-red/nodes-1.2.9" // { @@ -91814,7 +91996,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" @@ -91936,7 +92118,7 @@ in sources."ws-7.4.3" ]; }) - (sources."mqtt-packet-6.8.1" // { + (sources."mqtt-packet-6.9.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -92440,7 +92622,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" @@ -92492,7 +92674,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" @@ -92599,7 +92781,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" @@ -92613,7 +92795,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" @@ -92936,7 +93118,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" @@ -92955,7 +93137,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" @@ -92999,7 +93181,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; @@ -93015,10 +93197,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.5.4"; + version = "7.6.0"; 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.0.tgz"; + sha512 = "1Jexc9EoGJEMEdWWLQMs2a7a5nNtD0INmBY4Gzv+RI727VZO05kruXhL8NnHtsvBfVn+eoMmBJKzy1exJRfymQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93033,10 +93215,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.1.4"; + version = "11.1.9"; 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.1.9.tgz"; + sha512 = "Ztl5q785Hw+yiUUnlhN/lmrYdzDpH6Mopr0xtijb9t6ltS4RwkIU9qZXuYlOJtPyEXNdmEdmSc2NpfFFs/Nreg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -93083,7 +93265,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" ]; }) @@ -93141,7 +93323,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" @@ -93304,7 +93486,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" @@ -93365,7 +93547,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" ]; }) @@ -93374,7 +93556,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" ]; }) @@ -93619,55 +93801,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.0" // { 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.4" // { + 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.4" + 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" @@ -93683,46 +93875,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.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" 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" @@ -93759,7 +93955,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" // { @@ -93777,6 +93973,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.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -93798,7 +94001,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" @@ -93837,7 +94040,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.30001192" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -93852,7 +94055,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -93864,7 +94067,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" ]; @@ -93873,7 +94076,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" @@ -93952,7 +94155,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" // { @@ -93972,10 +94175,10 @@ 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.675" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."encodeurl-1.0.2" @@ -93996,7 +94199,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 = [ @@ -94054,7 +94257,7 @@ in ]; }) 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 = [ @@ -94167,6 +94370,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" @@ -94192,7 +94396,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" @@ -94227,7 +94431,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" @@ -94241,7 +94445,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" @@ -94340,7 +94544,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" @@ -94468,8 +94672,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" // { @@ -94697,7 +94901,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" @@ -94871,10 +95075,10 @@ in patch-package = nodeEnv.buildNodePackage { name = "patch-package"; packageName = "patch-package"; - version = "6.2.2"; + version = "6.4.0"; 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.0.tgz"; + sha512 = "KePc85SXRoN//6T4uSDvWpH05xfyH+VGbtzgeNNsGgallox5l4UKWFHCd26SCfAI9ob9DB7MZqsxMjGMweIY+A=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -94988,6 +95192,7 @@ in sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" (sources."is-number-3.0.0" // { dependencies = [ @@ -94996,6 +95201,7 @@ in }) sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -95031,6 +95237,7 @@ in 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" @@ -95175,7 +95382,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" @@ -95242,7 +95449,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" @@ -95352,7 +95559,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" @@ -95499,7 +95706,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" @@ -95701,7 +95908,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" @@ -95821,10 +96028,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" // { @@ -95864,7 +96071,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" ]; @@ -95872,7 +96079,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" @@ -95947,7 +96154,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" // { @@ -96080,7 +96287,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" @@ -96115,10 +96321,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.17.3"; + version = "5.18.1"; 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.1.tgz"; + sha512 = "pGOoysRHIarMHkF8ZxRwCN39ZWSffivlK+Bo4mkuFeRSKwQhF2e04n/PxQttyj6kfN0nR+4RkxFcY7Ts+Y10ZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -96169,7 +96375,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" @@ -96196,7 +96402,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" @@ -96205,7 +96411,7 @@ 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" @@ -96257,7 +96463,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" @@ -96266,7 +96472,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 = { @@ -96348,7 +96554,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" // { @@ -96360,7 +96566,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" @@ -96408,7 +96614,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" @@ -96421,14 +96627,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" @@ -96474,7 +96680,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" @@ -96517,7 +96723,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" @@ -96667,10 +96873,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.113"; + version = "1.1.116"; 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.116.tgz"; + sha512 = "SdsLo/bahs+ncCYIY7E4bL/B+ZuI/OdKJudNuUFAJciXEkkkp2ICzpzQSt0n4ZeYsPfqb5g48QoGo7x4a+LDcQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -96685,10 +96891,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" @@ -96756,7 +96962,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" @@ -96779,7 +96989,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" @@ -96873,7 +97083,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" @@ -96938,7 +97148,7 @@ 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-symbols-1.0.2" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -96979,8 +97189,8 @@ 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."utile-0.2.1" @@ -97170,7 +97380,7 @@ 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" @@ -97193,7 +97403,7 @@ in 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 = { @@ -97215,7 +97425,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.12.17" // { + (sources."@babel/generator-7.13.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -97226,12 +97436,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.4" + sources."@babel/runtime-7.13.8" 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" @@ -97246,7 +97456,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" // { @@ -97259,7 +97469,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" @@ -97296,11 +97506,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" @@ -97315,14 +97525,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" ]; }) @@ -97332,7 +97542,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" @@ -97391,7 +97601,7 @@ 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" @@ -97438,7 +97648,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" @@ -97479,13 +97689,13 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."slugify-1.4.6" + sources."slugify-1.4.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" 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" @@ -97535,7 +97745,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -97568,10 +97778,10 @@ in 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" @@ -97594,12 +97804,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" ]; @@ -97624,13 +97834,13 @@ in 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."@typescript-eslint/eslint-plugin-4.15.2" + sources."@typescript-eslint/experimental-utils-4.15.2" + sources."@typescript-eslint/parser-4.15.2" + sources."@typescript-eslint/scope-manager-4.15.2" + sources."@typescript-eslint/types-4.15.2" + sources."@typescript-eslint/typescript-estree-4.15.2" + sources."@typescript-eslint/visitor-keys-4.15.2" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -97711,7 +97921,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" ]; @@ -97746,7 +97956,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" @@ -97886,7 +98096,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" @@ -97905,7 +98115,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" @@ -97934,7 +98144,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.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" @@ -97943,17 +98153,17 @@ in 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."vsce-1.85.1" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageclient-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-types-3.16.0" + sources."vscode-jsonrpc-6.1.0-next.2" + sources."vscode-languageclient-7.1.0-next.4" + sources."vscode-languageserver-protocol-3.17.0-next.5" + sources."vscode-languageserver-types-3.17.0-next.1" sources."vscode-test-1.5.1" sources."which-2.0.2" (sources."wide-align-1.1.3" // { @@ -98288,10 +98498,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.25.2"; + version = "2.28.0"; 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.0.tgz"; + sha512 = "3sd09oTyr9X8qle39WeO6076uFSd2pQlItt5n/LVGyb+PW/ScnVqutYxslZgYa94P87jZGl8XLuSoD3xQ233iw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -98323,7 +98533,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.7.0" // { + (sources."@serverless/components-3.7.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."js-yaml-3.14.1" @@ -98345,7 +98555,7 @@ 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" ]; @@ -98442,7 +98652,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.853.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -98481,7 +98691,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" ]; @@ -98669,7 +98879,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" @@ -98681,7 +98891,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" @@ -98716,13 +98926,13 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" 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" @@ -98748,7 +98958,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" @@ -98769,7 +98979,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" ]; }) @@ -98994,7 +99204,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" @@ -99008,7 +99218,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.35.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -99145,7 +99355,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" ]; }) @@ -99164,7 +99374,7 @@ 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" ]; }) @@ -99820,10 +100030,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.458.0"; + version = "1.462.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.462.0.tgz"; + sha512 = "DJ17t2ZAvdUwE+PoOU8o4k2wkvq+HxZYcuLVMGdVWprPnScnnA0R918vaJDYDEGNUIhJwe6liXbBoY7UQahr8A=="; }; dependencies = [ sources."@open-policy-agent/opa-wasm-1.2.0" @@ -99964,7 +100174,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" @@ -100026,6 +100236,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" @@ -100040,7 +100255,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" @@ -100219,7 +100434,7 @@ in sources."restore-cursor-3.1.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.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -100238,7 +100453,7 @@ in 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."tmp-0.2.1" @@ -100310,7 +100525,7 @@ in }) ]; }) - sources."snyk-python-plugin-1.19.4" + sources."snyk-python-plugin-1.19.5" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.7" @@ -100351,7 +100566,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" ]; @@ -100444,10 +100659,10 @@ 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" @@ -100924,7 +101139,7 @@ in sources."has-ansi-2.0.0" 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" @@ -101266,7 +101481,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" @@ -101440,7 +101655,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.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -101448,10 +101663,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" @@ -101522,9 +101739,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" @@ -101701,7 +101918,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.853.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -101885,7 +102102,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" @@ -101921,7 +102138,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" // { @@ -102141,7 +102358,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" @@ -102476,28 +102693,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.0" + 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.4" 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" @@ -102523,7 +102743,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.30001192" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -102539,7 +102759,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" @@ -102561,7 +102781,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.675" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -102572,7 +102792,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" @@ -102655,7 +102875,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" @@ -102704,6 +102924,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" ]; }) @@ -102725,7 +102946,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" // { @@ -102741,7 +102962,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" @@ -102760,7 +102981,7 @@ 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" @@ -102776,7 +102997,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; @@ -102792,15 +103013,15 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.13"; + version = "0.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.13.tgz"; - sha512 = "txU6P3x6ur3u19doo379L88hw07dscABr8JXWFfKAPaXFP06Qb3Wq9IO/sf+Rb8+R8BWyr5Cu9E1lnIovviwQQ=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.15.tgz"; + sha512 = "7tYY1iEVc883QABfXDjwqHwVbJlsWkfgMQhR3PisHuzICGMCCV8Y/oZnhP9Tzc/R8N+tanBhQCYaGlfgE+T1lQ=="; }; 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" @@ -102820,7 +103041,7 @@ 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" @@ -102857,10 +103078,10 @@ in sources."supports-color-5.5.0" sources."svelte-3.32.3" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.173" + sources."svelte2tsx-0.1.175" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" - sources."typescript-4.1.5" + sources."typescript-4.2.2" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -102886,12 +103107,13 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.0.3"; + version = "2.1.0"; 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.1.0.tgz"; + sha512 = "f5iEvWkSesVHPqBBc26s9/9LFKJZ+4aWPpOVX0uxXz/39SlNL4XuwfhOWsqOS5Q1j7Z6WLayCF/s1lISeAHjwA=="; }; dependencies = [ + sources."@trysound/sax-0.1.1" sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" sources."chalk-4.1.0" @@ -102911,7 +103133,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" @@ -103804,7 +104025,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" @@ -103990,7 +104211,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" @@ -104016,7 +104237,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" @@ -104316,7 +104537,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" @@ -104356,7 +104577,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" ]; @@ -104562,7 +104783,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."inherits-2.0.4" sources."is-callable-1.2.3" sources."is-date-object-1.0.2" @@ -104573,12 +104794,12 @@ in 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" @@ -104618,7 +104839,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."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-regex-1.1.2" @@ -104626,8 +104847,8 @@ in 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" ]; buildInputs = globalBuildInputs; meta = { @@ -104716,7 +104937,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."is-callable-1.2.3" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" @@ -104727,8 +104948,8 @@ in 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" ]; buildInputs = globalBuildInputs; meta = { @@ -104759,7 +104980,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" @@ -104842,7 +105063,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" @@ -104875,7 +105096,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" @@ -104887,7 +105108,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" @@ -104968,7 +105189,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 = [ @@ -105233,10 +105454,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.125.2"; + version = "0.126.0"; 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.0.tgz"; + sha512 = "/MecvboUefStCkUfXLImoJxthN+FoLPcEP7pz1r1Dd9i8BPGGuj+S1sOPRvW4Z+ViZjP2oWWm1inNC/MT52ybA=="; }; buildInputs = globalBuildInputs; meta = { @@ -105665,10 +105886,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.1.5"; + version = "4.2.2"; 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.2.tgz"; + sha512 = "tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -105898,7 +106119,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" @@ -105989,7 +106210,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" @@ -106027,7 +106248,7 @@ in 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 = { @@ -106061,7 +106282,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" ]; }) @@ -106196,7 +106417,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" ]; }) @@ -106207,11 +106428,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 = { @@ -106226,10 +106447,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" @@ -106247,18 +106468,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 = { @@ -106357,10 +106578,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" @@ -106369,22 +106590,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 = { @@ -106493,7 +106713,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" // { @@ -106517,7 +106737,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" @@ -106609,7 +106829,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" @@ -106630,7 +106850,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" @@ -106647,7 +106867,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" @@ -106678,7 +106898,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 = [ @@ -106758,7 +106978,7 @@ in sources."growl-1.10.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 = [ @@ -106868,7 +107088,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" @@ -106968,7 +107188,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" @@ -107096,8 +107316,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" @@ -107173,9 +107393,9 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.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" @@ -107459,7 +107679,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" @@ -107544,7 +107764,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" @@ -108175,7 +108395,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" @@ -108399,7 +108619,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" ]; @@ -108479,7 +108699,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" @@ -108648,7 +108868,7 @@ 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" @@ -108862,7 +109082,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 = [ @@ -109242,7 +109462,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" @@ -109382,7 +109602,7 @@ 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 = [ @@ -109404,10 +109624,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.23.0"; + version = "5.24.2"; 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.2.tgz"; + sha512 = "uxxKYEY4kMNjP+D2Y+8aw5Vd7ar4pMuKCNemxV26ysr1nk0YDiQTylg9U3VZIdkmI0YHa0uC8ABxL+uGxGWWJg=="; }; dependencies = [ sources."@types/eslint-7.2.6" @@ -109437,13 +109657,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.30001192" 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.675" sources."enhanced-resolve-5.7.0" - sources."es-module-lexer-0.3.26" + sources."es-module-lexer-0.4.0" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -109452,7 +109672,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" @@ -109466,7 +109686,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" @@ -109515,7 +109735,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" @@ -109767,7 +109987,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" @@ -109794,7 +110014,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 = [ @@ -110175,7 +110395,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."fill-range-7.0.1" sources."glob-parent-5.1.1" sources."globby-11.0.2" @@ -110275,7 +110495,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" @@ -110384,7 +110604,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 = [ @@ -110424,7 +110644,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" @@ -110454,7 +110674,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" @@ -110504,7 +110724,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.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -110662,8 +110882,8 @@ 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.8" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -110785,7 +111005,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" @@ -110887,7 +111107,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" @@ -110925,7 +111145,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 = [ @@ -111204,7 +111424,7 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.5.0" + sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -111269,7 +111489,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" @@ -111538,7 +111758,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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix index e4edac5fdc1..2f85221e539 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix index d8ef2fec999..2537c92d97a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index 9284bbaf9c6..94f254a2edf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index de0bc13e283..efb7f41b95d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -1,20 +1,21 @@ -{ lib, fetchurl, buildDunePackage, alcotest, bos, dune-configurator }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }: buildDunePackage rec { pname = "base64"; - version = "3.4.0"; + version = "3.5.0"; + + minimumOCamlVersion = "4.03"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; - sha256 = "0d0n5gd4nkdsz14jnxq13f1f7rzxmndg5xql039a8wfppmazd70w"; + sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; }; - buildInputs = [ bos dune-configurator ]; - - doCheck = true; - checkInputs = [ alcotest ]; + # otherwise fmt breaks evaluation + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest bos rresult ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix index 6d833b48f26..487249ce5ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix index 8e0780ae6c5..535b34b03dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix index 6bae728cafa..ec20eedd768 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix new file mode 100644 index 00000000000..5bf7be4e779 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -0,0 +1,66 @@ +{ lib, buildDunePackage, fetchurl +, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims +, bigarray-compat, checkseum, logs, psq, fmt +, result, rresult, fpath, base64, bos, digestif, mmap, alcotest +, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner +}: + +buildDunePackage rec { + pname = "carton"; + version = "0.2.0"; + + useDune2 = true; + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; + sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn"; + }; + + # remove changelogs for mimic and the git* packages + postPatch = '' + rm CHANGES.md CHANGES.mimic.md + ''; + + buildInputs = [ + cmdliner + digestif + mmap + result + rresult + fpath + bos + ]; + propagatedBuildInputs = [ + ke + duff + decompress + cstruct + optint + bigstringaf + stdlib-shims + bigarray-compat + checkseum + logs + psq + fmt + ]; + + doCheck = true; + checkInputs = [ + base64 + alcotest + alcotest-lwt + crowbar + lwt + findlib + mirage-flow + ]; + + meta = with lib; { + description = "Implementation of PACKv2 file in OCaml"; + license = licenses.mit; + homepage = "https://github.com/mirage/ocaml-git"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix new file mode 100644 index 00000000000..ef41ff2b594 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix @@ -0,0 +1,28 @@ +{ buildDunePackage, carton, carton-lwt +, bigarray-compat, bigstringaf, lwt, fpath, result +, mmap, fmt, decompress, astring +, alcotest, alcotest-lwt, cstruct, logs +, mirage-flow, rresult, ke +}: + +buildDunePackage { + pname = "carton-git"; + + inherit (carton) version src useDune2 minimumOCamlVersion postPatch; + + propagatedBuildInputs = [ + carton + carton-lwt + bigarray-compat + bigstringaf + lwt + fpath + result + mmap + fmt + decompress + astring + ]; + + inherit (carton) meta; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix new file mode 100644 index 00000000000..024ff51559e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix @@ -0,0 +1,46 @@ +{ buildDunePackage, carton +, lwt, decompress, optint, bigstringaf +, alcotest, alcotest-lwt, cstruct, fmt, logs +, mirage-flow, result, rresult, bigarray-compat +, ke, base64, bos, checkseum, digestif, fpath, mmap +, stdlib-shims +, git-binary # pkgs.git +}: + +buildDunePackage { + pname = "carton-lwt"; + + inherit (carton) version src useDune2 minimumOCamlVersion postPatch; + + propagatedBuildInputs = [ + carton + lwt + decompress + optint + bigstringaf + ]; + + doCheck = true; + checkInputs = [ + git-binary + alcotest + alcotest-lwt + cstruct + fmt + logs + mirage-flow + result + rresult + bigarray-compat + ke + base64 + bos + checkseum + digestif + fpath + mmap + stdlib-shims + ]; + + inherit (carton) meta; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix index 067fac33d45..f53e166c662 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,22 +1,23 @@ { lib, fetchurl, buildDunePackage -, checkseum, cmdliner -, alcotest, bos, camlzip, mmap, re +, checkseum, bigarray-compat, optint +, bigstringaf, alcotest, hxd, camlzip, base64 }: buildDunePackage rec { - version = "0.9.0"; + version = "1.2.0"; pname = "decompress"; + minimumOCamlVersion = "4.07"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; - sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; + sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i"; }; - buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ checkseum ]; - checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ]; + propagatedBuildInputs = [ optint bigarray-compat checkseum ]; + checkInputs = [ alcotest bigstringaf hxd camlzip base64 ]; doCheck = true; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix index dd8a0f57164..e2501c60f5a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/directories/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/directories/default.nix new file mode 100644 index 00000000000..eae11953113 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix index 8c9dad42fd7..64a32d179d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix @@ -1,24 +1,29 @@ { lib, fetchurl, buildDunePackage -, cstruct, fmt -, bos, cmdliner, fpath, logs -, alcotest +, stdlib-shims, bigarray-compat, fmt +, alcotest, hxd, crowbar, bigstringaf }: buildDunePackage rec { pname = "duff"; - version = "0.2"; + version = "0.3"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz"; - sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq"; + sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm"; }; - buildInputs = [ bos cmdliner fpath logs ] ++ lib.optional doCheck alcotest; - propagatedBuildInputs = [ cstruct fmt ]; + propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ]; doCheck = true; + checkInputs = [ + alcotest + crowbar + hxd + bigstringaf + ]; + meta = { description = "Pure OCaml implementation of libXdiff (Rabin’s fingerprint)"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index e2d2a2c5dc9..5c93c111040 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchzip, buildDunePackage, camlp5 , ppxlib, ppx_deriving, re, perl, ncurses -, version ? "1.12.0" +, version ? "1.13.0" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr"; release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; releaseRev = v: "v${v}"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix index dd05982c3ca..95eb75ee7ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix @@ -1,19 +1,20 @@ { lib, buildDunePackage, fetchurl, ocaml -, fmt, bigstringaf, bigarray-compat -, bigarray-overlap, angstrom, ke, alcotest }: +, fmt, bigstringaf, angstrom, alcotest }: buildDunePackage rec { pname = "encore"; - version = "0.5"; + version = "0.7"; + + minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz"; - sha256 = "15n0dla149k9h7migs76wap08z5402qcvxyqxzl887ha6isj3p9n"; + sha256 = "0cwmhkj5jmk3z5y0agmkf5ygpgxynjkq2d7d50jgzmnqs7f6g7nh"; }; useDune2 = true; - propagatedBuildInputs = [ angstrom ke fmt bigstringaf bigarray-compat bigarray-overlap ]; + propagatedBuildInputs = [ angstrom fmt bigstringaf ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix deleted file mode 100644 index 54bd5c2da23..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git-http/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ buildDunePackage, git, cohttp, cohttp-lwt }: - -buildDunePackage { - pname = "git-http"; - inherit (git) version src minimumOCamlVersion; - - useDune2 = true; - - propagatedBuildInputs = [ git cohttp cohttp-lwt ]; - - meta = { - description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; - inherit (git.meta) homepage license maintainers; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix deleted file mode 100644 index 6ee6ef21c15..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git-unix/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, buildDunePackage, git-http, cohttp, cohttp-lwt-unix -, mmap, cmdliner, mtime, alcotest, mirage-crypto-rng, tls -, io-page, git-binary -}: - -buildDunePackage { - pname = "git-unix"; - inherit (git-http) version src minimumOCamlVersion; - - useDune2 = true; - - propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; - checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; - doCheck = !stdenv.isAarch64; - - meta = { - description = "Unix backend for the Git protocol(s)"; - inherit (git-http.meta) homepage license maintainers; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix new file mode 100644 index 00000000000..d3088400641 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-mirage.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage +, git, mimic, cohttp-mirage, cohttp, cohttp-lwt +, fmt, lwt, result, rresult, uri +}: + +buildDunePackage { + pname = "git-cohttp-mirage"; + + inherit (git) version src minimumOCamlVersion useDune2; + + propagatedBuildInputs = [ + git mimic cohttp-mirage cohttp cohttp-lwt fmt lwt result rresult uri + ]; + + meta = git.meta // { + description = "A package to use HTTP-based ocaml-git with MirageOS backend"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-unix.nix new file mode 100644 index 00000000000..ac6d423d58a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp-unix.nix @@ -0,0 +1,17 @@ +{ buildDunePackage, git, git-cohttp +, cohttp-lwt-unix, cohttp-lwt, fmt, lwt, result, rresult, uri +}: + +buildDunePackage { + pname = "git-cohttp-unix"; + + inherit (git) version src minimumOCamlVersion useDune2; + + propagatedBuildInputs = [ + git git-cohttp cohttp-lwt-unix cohttp-lwt fmt lwt result rresult uri + ]; + + meta = git.meta // { + description = "A package to use HTTP-based ocaml-git with Unix backend"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp.nix new file mode 100644 index 00000000000..e9126ba4bec --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/cohttp.nix @@ -0,0 +1,19 @@ +{ buildDunePackage, git +, cohttp, cohttp-lwt, fmt, lwt, result, rresult, uri +, alcotest, alcotest-lwt, bigstringaf, cstruct, logs +, mirage-flow, ke +}: + +buildDunePackage rec { + pname = "git-cohttp"; + + inherit (git) version minimumOCamlVersion src useDune2; + + propagatedBuildInputs = [ + git cohttp cohttp-lwt fmt lwt result rresult uri + ]; + + meta = git.meta // { + description = "A package to use HTTP-based ocaml-git with Unix backend"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index f5cb452f1a9..8ef1c3627f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -1,33 +1,40 @@ { stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum -, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult -, stdlib-shims +, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64 +, result, bigstringaf, optint, mirage-flow, domain-name, emile +, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt }: buildDunePackage rec { pname = "git"; - version = "2.1.3"; + version = "3.3.0"; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; + sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0"; }; + buildInputs = [ + base64 + ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath - hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims + ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow + domain-name emile mimic carton carton-lwt carton-git ipaddr psq + ]; + checkInputs = [ + alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar ]; - checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; doCheck = !stdenv.isAarch64; meta = { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ sternenseemann vbgl ]; homepage = "https://github.com/mirage/ocaml-git"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix new file mode 100644 index 00000000000..58ac0204b4b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -0,0 +1,46 @@ +{ buildDunePackage, fetchpatch, git +, mmap, rresult, result, bigstringaf +, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix +, mirage-clock, mirage-clock-unix, astring, awa, cmdliner +, cohttp-lwt-unix, decompress, domain-name, ipaddr, mtime +, tcpip, awa-mirage, mirage-flow +, alcotest, alcotest-lwt, base64, cstruct +, ke, mirage-crypto-rng, ocurl, git-binary +, ptime +}: + +buildDunePackage { + pname = "git-unix"; + inherit (git) version src minimumOCamlVersion; + + useDune2 = true; + + patches = [ + # https://github.com/mirage/ocaml-git/pull/472 + (fetchpatch { + url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch"; + sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my"; + }) + ]; + + buildInputs = [ + awa awa-mirage cmdliner git-cohttp-unix + mirage-clock mirage-clock-unix tcpip + ]; + propagatedBuildInputs = [ + mmap rresult result bigstringaf + fmt bos fpath uri digestif logs lwt + astring cohttp-lwt-unix decompress + domain-name ipaddr mtime mirage-flow + ]; + checkInputs = [ + alcotest alcotest-lwt base64 cstruct ke + mirage-crypto-rng ocurl git-binary ptime + ]; + doCheck = true; + + meta = { + description = "Unix backend for the Git protocol(s)"; + inherit (git.meta) homepage license maintainers; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix index 46bd4b96268..f7ca279b988 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,30 +1,28 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }: +{ lib, fetchurl, buildDunePackage +, decompress, stdlib-shims, alcotest +}: buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "20191011"; + version = "20200929"; pname = "imagelib"; useDune2 = true; - src = fetchFromGitHub { - owner = "rlepigre"; - repo = "ocaml-imagelib"; - rev = "03fed7733825cef7e0465163f398f6af810e2e75"; - sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463"; + src = fetchurl { + url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/ocaml-imagelib_${version}/imagelib-ocaml-imagelib_${version}.tbz"; + sha256 = "1wyq4xxj0dxwafbcmd7jylsd8w1gbyl7j4ak6jbq1n0ardwmpwca"; }; - patches = [ (fetchpatch { - url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch"; - sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9"; - }) ]; + propagatedBuildInputs = [ decompress stdlib-shims ]; - propagatedBuildInputs = [ decompress ]; + doCheck = true; + checkInputs = [ alcotest ]; meta = { description = "Image formats such as PNG and PPM in OCaml"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/rlepigre/ocaml-imagelib"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix deleted file mode 100644 index a188165a48f..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildDunePackage, imagelib }: - -buildDunePackage { - pname = "imagelib-unix"; - inherit (imagelib) version src useDune2 meta; - - propagatedBuildInputs = [ imagelib ]; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index f4b1844d684..a24d72a3445 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -1,18 +1,29 @@ -{ lib, fetchurl, buildDunePackage, fmt, logs, mtime, stdlib-shims }: +{ lib, fetchurl, buildDunePackage +, repr, ppx_repr, fmt, logs, mtime, stdlib-shims +, cmdliner, progress, semaphore-compat +, alcotest, crowbar, re +}: buildDunePackage rec { pname = "index"; - version = "1.2.1"; + version = "1.3.0"; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "1a9b6rsazrjy07syxl9ix5002i95mlvx5vk7nl2x9cs6s0zw906d"; + sha256 = "00qwhwg79scs5bgp8nbppv06qs9yhicf686q7lh64ngh0642iz6n"; }; buildInputs = [ stdlib-shims ]; - propagatedBuildInputs = [ fmt logs mtime ]; + propagatedBuildInputs = [ + fmt logs mtime repr ppx_repr cmdliner progress semaphore-compat + ]; + + doCheck = true; + checkInputs = [ alcotest crowbar re ]; meta = { homepage = "https://github.com/mirage/index"; @@ -20,5 +31,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix index ad6f1f9f813..97443bf5706 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix index 7a2ad0ec7df..0014bbbcfcb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, irmin, irmin-mem, irmin-test }: +{ lib, buildDunePackage, irmin, irmin-test, alcotest }: buildDunePackage rec { @@ -8,7 +8,7 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin ]; doCheck = true; - checkInputs = [ irmin-mem irmin-test ]; + checkInputs = [ alcotest irmin-test ]; meta = irmin.meta // { description = "Irmin backend which allow to store values into chunks"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix new file mode 100644 index 00000000000..761e9bf5619 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix @@ -0,0 +1,27 @@ +{ buildDunePackage +, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime +, alcotest, alcotest-lwt +}: + +buildDunePackage { + pname = "irmin-containers"; + + inherit (ppx_irmin) src version useDune2; + + nativeBuildInputs = [ + ppx_irmin + ]; + + propagatedBuildInputs = [ + irmin irmin-unix irmin-git ppx_irmin lwt mtime + ]; + + doCheck = true; + checkInputs = [ + alcotest alcotest-lwt + ]; + + meta = ppx_irmin.meta // { + description = "Mergeable Irmin data structures"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index 2e3e27df7ff..fe13377b3c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, buildDunePackage -, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri -, alcotest, hex, ppx_irmin +{ lib, buildDunePackage +, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri +, repr, ppx_irmin, bheap }: buildDunePackage { @@ -11,10 +11,22 @@ buildDunePackage { useDune2 = true; minimumOCamlVersion = "4.07"; - propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; + propagatedBuildInputs = [ + astring + digestif + fmt + jsonm + logs + ocaml_lwt + ocamlgraph + uri + repr + bheap + ppx_irmin + ]; - checkInputs = [ alcotest hex ppx_irmin ]; - doCheck = true; + # circular dependency on irmin-mem + doCheck = false; meta = ppx_irmin.meta // { description = "A distributed database built on the same principles as Git"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index b222bc53e3a..a6c1e8af8fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -1,6 +1,10 @@ -{ lib, buildDunePackage, git, irmin, irmin-mem, irmin-test, git-unix }: +{ lib, buildDunePackage +, git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix +, digestif, cstruct, fmt, astring, fpath, logs, lwt, uri +, mtime, alcotest +}: -buildDunePackage rec { +buildDunePackage { pname = "irmin-git"; @@ -8,9 +12,21 @@ buildDunePackage rec { useDune2 = true; - propagatedBuildInputs = [ git irmin ]; - - checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ]; + propagatedBuildInputs = [ + git + irmin + ppx_irmin + digestif + cstruct + fmt + astring + fpath + logs + lwt + uri + ]; + + checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index 6e4598dd986..ca205cac4e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -1,4 +1,6 @@ -{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin }: +{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin +, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix +}: buildDunePackage rec { @@ -10,8 +12,14 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - # test requires network - doCheck = false; + doCheck = true; + checkInputs = [ + alcotest + alcotest-lwt + logs + cohttp-lwt-unix + yojson + ]; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index 24e9f52aa08..b50e0b87345 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, cohttp-lwt, irmin, webmachine -, checkseum, git-unix, irmin-git, irmin-mem, irmin-test +, checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix }: buildDunePackage rec { @@ -12,7 +12,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; - checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ]; + checkInputs = [ digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix new file mode 100644 index 00000000000..40410b004ae --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix @@ -0,0 +1,18 @@ +{ buildDunePackage, irmin, mtime, logs, lwt }: + +buildDunePackage { + pname = "irmin-layers"; + + inherit (irmin) version src useDune2; + + propagatedBuildInputs = [ + irmin + mtime + logs + lwt + ]; + + meta = irmin.meta // { + description = "Combine different Irmin stores into a single, layered store"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix deleted file mode 100644 index 1b8947849a9..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildDunePackage, irmin, irmin-test }: - -buildDunePackage rec { - - pname = "irmin-mem"; - - inherit (irmin) version src; - - useDune2 = true; - - propagatedBuildInputs = [ irmin ]; - - checkInputs = lib.optional doCheck irmin-test; - - doCheck = true; - - meta = irmin.meta // { - description = "Generic in-memory Irmin stores"; - }; - -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix new file mode 100644 index 00000000000..dfa84ff2335 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix @@ -0,0 +1,27 @@ +{ buildDunePackage, irmin-mirage, irmin-git +, mirage-kv, cohttp, conduit-lwt, conduit-mirage +, git-cohttp-mirage, fmt, git, lwt, mirage-clock, uri +}: + +buildDunePackage { + pname = "irmin-mirage-git"; + + inherit (irmin-mirage) version src useDune2; + + propagatedBuildInputs = [ + irmin-mirage + irmin-git + mirage-kv + cohttp + conduit-lwt + conduit-mirage + git-cohttp-mirage + fmt + git + lwt + mirage-clock + uri + ]; + + inherit (irmin-mirage) meta; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix new file mode 100644 index 00000000000..d550b9c924b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix @@ -0,0 +1,21 @@ +{ buildDunePackage, irmin-mirage, irmin-graphql +, mirage-clock, cohttp-lwt, lwt, uri, git +}: + +buildDunePackage { + pname = "irmin-mirage-graphql"; + + inherit (irmin-mirage) version src useDune2; + + propagatedBuildInputs = [ + irmin-mirage + irmin-graphql + mirage-clock + cohttp-lwt + lwt + uri + git + ]; + + inherit (irmin-mirage) meta; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix new file mode 100644 index 00000000000..675c8a3fdd2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, irmin, fmt, ptime, mirage-clock }: + +buildDunePackage { + pname = "irmin-mirage"; + + inherit (irmin) version src useDune2; + + propagatedBuildInputs = [ + irmin fmt ptime mirage-clock + ]; + + meta = irmin.meta // { + description = "MirageOS-compatible Irmin stores"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix index b0081eb366e..16ef675c1f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,4 +1,6 @@ -{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test, ocaml_lwt }: +{ lib, buildDunePackage +, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath +}: buildDunePackage rec { minimumOCamlVersion = "4.02.3"; @@ -9,9 +11,10 @@ buildDunePackage rec { useDune2 = true; - propagatedBuildInputs = [ index irmin ocaml_lwt ]; + buildInputs = [ fpath ]; + propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt ]; - checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; + checkInputs = [ alcotest-lwt irmin-test ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index 35aa659fbc8..1d605763ab5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -1,29 +1,27 @@ -{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }: +{ lib, fetchurl, buildDunePackage, ppxlib, ppx_repr }: buildDunePackage rec { pname = "ppx_irmin"; - version = "2.2.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4"; + sha256 = "131pcgmpys6danprcbxzf4pdsl0ka74bpmmxz8db4507cvxhsz3n"; }; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = "4.08"; useDune2 = true; - buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ ppxlib ]; - - # tests depend on irmin, would create mutual dependency - # opt to test irmin instead of ppx_irmin - doCheck = false; + propagatedBuildInputs = [ + ppx_repr + ppxlib + ]; meta = { homepage = "https://irmin.org/"; description = "PPX deriver for Irmin generics"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ vbgl sternenseemann ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix index b8a3f3ae245..90141d925e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix @@ -1,4 +1,6 @@ -{ buildDunePackage, alcotest, cmdliner, irmin, metrics-unix, mtime }: +{ buildDunePackage +, alcotest, cmdliner, irmin, metrics-unix, mtime, irmin-layers +}: buildDunePackage { @@ -8,7 +10,9 @@ buildDunePackage { useDune2 = true; - propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ]; + propagatedBuildInputs = [ + alcotest cmdliner irmin metrics-unix mtime irmin-layers + ]; meta = irmin.meta // { description = "Irmin test suite"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix index 7a09eaabd3e..a3dfb5d508c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage -, checkseum, cmdliner, git-unix, yaml -, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http, irmin-mem, irmin-pack, irmin-watcher -, irmin-test +, checkseum, cmdliner, git-unix, git-cohttp-unix, yaml, fpath +, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http +, irmin-pack, irmin-watcher, irmin-test }: buildDunePackage rec { @@ -12,8 +12,10 @@ buildDunePackage rec { useDune2 = true; - propagatedBuildInputs = [ checkseum cmdliner git-unix yaml - irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher + propagatedBuildInputs = [ + checkseum cmdliner git-unix yaml fpath + irmin irmin-fs irmin-git irmin-graphql irmin-http + irmin-pack irmin-watcher git-cohttp-unix ]; checkInputs = lib.optional doCheck irmin-test; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index 29b18e0bf98..c46b87e92f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/infra/libkookie/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 ]; @@ -533,6 +534,14 @@ rec { propagatedBuildInputs = [ ppxlib ]; }; + ppx_log = janePackage { + pname = "ppx_log"; + hash = "10hnr5lpww3fw0bnidzngalbgy0j1wvz1g5ki9c9h558pnpvsazr"; + minimumOCamlVersion = "4.08.0"; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ async_unix ppx_jane sexplib ]; + }; + ppx_module_timer = janePackage { pname = "ppx_module_timer"; hash = "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix index dd5504dda5c..eaeb053239e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix index ed3e5999b41..2c3c7c423ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix index 77d6b4ef778..d0d8661dd7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix index 5918d89221f..355cffaaa15 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix index 8ae1f4a9d47..b13639150b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index ba571b32084..7525a10030e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; + useDune2 = true; + src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index b18c0abc530..51e902b9140 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -1,14 +1,16 @@ -{ lib, buildDunePackage, ocaml_gettext, ounit }: +{ buildDunePackage, ocaml_gettext, dune-configurator, ounit }: buildDunePackage rec { pname = "gettext-stub"; - inherit (ocaml_gettext) src version meta; + inherit (ocaml_gettext) src version useDune2 meta; + + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ocaml_gettext ]; doCheck = true; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix index afe3d34963a..ca88fe32416 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix index 2814c6c5280..2fda6f1440b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index b4842da12dd..cf869b6e5ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix index 52676a1c88d..0b68609584d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "ounit2"; version = "2.2.4"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchurl { url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz"; sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix index 5127dc3b1e6..37006bf30da 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_bap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_bap/default.nix new file mode 100644 index 00000000000..f0a223c3db7 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 3d4675ed90b..84dda38846f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix index 442a4126a89..07d817d2293 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 30fb5de7cb8..dbdf3970f63 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -1,35 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib, menhir }: +{ lib, fetchFromGitHub, buildDunePackage, menhir }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "psmt2-frontend is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.2"; - name = "ocaml${ocaml.version}-psmt2-frontend-${version}"; +buildDunePackage rec { + version = "0.3.1"; + pname = "psmt2-frontend"; src = fetchFromGitHub { - owner = "Coquera"; - repo = "psmt2-frontend"; + owner = "ACoquereau"; + repo = pname; rev = version; - sha256 = "097zmbrx4gp2gnrxdmsm9lkkp5450gwi0blpxqy3833m6k5brx3n"; + sha256 = "038jrfsq09nhnzpjiishg4adk09w3aw1bpczgbj66lqqilkd6gci"; }; - prefixKey = "-prefix "; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ocaml findlib menhir ]; + useDune2 = true; - createFindlibDestdir = true; + minimumOCamlVersion = "4.03"; - installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + buildInputs = [ menhir ]; meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix index 03de70237a4..e1b3503b541 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.16"; + version = "0.17"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = version; - sha256 = "1s5dpqj8zvd3wr2w3fp4wb6yc57snjpxzzfv9fb6l9qgigswwjdr"; + sha256 = "0qfyqhfg98spmfci9z6f527a16gwjnx2lrbbgw67p37ys5acrfar"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix index d5829127a8b..5e9a89a8376 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix index ca3cf1e8267..4734d4a9bf5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchurl { url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz"; sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix new file mode 100644 index 00000000000..a506e6795fd --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchurl +, buildDunePackage +, ounit +}: + +buildDunePackage rec { + pname = "sha"; + version = "1.13"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "00z2s4fsv9i1h09rj5dy3nd9hhcn79b75sn2ljj5wihlf4y4g304"; + }; + + doCheck = true; + checkInputs = [ ounit ]; + + meta = with lib; { + description = "Binding for SHA interface code in OCaml"; + maintainers = [ maintainers.arthurteisseire ]; + homepage = "https://github.com/djs55/ocaml-${pname}"; + license = licenses.isc; + }; + +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix index bffef61956e..52d97e12998 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,18 +1,43 @@ -{ lib, fetchFromGitHub, buildDunePackage }: +{ lib, fetchurl, fetchpatch, buildDunePackage, qcheck }: buildDunePackage rec { pname = "stdint"; - version = "0.6.0"; + version = "0.7.0"; - minimumOCamlVersion = "4.07"; + useDune2 = true; - src = fetchFromGitHub { - owner = "andrenth"; - repo = "ocaml-stdint"; - rev = version; - sha256 = "19ccxs0vij81vyc9nqc9kbr154ralb9dgc2y2nr71a5xkx6xfn0y"; + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/andrenth/ocaml-stdint/releases/download/${version}/stdint-${version}.tbz"; + sha256 = "4fcc66aef58e2b96e7af3bbca9d910aa239e045ba5fb2400aaef67d0041252dc"; }; + patches = [ + # fix test bug, remove at next release + (fetchpatch { + url = "https://github.com/andrenth/ocaml-stdint/commit/fc64293f99f597cdfd4470954da6fb323988e2af.patch"; + sha256 = "0nxck14vfjfzldsf8cdj2jg1cvhnyh37hqnrcxbdkqmpx4rxkbxs"; + }) + ]; + + # 1. disable remaining broken tests, see + # https://github.com/andrenth/ocaml-stdint/issues/59 + # 2. fix tests to liberal test range + # https://github.com/andrenth/ocaml-stdint/pull/61 + postPatch = '' + substituteInPlace tests/stdint_test.ml \ + --replace 'test "An integer should perform left-shifts correctly"' \ + 'skip "An integer should perform left-shifts correctly"' \ + --replace 'test "Logical shifts must not sign-extend"' \ + 'skip "Logical shifts must not sign-extend"' \ + --replace 'let pos_int = QCheck.map_same_type abs in_range' \ + 'let pos_int = QCheck.int_range 0 maxi' + ''; + + doCheck = true; + checkInputs = [ qcheck ]; + meta = { description = "Various signed and unsigned integers for OCaml"; homepage = "https://github.com/andrenth/ocaml-stdint"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix index d76ec29e63a..470a2a5bd03 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index 020b256c72f..bb70ff6a4b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf, uucd }: let pname = "uucp"; - version = "11.0.0"; + version = "13.0.0"; webpage = "https://erratique.ch/software/${pname}"; + minimumOCamlVersion = "4.03"; + doCheck = true; in -assert lib.versionAtLeast ocaml.version "4.01"; +if !(lib.versionAtLeast ocaml.version minimumOCamlVersion) +then builtins.throw "${pname} needs at least OCaml ${minimumOCamlVersion}" +else stdenv.mkDerivation { @@ -14,17 +18,29 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0pidg2pmqsifmk4xx9cc5p5jprhg26xb68g1xddjm7sjzbdzhlm4"; + sha256 = "sha256-OPpHbCOC/vMFdyHwyhCSisUv2PyO8xbeY2oq1a9HbqY="; }; buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; propagatedBuildInputs = [ uchar ]; - buildPhase = "${topkg.buildPhase} --with-cmdliner false"; + buildPhase = '' + runHook preBuild + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} + runHook postBuild + ''; inherit (topkg) installPhase; + inherit doCheck; + checkPhase = '' + runHook preCheck + ${topkg.run} test + runHook postCheck + ''; + checkInputs = [ uucd ]; + meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = webpage; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix index a42259af9e6..86064d887db 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/wodan/irmin.nix @@ -15,6 +15,12 @@ buildDunePackage rec { wodan ]; - meta = wodan.meta // { description = "Wodan as an Irmin store"; }; - + meta = wodan.meta // { + # wodan is currently incompatible with irmin 2.3.0. + # additionally upgrading to current master (unclear + # if the issue is fixed there) is not possible as it + # depends on a custom fork of mirage-block + broken = true; + description = "Wodan as an Irmin store"; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix index c9bf285b7bd..07025be296c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/arduino/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/arduino/default.nix new file mode 100644 index 00000000000..f6536108e6c --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/audio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/audio/default.nix new file mode 100644 index 00000000000..4fafefd6f75 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/bim/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/bim/default.nix new file mode 100644 index 00000000000..5dc8ca88710 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/bsltl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/bsltl/default.nix new file mode 100644 index 00000000000..aefe543b097 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/cgi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/cgi/default.nix new file mode 100644 index 00000000000..4686881251a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/communications/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/communications/default.nix new file mode 100644 index 00000000000..492c837255f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/control/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/control/default.nix new file mode 100644 index 00000000000..2d61e30cc60 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/data-smoothing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/data-smoothing/default.nix new file mode 100644 index 00000000000..551582a7770 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/database/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/database/default.nix new file mode 100644 index 00000000000..3e1fe863276 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/dataframe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/dataframe/default.nix new file mode 100644 index 00000000000..8f145f0d510 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/dicom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/dicom/default.nix new file mode 100644 index 00000000000..e16b6447805 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/divand/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/divand/default.nix new file mode 100644 index 00000000000..ac8de906068 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/doctest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/doctest/default.nix new file mode 100644 index 00000000000..3c02a20cdad --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/econometrics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/econometrics/default.nix new file mode 100644 index 00000000000..0aa795959ab --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fem-fenics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fem-fenics/default.nix new file mode 100644 index 00000000000..300dfd75877 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/financial/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/financial/default.nix new file mode 100644 index 00000000000..5fb6a00df78 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fits/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fits/default.nix new file mode 100644 index 00000000000..9d236cb9f1f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fpl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fpl/default.nix new file mode 100644 index 00000000000..e5b276c0c20 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix new file mode 100644 index 00000000000..5cb567b2bb8 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ga/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ga/default.nix new file mode 100644 index 00000000000..a5265a4ce45 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/general/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/general/default.nix new file mode 100644 index 00000000000..52ad9af93b0 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/generate_html/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/generate_html/default.nix new file mode 100644 index 00000000000..83f3a65bedc --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/geometry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/geometry/default.nix new file mode 100644 index 00000000000..b4bf57262fa --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/gsl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/gsl/default.nix new file mode 100644 index 00000000000..5922c015dbd --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix new file mode 100644 index 00000000000..08c4305999b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/image/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/image/default.nix new file mode 100644 index 00000000000..8bff55fadc6 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix new file mode 100644 index 00000000000..51c8f300cc5 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/interval/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/interval/default.nix new file mode 100644 index 00000000000..0891a614385 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/io/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/io/default.nix new file mode 100644 index 00000000000..57058c5f95d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/level-set/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/level-set/default.nix new file mode 100644 index 00000000000..d1f882904d5 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/linear-algebra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/linear-algebra/default.nix new file mode 100644 index 00000000000..18818c1db60 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/lssa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/lssa/default.nix new file mode 100644 index 00000000000..f737c104f30 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix new file mode 100644 index 00000000000..505670f6298 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ltfat/syntax-error.patch b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ltfat/syntax-error.patch new file mode 100644 index 00000000000..732030b7043 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/mapping/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/mapping/default.nix new file mode 100644 index 00000000000..26cea27a725 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix new file mode 100644 index 00000000000..b8607cf5dff --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix new file mode 100644 index 00000000000..74c3879aa9e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/msh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/msh/default.nix new file mode 100644 index 00000000000..a4e876c8128 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/mvn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/mvn/default.nix new file mode 100644 index 00000000000..06fd1905604 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/nan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/nan/default.nix new file mode 100644 index 00000000000..a0517db714b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ncarray/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ncarray/default.nix new file mode 100644 index 00000000000..10db554c87f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/netcdf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/netcdf/default.nix new file mode 100644 index 00000000000..9292da6918c --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix new file mode 100644 index 00000000000..e5e26d7bb95 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ocl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/ocl/default.nix new file mode 100644 index 00000000000..0e47160ad0e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/octclip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/octclip/default.nix new file mode 100644 index 00000000000..43bcfcd7d84 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/octproj/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/octproj/default.nix new file mode 100644 index 00000000000..74596c015f8 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/optics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/optics/default.nix new file mode 100644 index 00000000000..1324c6cd4ba --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/optim/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/optim/default.nix new file mode 100644 index 00000000000..b9561faafb1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/optiminterp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/optiminterp/default.nix new file mode 100644 index 00000000000..8409a10104e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/parallel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/parallel/default.nix new file mode 100644 index 00000000000..0ea1d4d9df2 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/quaternion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/quaternion/default.nix new file mode 100644 index 00000000000..4681b699684 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/queueing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/queueing/default.nix new file mode 100644 index 00000000000..75b3e67e353 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/signal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/signal/default.nix new file mode 100644 index 00000000000..ae1339ca274 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/sockets/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/sockets/default.nix new file mode 100644 index 00000000000..688bd6a0e92 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix new file mode 100644 index 00000000000..b8147f8d281 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/splines/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/splines/default.nix new file mode 100644 index 00000000000..69d5e46147d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/statistics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/statistics/default.nix new file mode 100644 index 00000000000..61133ec49e5 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/stk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/stk/default.nix new file mode 100644 index 00000000000..16ac7b7d03d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/strings/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/strings/default.nix new file mode 100644 index 00000000000..7b556272f5d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/struct/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/struct/default.nix new file mode 100644 index 00000000000..a69a8e4b6e2 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix new file mode 100644 index 00000000000..e40d27e7c38 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/tisean/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/tisean/default.nix new file mode 100644 index 00000000000..b21ef0a5f56 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/tsa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/tsa/default.nix new file mode 100644 index 00000000000..a6320f0fc01 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/vibes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/vibes/default.nix new file mode 100644 index 00000000000..f60a5d7339a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/video/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/video/default.nix new file mode 100644 index 00000000000..8467da98be9 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/vrml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/vrml/default.nix new file mode 100644 index 00000000000..e46e621b80d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/windows/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/windows/default.nix new file mode 100644 index 00000000000..274ba1e3b7d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/octave-modules/zeromq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/octave-modules/zeromq/default.nix new file mode 100644 index 00000000000..7a8f7f6d16a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/perl-modules/ham/default.nix b/infra/libkookie/nixpkgs/pkgs/development/perl-modules/ham/default.nix index 4f6dc5d9ddb..8b19c9404fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/perl-modules/ham/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/box/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/box/default.nix index 8d6bba3e460..8ff61920ac8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/box/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/2.0.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/1.x.nix similarity index 69% rename from infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/2.0.nix rename to infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/1.x.nix index 5b0234fa7a1..4660da9532d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/2.0.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/default.nix index 37c983507ce..d704b5f9a27 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index 4ec71846919..3566c7916e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/couchbase/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/event/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/event/default.nix index 940150ac986..420f2385e54 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/event/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/imagick/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/imagick/default.nix index f697b44affd..ebff9b00f02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/imagick/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix index 2533a6ef06d..9a5a96e15c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix @@ -1,22 +1,22 @@ -{ buildPecl, lib, pkgs }: +{ buildPecl, lib, fetchFromGitHub, libmaxminddb }: let pname = "maxminddb"; - version = "1.9.0"; + version = "1.10.0"; in buildPecl { inherit pname version; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "sha256-sNG2FhnxzbHA4Lmzj97al1WFwSU70Mr1R2i5ygF1L6Y="; + 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/infra/libkookie/nixpkgs/pkgs/development/php-packages/memcached/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/memcached/default.nix index 3eb1da463b9..4880e08e062 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/memcached/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index 18bb515d15e..95e51892f04 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/oci8/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/oci8/default.nix index 697ad674020..eeaffb4b7fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/oci8/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/pdlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/pdlib/default.nix index 83051946701..e217edd29ef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/pdlib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix index ae015944443..d80944ada09 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index c855b975e54..a142c695121 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix index f479581fb2e..50fd23540ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/php_excel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/php_excel/default.nix index ab6d193fcd4..8b83f558a53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/php_excel/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix index b58ba42a5d0..da114a4d348 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpcs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpcs/default.nix index 0e8557c04eb..d2053dbe9cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpcs/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpmd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpmd/default.nix index fd7390498ba..fde674701eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpmd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index f8124e43d7f..5a7a856f3ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/infra/libkookie/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.74"; + 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-zEDqswyldyXha836ye+FmE4yYxH+7AzEvlKJYOje0xQ="; + 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/infra/libkookie/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/psalm/default.nix index 1de01d1d09d..01160fc35fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -1,18 +1,18 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psalm"; - version = "4.4.1"; + version = "4.6.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw="; + sha256 = "sha256-YFeTSIfZ2u1KmpoKV5I7pMMvCk3u5ILktsunvoDnBsg="; }; 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/infra/libkookie/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/psysh/default.nix index 4c5f703d025..514706dc178 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix index e5bdc2a2298..0e78d3bbc97 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/smbclient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/smbclient/default.nix index 1aec97251e1..0486db82cc3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/smbclient/default.nix +++ b/infra/libkookie/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.4"; - sha256 = "07p72m5kbdyp3r1mfxhiayzdvymhc8afwcxa9s86m96sxbmlbbp8"; + 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/infra/libkookie/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix index 939be27671b..4522129b2aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index 780bb8c9086..56341be436a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/php-packages/yaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/php-packages/yaml/default.nix index 40e5a859f9e..9bd30ff4e3c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/php-packages/yaml/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix index 3cd211db755..2e740fcc2c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix index eeab02fcb75..d8c49c99eba 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -35,7 +36,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.1.2"; + version = "8.1.3"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -54,7 +55,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "26f4fb1a2b0105cf0f71187c6c1eb54283767a883d1c8f4ca8c8039033217d27"; + sha256 = "05eac356bb4273cdd05d2dd6ad676226133496c457af91987c3f0d40e2fe57ef"; }; patchPhase = '' @@ -72,5 +73,7 @@ buildPythonPackage rec { description = "A modular, fast, simple, static website and blog generator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; + # all tests fail + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix index 86fb75f1454..cfbf3be1c40 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -1,13 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, flit -, lxml, httpx -, pytest, pytestcov, pytest-asyncio, pytest-mock, aresponses +{ lib +, buildPythonPackage +, fetchFromGitHub , pythonOlder +, flit +, async-timeout +, lxml +, httpx +, pytestCheckHook +, pytest-asyncio +, pytest-httpx }: buildPythonPackage rec { pname = "PyRMVtransport"; - version = "0.2.10"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -15,7 +21,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "03qrylidb1d6zw6a22d1drdf73cvfxqcqaa8qi8x4pli1axcfh5w"; + sha256 = "1savzndg8l7rrc5dgzgsrdz9hnnjfv6qs5drznqmdw4f2rq84ypa"; }; nativeBuildInputs = [ @@ -23,24 +29,18 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-timeout httpx lxml ]; - # requires pytest-httpx - doCheck = false; + pythonImportsCheck = [ "RMVtransport" ]; checkInputs = [ - pytest - pytestcov + pytestCheckHook pytest-asyncio - pytest-mock - # pytest-httpx is missing - aresponses + pytest-httpx ]; - checkPhase = '' - pytest --cov=RMVtransport tests - ''; meta = with lib; { homepage = "https://github.com/cgtobi/PyRMVtransport"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix index e180f0cea33..054cce0ce52 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index cc8ee946250..75eb4d0052c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk="; + sha256 = "a14c642b1f6849e57b5c442e81e809c9e1e3a0bcfebfd54b15a9f9fd273f9611"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix new file mode 100644 index 00000000000..59eb468868a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix index 9cd3fe36233..5377785ff25 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix @@ -1,9 +1,20 @@ -{ aiofiles, buildPythonPackage, cryptography, fetchFromGitHub, isPy3k, lib -, libusb1, mock, pyasn1, python, pycryptodome, rsa }: +{ lib +, aiofiles +, buildPythonPackage +, cryptography +, fetchFromGitHub +, isPy3k +, libusb1 +, mock +, pyasn1 +, pycryptodome +, pytestCheckHook +, rsa +}: buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.0"; + version = "0.3.1"; disabled = !isPy3k; @@ -12,19 +23,27 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "0qnlhcd58zxh39cd5xzdx8yc5hc0pf8kix4rbn4avsapwb0l75n2"; + sha256 = "sha256-b+9ySme44TdIlVnF8AHBBGd8pkoeYG99wmDK/nyAreo="; }; - propagatedBuildInputs = [ aiofiles cryptography libusb1 pyasn1 rsa ]; + propagatedBuildInputs = [ + aiofiles + cryptography + libusb1 + pyasn1 + rsa + ]; - checkInputs = [ mock pycryptodome ]; - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests -t . - ''; + checkInputs = [ + mock + pycryptodome + pytestCheckHook + ]; + + pythonImportsCheck = [ "adb_shell" ]; meta = with lib; { - description = - "A Python implementation of ADB with shell and FileSync functionality."; + description = "Python implementation of ADB with shell and FileSync functionality"; homepage = "https://github.com/JeffLIrion/adb_shell"; license = licenses.asl20; maintainers = with maintainers; [ jamiemagee ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adblock/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adblock/default.nix index de6d72a61ec..8fc697828f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adblock/default.nix +++ b/infra/libkookie/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"; }; - format = "pyproject"; - cargoSha256 = "0di05j942rrm2crpdpp9czhh65fmidyrvdp2n3pipgnagy7nchc0"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY="; + }; - nativeBuildInputs = [ pipInstallHook maturin pkg-config pythonImportsCheckHook ]; + format = "pyproject"; + + 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 - ''; + pythonImportsCheck = [ "adblock" ]; - 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix index bdf6aab3dbf..3ee3a897a90 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/addic7ed-cli/default.nix @@ -1,4 +1,6 @@ -{ lib, python3Packages, }: +{ lib +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "addic7ed-cli"; @@ -14,6 +16,10 @@ python3Packages.buildPythonApplication rec { pyquery ]; + # Tests require network access + doCheck = false; + pythonImportsCheck = [ "addic7ed_cli" ]; + meta = with lib; { description = "A commandline access to addic7ed subtitles"; homepage = "https://github.com/BenoitZugmeyer/addic7ed-cli"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/afdko/default.nix index 4df6c5f6c49..f86151f2f51 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ailment/default.nix index e23db23d151..13386eb12a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioambient/default.nix new file mode 100644 index 00000000000..cd47d7f0879 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, python-engineio +, python-socketio +, pythonOlder +, websockets +}: + +buildPythonPackage rec { + pname = "aioambient"; + version = "1.2.3"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1jg93rjn1gxc66qmipw4z1c09l8hgfsydacjgkfjq7vg547lragp"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + python-engineio + python-socketio + websockets + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples directory as the files are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "aioambient" ]; + + meta = with lib; { + description = "Python library for the Ambient Weather API"; + homepage = "https://github.com/bachya/aioambient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix new file mode 100644 index 00000000000..0e25ab3581a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix @@ -0,0 +1,52 @@ +{ lib +, asyncssh +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytest-asyncio +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioasuswrt"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "kennedyshead"; + repo = pname; + rev = "V${version}"; + sha256 = "0bzl11224vny4p9vhi1n5s9p04kfavdzs9xkq5qimbisz9sg4ysj"; + }; + + patches = [ + (fetchpatch { + # Remove pytest-runner, https://github.com/kennedyshead/aioasuswrt/pull/63 + url = "https://github.com/kennedyshead/aioasuswrt/pull/63/commits/e7923927648d5d8daccac1716db86db2a45fcb34.patch"; + sha256 = "09xzs3hjr3133li6b7lr58n090r00kaxi9hx1fms2zn0ai4xwp9d"; + }) + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html" "" \ + --replace "--cov-report term-missing" "" + ''; + + propagatedBuildInputs = [ asyncssh ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioasuswrt" ]; + + meta = with lib; { + description = "Python module for Asuswrt"; + homepage = "https://github.com/kennedyshead/aioasuswrt"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 2e7c9c2401c..5d9c3fe1669 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -1,10 +1,7 @@ { lib - , buildPythonPackage , fetchPypi , pythonOlder -, pytestrunner -, typing-extensions , wrapt , aioitertools , aiohttp diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiocache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiocache/default.nix new file mode 100644 index 00000000000..54979dbd7ba --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiocache/default.nix @@ -0,0 +1,34 @@ +{ lib +, aioredis +, buildPythonPackage +, fetchFromGitHub +, msgpack +}: + +buildPythonPackage rec { + pname = "aiocache"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = version; + sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + }; + + propagatedBuildInputs = [ + aioredis + msgpack + ]; + + # aiomcache would be required but last release was in 2017 + doCheck = false; + pythonImportsCheck = [ "aiocache" ]; + + meta = with lib; { + description = "Python API Rate Limit Decorator"; + homepage = "https://github.com/tomasbasham/ratelimit"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 03f1ed91cfd..503a5336ee2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.6.4"; + version = "2.6.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d8def7a909c0471479e1d8b0965de6bb7644b8de315d6e578f9d848b8a6812d0"; + sha256 = "sha256-inktluPKefrFQCF2yadvHwT9Rw+pJLw8pjdUc35IJoc="; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix index f6822ede08c..8d3de12cd99 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix @@ -4,7 +4,6 @@ , asyncio-dgram , asynctest , buildPythonPackage -, cryptography , fetchFromGitHub , poetry , pytest-aiohttp diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix new file mode 100644 index 00000000000..0f1a297e6ac --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix index 9b648d59537..7b84996a1c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix new file mode 100644 index 00000000000..200bc41b7a5 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index a0a3d74e578..9c677650555 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pygments -, pytest +, pytestCheckHook , pytestcov , uvloop }: @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytestcov uvloop ]; @@ -37,9 +37,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "aiorun" ]; meta = with lib; { description = "Boilerplate for asyncio applications"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index f53877e03a3..058282b4c35 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix index 44cae12cba5..022e34e23c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta/default.nix index e69503777d4..ad80f62db05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "8.3.0"; + version = "8.4.0"; src = fetchPypi { inherit pname version; - sha256 = "83c7d751bad0cb9bd7886700da4cd83c5451b2e8eb8d4cc697966e02d6a565f8"; + sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34"; }; propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index ec00c31147b..98ab09fd8e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -7,19 +7,18 @@ , mock , pure-python-adb , pytestCheckHook -, python }: buildPythonPackage rec { pname = "androidtv"; - version = "0.0.57"; + version = "0.0.58"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-xOLMUf72VHeBzbMnhJGOnUIKkflnY4rV9NS/P1aYLJc="; + sha256 = "sha256-/5sYiYRFa8XJJ4QSxLzJBHaKfAKsGETiVDHerNQ79U8="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 1c3c72a8e2c..e6cc3182487 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index 705b7b721f8..82d7a8cc32a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, fetchPypi , fetchFromGitHub , fetchpatch , alembic @@ -47,10 +46,7 @@ , tzlocal , unicodecsv , zope_deprecation -, enum34 -, typing , nose -, python , pythonOlder , pythonAtLeast }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix index c3f31850388..fad9e7d03fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix new file mode 100644 index 00000000000..a6081858afb --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aqualogic"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "swilson"; + repo = pname; + rev = version; + sha256 = "sha256-yxd+A5dsB9gBwVlPNjz+IgDHKTktNky84bWZMhA/xa4="; + }; + + propagatedBuildInputs = [ pyserial ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "aqualogic" ]; + + meta = with lib; { + description = "Python library to interface with Hayward/Goldline AquaLogic/ProLogic pool controllers"; + homepage = "https://github.com/swilson/aqualogic"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 79f21a2762c..b06e0320dc9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix index 85c6c4b638a..eec01adfebc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/argon2_cffi/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "argon2_cffi"; - version = "19.2.0"; + version = "20.1.0"; src = fetchPypi { pname = "argon2-cffi"; inherit version; - sha256 = "ffaa623eea77b497ffbdd1a51e941b33d3bf552c60f14dbee274c4070677bda3"; + sha256 = "0zgr4mnnm0p4i99023safb0qb8cgvl202nly1rvylk2b7qnrn0nq"; }; propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asteval/default.nix index 0d4d41a5473..a55aef99ecb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index 14c800f568b..2360d170f38 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; + sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o="; }; # OSError: AF_UNIX path too long diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix index 088681a1989..bb2ead70d71 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 826ee6103fc..e2f2f242780 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -1,4 +1,4 @@ -{ lib, isPy3k, fetchPypi, fetchpatch, buildPythonPackage +{ lib, isPy3k, fetchPypi, buildPythonPackage , uvloop, postgresql }: buildPythonPackage rec { @@ -16,6 +16,8 @@ buildPythonPackage rec { postgresql ]; + pythonImportsCheck = [ "asyncpg" ]; + meta = with lib; { homepage = "https://github.com/MagicStack/asyncpg"; description = "An asyncio PosgtreSQL driver"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index 077c5078caa..7ce389f984d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,20 +1,23 @@ { lib +, aiodns +, asynctest , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder -, aiodns , tldextract -, pytestCheckHook }: buildPythonPackage rec { pname = "asyncwhois"; - version = "0.2.3"; - disabled = pythonOlder "3.6"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "95df90d5be581e3c69398abc6a3ec69a4e568852d9d6df4582bfcc0e22ffb3bb"; + src = fetchFromGitHub { + owner = "pogzyb"; + repo = pname; + rev = "v${version}"; + sha256 = "1514fz942yix7fh4yg982mxjp8c0qb6a0i4fw5wsc3xx4g86zcdg"; }; propagatedBuildInputs = [ @@ -22,9 +25,24 @@ buildPythonPackage rec { tldextract ]; - # tests are only present at GitHub but not the released source tarballs - # https://github.com/pogzyb/asyncwhois/issues/10 - doCheck = false; + checkInputs = [ + asynctest + pytestCheckHook + ]; + + # Disable tests that require network access + disabledTests = [ + "test_pywhois_aio_get_hostname_from_ip" + "test_pywhois_get_hostname_from_ip" + "test_pywhois_aio_lookup_ipv4" + "test_not_found" + "test_aio_from_whois_cmd" + "test_aio_get_hostname_from_ip" + "test_from_whois_cmd" + "test_get_hostname_from_ip" + "test_whois_query_run" + ]; + pythonImportsCheck = [ "asyncwhois" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asysocks/default.nix index b5028e4bebc..21a3ed2a8fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asysocks/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix new file mode 100644 index 00000000000..5d3fe1ff15d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/auroranoaa/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "auroranoaa"; + version = "0.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "djtimca"; + repo = "aurora-api"; + rev = version; + sha256 = "0bh8amixkg3xigwh3ryra22x6kzhbdassmf1iqv20lhbvzmsqjv0"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "auroranoaa" ]; + + meta = with lib; { + description = "Python wrapper for the Aurora API"; + homepage = "https://github.com/djtimca/aurora-api"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 2a532beca47..b3b794eb3a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index ce4c6f78926..efe4780c0a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ]; + pythonImportsCheck = [ "aws_adfs" ]; + meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; homepage = "https://github.com/venth/aws-adfs"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index bdba8949887..5cbbee77ae8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index f02bee6befe..9bd5371412d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix index 16b8f317a22..8706a31d571 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix index e4a6a5f5625..29d676ad62a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -1,7 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, beautifulsoup4, bottle, chardet, dateutil -, google_api_python_client, lxml, oauth2client -, ply, python_magic, pytest, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, beautifulsoup4 +, bottle +, chardet +, dateutil +, google_api_python_client +, lxml +, oauth2client +, ply +, pytest +, python_magic +, requests +}: buildPythonPackage rec { version = "2.3.3"; @@ -29,7 +41,7 @@ buildPythonPackage rec { python_magic requests # pytest really is a runtime dependency - # https://bitbucket.org/blais/beancount/commits/554e13057551951e113835196770847c788dd592 + # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 pytest ]; @@ -41,8 +53,7 @@ buildPythonPackage rec { financial transaction records in a text file, read them in memory, generate a variety of reports from them, and provides a web interface. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ bhipple ]; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 2f98f3917b8..53633b041f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix index 1bdedde1cb4..53319466d3a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blinker/default.nix index 5591113ab0a..ca59a0d710a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 1d3e0cca674..1c035a2470a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - pname = "boto3"; - version = "1.17.5"; # N.B: if you change this, change botocore too + pname = "boto3"; + version = "1.17.20"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o="; + sha256 = "sha256-Ihnx6+iNJmr6VRb5k5g+uodCuVf6T9aFTzxzqjAw6TE="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 05c333d9397..5714cbf5fb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.20"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4="; + sha256 = "sha256-gMMqgfse6L36B0p5v7iFuyAG6Kl4LyNTwMn2OScE4To="; }; propagatedBuildInputs = [ @@ -28,10 +28,6 @@ buildPythonPackage rec { urllib3 ]; - postPatch = '' - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" - ''; - checkInputs = [ mock nose ]; checkPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix index 29de26ac495..be51e87c95c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.26.1"; + version = "4.27.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5"; + sha256 = "5b21f86d0cc99d3168f0d9730e07c1438057083ccc9a9c54de322e59e1f4e740"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index f4c5bfb1622..30a7e5174a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, - python, twisted, jinja2, zope_interface, future, sqlalchemy, + python, twisted, jinja2, zope_interface, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, @@ -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/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix index 8925c1cc8a4..51a6d0d11c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "canopen"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "15d49f1f71e9989dde6e3b75fb8445c76bd223064dfc0ac629fe9ecb0e21fba9"; + sha256 = "18d01d56ff0023795cb336cafd4810a76cf402b98b42139b201fa8c5d4ba8c06"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/capstone/default.nix index d7df0bee5ca..af6b9031e66 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/capstone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/capstone/default.nix @@ -1,9 +1,10 @@ -{ lib, stdenv +{ stdenv +, lib , buildPythonPackage -, fetchPypi +, capstone , fetchpatch +, fetchPypi , setuptools -, capstone }: buildPythonPackage rec { @@ -16,6 +17,7 @@ buildPythonPackage rec { postPatch = '' ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ ln -s ${capstone}/lib/libcapstone.a prebuilt/ + substituteInPlace setup.py --replace manylinux1 manylinux2014 ''; propagatedBuildInputs = [ setuptools ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/censys/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/censys/default.nix index 561d9651fed..23c883a48a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix index 5445157b853..9115b1d57c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -52,8 +52,7 @@ buildPythonPackage rec { postPatch = '' sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ - --replace 'typing==3.6.4' 'typing' \ - --replace 'attrs>=19.3.0,<20.3.0' 'attrs' + --replace 'typing==3.6.4' 'typing' ''; checkPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index e5c7c23e2e4..4d6c71a7e2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix new file mode 100644 index 00000000000..a019dd65199 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cirq/default.nix index ebc0eb51df4..16c61f2e895 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , freezegun , google-api-core , matplotlib diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index eaf89948e8f..859fb091ec9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 1812ddff952..61b72e8cf31 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clifford/default.nix index 85ed160413e..3226e3854c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -46,11 +46,6 @@ buildPythonPackage rec { ipython ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'numba==0.43'" "'numba'" - ''; - # avoid collecting local files preCheck = '' cd clifford/test diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix index b9ffd35bf96..96e6b86c150 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index 92af67fa183..5baa28e4bd7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , fetchpatch , rPackages -, rWrapper , buildPythonPackage , biopython , numpy @@ -55,11 +54,6 @@ buildPythonPackage rec { rPackages.DNAcopy ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pandas >= 0.20.1, < 0.25.0" "pandas" - ''; - checkInputs = [ R ]; checkPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix index e1aa8252d13..7427d391c61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" ''; - # tries to run not rully installed script + # tries to run not fully installed script disabledTests = [ "test_command" ]; pythonImportsCheck = [ "codespell_lib" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index d1dcce9699b..9b6e5da6263 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -1,20 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "ConfigArgParse"; - version = "1.2.3"; + version = "1.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"; + src = fetchFromGitHub { + owner = "bw2"; + repo = pname; + rev = version; + sha256 = "147x781lgahn9r3gbhayhx1pf0iysf7q1hnr3kypy3p2k9v7a9mh"; }; - # no tests in tarball - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "configargparse" ]; meta = with lib; { description = "A drop-in replacement for argparse"; - homepage = "https://github.com/zorro3/ConfigArgParse"; + homepage = "https://github.com/bw2/ConfigArgParse"; license = licenses.mit; maintainers = [ maintainers.willibutz ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix index 6c488a271e2..fc470e012fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { # tests not packaged with pypi release doCheck = false; + pythonImportsCheck = [ "cornice" ]; meta = with lib; { homepage = "https://github.com/mozilla-services/cornice"; @@ -27,5 +28,4 @@ buildPythonPackage rec { license = licenses.mpl20; maintainers = [ maintainers.costrouc ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cot/default.nix index a6de8321dc0..607057b73f2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cot/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/cozy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cozy/default.nix index 39f2d1227e7..fcd002f762d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cozy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cozy/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, isPy3k, fetchFromGitHub, lib, - z3, ply, python-igraph, oset, ordered-set, dictionaries }: + z3, ply, python-igraph, oset, ordered-set, dictionaries, setuptools }: buildPythonPackage { pname = "cozy"; @@ -7,7 +7,7 @@ buildPythonPackage { disabled = !isPy3k; propagatedBuildInputs = [ - z3 ply python-igraph oset ordered-set dictionaries + setuptools z3 ply python-igraph oset ordered-set dictionaries ]; src = fetchFromGitHub { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix index b6972e6d56b..04971852075 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/3.3.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.3.1"; # Also update the hash in vectors-3.3.nix + version = "3.3.2"; # Also update the hash in vectors-3.3.nix src = fetchPypi { inherit pname version; - sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"; + sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"; }; patches = [ ./cryptography-py27-warning.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index ad402efd759..1038431d31c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/infra/libkookie/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.1"; # Also update the hash in vectors.nix + version = "3.4.6"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"; + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix index 94526c8268e..f9b7c525237 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors-3.3.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"; + sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"; }; # No tests included diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index 94526c8268e..a807be9c3bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"; + sha256 = "1a1d5ix5b3ajhrqaf8rm6qmd6gkaidij0jgd1vrb8q1xn1gqmy75"; }; # No tests included diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 4105d981386..ea32471f09c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -2,13 +2,12 @@ , buildPythonPackage , fetchFromGitHub , isPy3k -, pytestrunner , click , dateparser , pandas , py-lru-cache , six -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -23,11 +22,6 @@ buildPythonPackage rec { sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace pandas~=0.25.0 pandas - ''; - propagatedBuildInputs = [ click dateparser @@ -37,13 +31,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Convert CSV files into a SQLite database"; homepage = "https://github.com/simonw/csvs-to-sqlite"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index 4c2db1f5214..42f1d77b12b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , chart-studio , colorlover , ipython diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 1f5a2edc989..9fdee6dacaf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -4,40 +4,35 @@ , fetchPypi , cvxopt , ecos -, multiprocess , numpy , osqp , scipy , scs -, six # Check inputs , pytestCheckHook -, nose }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.8"; + version = "1.1.10"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff"; + hash = "sha256-7NCouJ95nOolSSjeqHktnGnDfbC9gwtM2mKbKyvlInA="; }; propagatedBuildInputs = [ cvxopt ecos - multiprocess numpy osqp scipy scs - six ]; - checkInputs = [ pytestCheckHook nose ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "./cvxpy" ]; # Disable the slowest benchmarking tests, cuts test time in half disabledTests = [ @@ -46,7 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A domain-specific language for modeling convex optimization problems in Python."; + description = "A domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix index d2f040609d3..f55a2fe7509 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { preBuild = '' export HOME=$(mktemp -d) + export GO111MODULE=off ''; # tests requires cluster for testing diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index a3cc7b6afda..a68c86538ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , dask , numpy, toolz # dask[array] , scipy @@ -38,6 +37,7 @@ buildPythonPackage rec { checkPhase = '' pytest --ignore=tests/test_dask_image/ ''; + pythonImportsCheck = [ "dask_image" ]; meta = with lib; { homepage = "https://github.com/dask/dask-image"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 737def7b9ac..4f4b7b705c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -12,10 +12,6 @@ , six , multipledispatch , packaging -, pytest -, xgboost -, tensorflow -, joblib , distributed }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix index 1bec4c82872..d656b055d11 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix @@ -4,8 +4,6 @@ , dask , distributed , mpi4py -, pytest -, requests }: buildPythonPackage rec { @@ -17,15 +15,11 @@ buildPythonPackage rec { sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; }; - checkInputs = [ pytest requests ]; propagatedBuildInputs = [ dask distributed mpi4py ]; - checkPhase = '' - py.test dask_mpi - ''; - # hardcoded mpirun path in tests doCheck = false; + pythonImportsCheck = [ "dask_mpi" ]; meta = with lib; { homepage = "https://github.com/dask/dask-mpi"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix index 4e64b8c9f0c..eb18ac31fd0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix @@ -4,8 +4,6 @@ , xgboost , dask , distributed -, pytest -, scikitlearn }: buildPythonPackage rec { @@ -17,19 +15,17 @@ buildPythonPackage rec { sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; }; - checkInputs = [ pytest scikitlearn ]; propagatedBuildInputs = [ xgboost dask distributed ]; - checkPhase = '' - py.test dask_xgboost/tests/test_core.py - ''; - doCheck = false; + pythonImportsCheck = [ "dask_xdgboost" ]; meta = with lib; { homepage = "https://github.com/dask/dask-xgboost"; description = "Interactions between Dask and XGBoost"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + # TypeError: __init__() got an unexpected keyword argument 'iid' + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix index 483c565536d..54cec0f98ad 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index a97d9bc0c98..cb72bef323b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/datashader/default.nix index 534cc816def..2b11b1ea273 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { # dask doesn't do well with large core counts checkPhase = '' - pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' + pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested' ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ddt/default.nix index f993c3844b8..4766d04c1f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ddt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ddt/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , six, pyyaml, mock , pytestCheckHook , enum34 @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "0595e70d074e5777771a45709e99e9d215552fb1076443a25fad6b23d8bf38da"; }; + patches = [ + # fix tests with recent PyYAML, https://github.com/datadriventests/ddt/pull/96 + (fetchpatch { + url = "https://github.com/datadriventests/ddt/commit/97f0a2315736e50f1b34a015447cd751da66ecb6.patch"; + sha256 = "1g7l5h7m7s4yqfxlygrg7nnhb9xhz1drjld64ssi3fbsmn7klf0a"; + }) + ]; + checkInputs = [ six pyyaml mock pytestCheckHook ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix new file mode 100644 index 00000000000..22289195651 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv +, packaging +, importlib-resources +, dbus-next +}: + +buildPythonPackage rec { + pname = "desktop-notifier"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b333594af6e54677f9620480226dbc88ec6dd7c004352de9268d01aa49467f4"; + }; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ] ++ lib.optionals stdenv.isLinux [ + dbus-next + ]; + + # no tests available, do the imports check instead + doCheck = false; + pythonImportsCheck = [ "desktop_notifier" ]; + + meta = with lib; { + homepage = "https://github.com/samschott/desktop-notifier"; + description = "A Python library for cross-platform desktop notifications"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dftfit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dftfit/default.nix index 0f0563e3baf..73791bdaa9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dftfit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dftfit/default.nix @@ -12,11 +12,7 @@ , lammps-cython , pymatgen-lammps , pytestrunner -, pytest -, pytestcov -, pytest-benchmark , isPy3k -, openssh }: buildPythonPackage rec { @@ -25,18 +21,27 @@ buildPythonPackage rec { disabled = (!isPy3k); src = fetchPypi { - inherit pname version; - sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; + inherit pname version; + sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest pytestcov pytest-benchmark openssh ]; - propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo - pandas scipy numpy scikitlearn - lammps-cython pymatgen-lammps ]; + propagatedBuildInputs = [ + pymatgen + marshmallow + pyyaml + pygmo + pandas + scipy + numpy + scikitlearn + lammps-cython + pymatgen-lammps + ]; # tests require git lfs download. and is quite large so skip tests doCheck = false; + pythonImportsCheck = [ "dftfit" ]; meta = { description = "Ab-Initio Molecular Dynamics Potential Development"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix index abc07346efd..a9c2e4e8237 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix @@ -8,11 +8,12 @@ , numpy , pydicom , scipy +, setuptools }: buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.2.8"; + version = "2.2.12"; disabled = isPy27; # no tests in PyPI dist @@ -20,10 +21,10 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; rev = version; - sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34"; + sha256 = "0ddzaw0yasyi2wsh7a6r73cdcmdfbb0nh0k0n4yxp9vnkw1ag5z4"; }; - propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ]; + propagatedBuildInputs = [ nibabel numpy pydicom scipy setuptools ]; checkInputs = [ nose gdcm ]; checkPhase = "nosetests tests"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix index 03b1f4fa28e..91832bc88ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix @@ -6,7 +6,6 @@ , six # test dependencies , coverage -, flake8 , mock , nose , pycodestyle diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix index f4be407fade..372b931bca2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -1,11 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, pytest-repeat -, pytest-timeout -, mock -, joblib , click , cloudpickle , dask @@ -18,9 +13,6 @@ , tornado , zict , pyyaml -, isPy3k -, futures -, singledispatch , mpi4py , bokeh , pythonOlder @@ -29,6 +21,7 @@ buildPythonPackage rec { pname = "distributed"; version = "2.30.1"; + disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { @@ -36,23 +29,14 @@ buildPythonPackage rec { sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; }; - disabled = pythonOlder "3.6"; - - checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh ]; - # tests take about 10-15 minutes - # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses - # these tests are not critical to the library (only the cli) - checkPhase = '' - py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests" - ''; - # when tested random tests would fail and not repeatably doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = { description = "Distributed computation in Python."; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 11939b9b773..fbac0a82a17 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/infra/libkookie/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 = "sha256-NoWVs8JiPt6spb7qXxKIdCTDhO3W9wUs9EJEMHUIQxM="; }; 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix index 7b447eb8d78..7f2db712f00 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dlib/default.nix index 204c1a98542..58ceb16870a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dlib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix index 0fa202addb9..54af81d5d8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.19.202"; + version = "2.20.204"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b"; + sha256 = "sha256-JNjD9UtLHsMGwTuXydZ+L5+pPQ2eobkr26Yt9pgs1qA="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index ea6dfe32fda..56fb450b3e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -6,7 +6,7 @@ , pybind11 , setuptools_scm , pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -31,18 +31,10 @@ buildPythonPackage rec { pytestrunner ]; - checkInputs = [ - pytest - ]; - - propagatedBuildInputs = [ - numpy - pandas - ]; + propagatedBuildInputs = [ numpy pandas ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "duckdb" ]; meta = with lib; { description = "DuckDB is an embeddable SQL OLAP Database Management System"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix index f0d3bad7a04..9a09c7cc75d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 4cc3f34929b..a4c8cb7227f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/easywatch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/easywatch/default.nix index a56ffb95281..36f3ea0de6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/easywatch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/easywatch/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { # There are no tests doCheck = false; + pythonImportsCheck = [ "easywatch" ]; meta = with lib; { description = "Dead-simple way to watch a directory"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/editdistance/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/editdistance/default.nix new file mode 100644 index 00000000000..01e59fdb040 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elmax/default.nix new file mode 100644 index 00000000000..7ec3b8d1c11 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/entrance/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/entrance/default.nix index 2f0f80bcf7a..ca6158bd5e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/entrance/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/exdown/default.nix index 17cab3fe55f..bf0a71984c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/exdown/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "exdown"; - version = "0.7.1"; + version = "0.8.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI="; + sha256 = "1ly67whyfn74nr0dncarf3xbd96hacvzgjihx4ibckkc4h9z46bj"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/exrex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/exrex/default.nix new file mode 100644 index 00000000000..8c980c8d00f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/faadelays/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/faadelays/default.nix new file mode 100644 index 00000000000..3175aabcae8 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 07922ee19ef..dc25759afe3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, -thrift, pytest, python-snappy, lz4, zstd }: +{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner +, thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }: buildPythonPackage rec { pname = "fastparquet"; @@ -12,15 +12,13 @@ buildPythonPackage rec { sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana"; }; - postPatch = '' - # FIXME: package zstandard - # removing the test dependency for now - substituteInPlace setup.py --replace "'zstandard'," "" - ''; - nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ numba numpy pandas thrift ]; - checkInputs = [ pytest python-snappy lz4 zstd ]; + checkInputs = [ pytestCheckHook python-snappy lz4 zstandard zstd ]; + + # E ModuleNotFoundError: No module named 'fastparquet.speedups' + doCheck = false; + pythonImportsCheck = [ "fastparquet" ]; meta = with lib; { description = "A python implementation of the parquet format"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fido2/default.nix index 96019f61cac..ac8e912ba3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fido2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fido2/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { checkInputs = [ mock pyfakefs ]; + pythonImportsCheck = [ "fido2" ]; + meta = with lib; { description = "Provides library functionality for FIDO 2.0, including communication with a device over USB."; homepage = "https://github.com/Yubico/python-fido2"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fixtures/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fixtures/default.nix index 9f1549e98f9..e802dbaa269 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fixtures/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix index a5525d97f60..1349e10c539 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , numpy , scipy , tables diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index 1e133df2b2b..06c91670f44 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.9.0"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552"; + sha256 = "d93edd8fc02ae74b73c3df10a8e7ee26dee489c65dedce0b3a1d2ce05ac3d1be"; }; propagatedBuildInputs = [ flask brotli ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index dfa1a0fbd01..5297c83d64b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index c694c15f557..9a57b1574ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.9.7"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "183y1y11bqd4ky4anyv40qbvsm6i90gnydqzrjg7syspjsqvfqgy"; + sha256 = "1iz04kpxgc5fx2rl4585hr1vp4cdajqbddlskkhlmzkn9hvz528i"; extension = "zip"; }; @@ -28,7 +28,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck ${python.interpreter} Lib/fontParts/fontshell/test.py + runHook postCheck ''; checkInputs = [ pytest ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index 75f4908b63b..407b72c953f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.19.1"; + version = "4.21.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2"; + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix index 09ce8bbd11b..a83a432d89d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix @@ -11,17 +11,15 @@ buildPythonPackage rec { pname = "freezegun"; - version = "0.3.5"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf"; + sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; propagatedBuildInputs = [ dateutil six ]; checkInputs = [ mock nose pytest ]; - # contains python3 specific code - doCheck = !isPy27; meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix index 4c5a87e8266..00d03435de9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix @@ -2,28 +2,22 @@ , buildPythonPackage , pythonOlder , fetchPypi -, isPy27 , dateutil -, six -, mock -, nose -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "freezegun"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1cf08e441f913ff5e59b19cc065a8faa9dd1ddc442eaf0375294f344581a0643"; + sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil six ]; - checkInputs = [ mock nose pytest ]; - # contains python3 specific code - doCheck = !isPy27; + propagatedBuildInputs = [ dateutil ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index b8312d1c8ec..760091e567d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.4.0"; + version = "1.4.1"; # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "1p8dqcc75xfhyvc9izjzz8c7qfrdkjkrkj36j7ms5fimn5bwk70q"; + sha256 = "1v8gyr91ddinxgl7507hw64snsvcpm3r7bmdjw2v5v6rmc0wl06s"; }; disabled = pythonOlder "3.6"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix new file mode 100644 index 00000000000..a422e5606b0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "fuzzyfinder"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c56d86f110866becad6690c7518f7036c20831c0f82fc87eba8fdb943132f04b"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "fuzzyfinder" ]; + + meta = with lib; { + description = "Fuzzy Finder implemented in Python"; + homepage = "https://github.com/amjith/fuzzyfinder"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/geoip2/default.nix index 69b5d2f97fb..05a73c31675 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/geoip2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/geoip2/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, lib, fetchPypi, isPy27 , aiohttp , maxminddb -, mock , mocket , requests , requests-mock diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/getmac/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/getmac/default.nix index 51ce0ef0503..483539bc221 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/getmac/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/getmac/default.nix @@ -1,5 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest, pytest-benchmark, pytest-mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-benchmark +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "getmac"; @@ -7,19 +12,32 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GhostofGoes"; - repo = "getmac"; + repo = pname; rev = version; sha256 = "08d4iv5bjl1s4i9qhzf3pzjgj1rgbwi0x26qypf3ycgdj0a6gvh2"; }; - checkInputs = [ pytest pytest-benchmark pytest-mock ]; - checkPhase = '' - pytest --ignore tests/test_cli.py - ''; + checkInputs = [ + pytestCheckHook + pytest-benchmark + pytest-mock + ]; + + disabledTests = [ + # Disable CLI tests + "test_cli_main_basic" + "test_cli_main_verbose" + "test_cli_main_debug" + "test_cli_multiple_debug_levels" + # Disable test that require network access + "test_uuid_lanscan_iface" + ]; + + pythonImportsCheck = [ "getmac" ]; meta = with lib; { + description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; - description = "Pure-Python package to get the MAC address of network interfaces and hosts on the local network."; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/github3_py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/github3_py/default.nix index 6b1ea305d4a..8a1eea40c68 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/github3_py/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/glasgow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/glasgow/default.nix index 8a63f78728e..398ee8eedf1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/glasgow/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 50ed257f57e..9a0b1b09db6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , numpy -, setuptools , python , scikitimage , openjpeg diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix index 1797f1d4264..c9fc464f069 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { 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/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 854ec37a1e4..39ed8d68345 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 22b02552cd7..d583de9c074 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 2cada2e0b0f..228f3b68b61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -7,7 +7,6 @@ , google-cloud-storage , google-cloud-testutils , google-resumable-media -, grpcio , ipython , mock , pandas @@ -18,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.7.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "29721972f5e539e486fbdc722ddf849ad86acd092680d16c271430dc16023544"; + sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71"; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 93cbc22b7cd..786250ce9e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ace4ff7c6e00fb7d86963503615db85336b6484339f5774bd8c589df224772a8"; + sha256 = "90bd53a19c33c34101b8567c82a6dc0386af4118d70e1ad69b49375358a21aa6"; }; checkInputs = [ pytest mock ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 1cf94d220e6..4a14080e5e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d"; + sha256 = "69e10c999c64996822aa2ca138cffcdf0f1e04bdbdb7206c286fa17fb800703a"; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 3bc5f185e49..cec1672b761 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index c57329eebcc..65ad31af2eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 5911bfe6156..c01c294ec33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index b6922912380..b4e579c085f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2bae8b4aca9aa38ad7459102cc5743c506adf9060ad2b3b15cff1e8021085017"; + sha256 = "9a205be275739c141873fa9fbd7c3f9ec6170972c85d5c75e9b4c53b5db839a3"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index 590962590e5..53ce654e41b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }: +{ buildPythonPackage, fetchPypi, pythonAtLeast, lib, requests, pytestCheckHook, mock }: buildPythonPackage rec { pname = "google-i18n-address"; version = "2.4.0"; + disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; @@ -15,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; - homepage = "https://pypi.org/project/google-i18n-address/"; + homepage = "https://github.com/mirumee/google-i18n-address"; maintainers = with maintainers; [ SuperSandro2000 ]; license = licenses.bsd3; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix index 1ad50642e2b..3caa89d06f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ]; + # no tests executed + doCheck = false; + + pythonImportsCheck = [ "gpsoauth" ]; + meta = with lib; { description = "A python client library for Google Play Services OAuth"; homepage = "https://github.com/simon-weber/gpsoauth"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix index ada005d14f8..180e20c9f56 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphene/default.nix index bf7d08cdce3..2839fc337cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , aniso8601 -, iso8601 , graphql-core , graphql-relay , promise diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix index fa6a9ec60a7..08e27c19487 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphtage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graphtage/default.nix new file mode 100644 index 00000000000..c222ea521bb --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index 4fd6ccf19c5..b4e8803784b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook pytestcov ]; - pytestFlagsArray = [ "tests" "--ignore=docs" ]; + pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index 1b1ffb975fb..0fe6b9343eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/guppy3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/guppy3/default.nix new file mode 100644 index 00000000000..578f979914c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/guppy3/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, tkinter +}: + +buildPythonPackage rec { + pname = "guppy3"; + version = "3.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "zhuyifei1999"; + repo = pname; + rev = "v${version}"; + sha256 = "0yjsn8najbic4f50nj6jzhzrhj1bw6918w0gihdkzhqynwgqi64m"; + }; + + propagatedBuildInputs = [ tkinter ]; + + # Tests are starting a Tkinter GUI + doCheck = false; + pythonImportsCheck = [ "guppy" ]; + + meta = with lib; { + description = "Python Programming Environment & Heap analysis toolset"; + homepage = "https://zhuyifei1999.github.io/guppy3/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix index fabc2d147fc..92f33abb594 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index daa181a9cfc..961137ed9ab 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-DuVpo+g5VS7bkj/DZi0vNOAPjPkzfIA5I2BD5KJ/rNQ="; + sha256 = "sha256-+4jlzemF5f4Qz4QHDaErsmVHq1Pjn/vsvoq/oCbW/hI="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index 7562e36e4d9..9d6e4795959 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.12.22"; + version = "2021.2.15"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1jzcw4clmpbyw67pzskms5rq5b7285iwh42jzc4ly6jz9amggdzc"; + sha256 = "sha256-vHq4DjDh7hBNAK/h/KdzqaEgrG5bg7VQ8fVWuxV7vOg="; }; # tests require network connection @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc SuperSandro2000 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index 2e711141fcb..ace9a7041e3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , flask , flask-limiter , markupsafe diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index aa15c2555e6..dbbdf0bb38c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 6e81cc92193..9fe636c3591 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix index b6f78e5cf8f..94cef6d07f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -2,8 +2,10 @@ , buildPythonPackage , fetchPypi , isPy27 -, mock , setuptools_scm +, setuptools +, pytestCheckHook +, freezegun }: buildPythonPackage rec { @@ -17,16 +19,14 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ mock ]; - - doCheck = false; + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ pytestCheckHook freezegun ]; meta = with lib; { description = "Python humanize utilities"; homepage = "https://github.com/jmoiron/humanize"; license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hupper/default.nix index 1fe5ab7153d..27e308ee447 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, watchdog, mock +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest-cov +, watchdog }: buildPythonPackage rec { @@ -11,11 +16,14 @@ buildPythonPackage rec { sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a"; }; - checkPhase = '' - py.test - ''; - # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ pytest pytestcov mock ] ++ lib.optional (!stdenv.isDarwin) watchdog; + checkInputs = [ pytestCheckHook pytest-cov ] ++ lib.optional (!stdenv.isDarwin) watchdog; + + meta = with lib; { + description = "in-process file monitor / reloader for reloading your code automatically during development"; + homepage = "https://github.com/Pylons/hupper"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix index f3b8393a275..cb4d538da3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -1,20 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, editdistance +}: buildPythonPackage rec { pname = "identify"; - version = "1.5.13"; + version = "1.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66"; + + src = fetchFromGitHub { + owner = "pre-commit"; + repo = pname; + rev = "v${version}"; + sha256 = "1sqhqqjp53dwm8yq4nrgggxbvzs3szbg49z5sj2ss9xzlgmimclm"; }; - # Tests not included in PyPI tarball - doCheck = false; + checkInputs = [ + editdistance + pytestCheckHook + ]; + + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/image-match/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/image-match/default.nix index 7464f3c8997..ed5179d6db5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/image-match/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/image-match/default.nix @@ -24,6 +24,7 @@ buildPythonPackage { # tests cannot work without elasticsearch doCheck = false; + pythonImportsCheck = [ "image_match" ]; meta = with lib; { homepage = "https://github.com/ascribe/image-match"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix index 8d2b7fd8da8..ee1df820a40 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix @@ -26,6 +26,9 @@ buildPythonPackage rec { opencv3 ]; + doCheck = false; + pythonImportsCheck = [ "imagecorruptions" ]; + meta = with lib; { homepage = "https://github.com/bethgelab/imagecorruptions"; description = "This package provides a set of image corruptions"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index 107febe4041..2f87f24639a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.37.0"; + version = "0.38.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "1501lk3fjxqmzxffahbj33y795gwl96yqvk3fs86cchm6vz2gnkk"; + sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g"; }; checkInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index e0c2adb8e8b..3805b55bcf1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -3,7 +3,6 @@ , pandas , pytestCheckHook , scikitlearn -, tensorflow }: buildPythonPackage rec { @@ -37,6 +36,7 @@ buildPythonPackage rec { "_generator" "show_versions" "test_make_imbalanced_iris" + "test_rusboost[SAMME.R]" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/immutables/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/immutables/default.nix index 41dcc6b2c11..196ea78bba7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/immutables/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/immutables/default.nix @@ -1,19 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "immutables"; - version = "0.14"; + version = "0.15"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0y0aqw29g525frdnmv9paljzacpp4s21sadfbca5b137iciwr8d0"; + sha256 = "3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b"; }; - meta = { + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "immutables" ]; + + meta = with lib; { description = "An immutable mapping type for Python"; homepage = "https://github.com/MagicStack/immutables"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ catern ]; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ catern ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix index c0f6fe92050..130b6a49bda 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/intake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/intake/default.nix index 922d543fd1d..32a56c3e95d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { pname = "intake"; version = "0.6.0"; - disabled = pythonOlder "3.6"; src = fetchPypi { @@ -64,14 +63,17 @@ buildPythonPackage rec { PATH=$out/bin:$PATH ''; - # disable tests which touch network - disabledTests = '' + disabledTests = [ + # disable tests which touch network "test_discover" "test_filtered_compressed_cache" "test_get_dir" "test_remote_cat" "http" - ''; + + # broken test + "test_read_pattern" + ]; meta = with lib; { description = "Data load and catalog system"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/intelhex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/intelhex/default.nix index 0634e919024..e5b0cc6fbc7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/intelhex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/intelhex/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch +, pytestCheckHook }: buildPythonPackage rec { pname = "intelhex"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; + sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; - patches = [ - # patch the tests to check for the correct version string (2.2.1) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch"; - sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; - }) - ]; + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "intelhex/test.py" ]; + + pythonImportsCheck = [ "intelhex" ]; meta = { homepage = "https://github.com/bialix/intelhex"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix index 41973e80584..947da75ce9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix deleted file mode 100644 index d00ccd06c8d..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: - -buildPythonPackage rec { - pname = "jabberbot"; - version = "0.16"; - - disabled = isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d"; - }; - - propagatedBuildInputs = [ xmpppy ]; - - doCheck = false; # lol, it does not even specify dependencies properly - - meta = with lib; { - description = "A framework for writing Jabber/XMPP bots and services"; - homepage = "http://thp.io/2007/python-jabberbot/"; - license = licenses.gpl3; - maintainers = with maintainers; [ mic92 ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix index 77789fa44db..460b0cddf61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix index b6e6f47b64b..3f30da8da9b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5"; + sha256 = "d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix index 3d4097b0718..271f15c5900 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -8,10 +8,15 @@ buildPythonPackage rec { inherit pname version; sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e"; }; + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix new file mode 100644 index 00000000000..e475c3117df --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix @@ -0,0 +1,24 @@ +{ lib, isPy27, buildPythonPackage, fetchPypi, pytestCheckHook, mock }: + +let + pythonEnv = lib.optional isPy27 mock; +in buildPythonPackage rec { + pname = "json-rpc"; + version = "1.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12bmblnznk174hqg2irggx4hd3cq1nczbwkpsqqzr13hbg7xpw6y"; + }; + + checkInputs = pythonEnv ++ [ pytestCheckHook ]; + + nativeBuildInputs = pythonEnv; + + meta = with lib; { + description = "JSON-RPC 1/2 transport implementation"; + homepage = "https://github.com/pavlov99/json-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/json5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/json5/default.nix new file mode 100644 index 00000000000..cecce31e0ec --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix new file mode 100644 index 00000000000..a623c859e16 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, decorator +, fetchFromGitHub +, ply +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "jsonpath-ng"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "h2non"; + repo = pname; + rev = "v${version}"; + sha256 = "1cxjwhx0nj85a3awnl7j6afnk07awzv45qfwxl5jqbbc9cxh5bd6"; + }; + + propagatedBuildInputs = [ + decorator + ply + six + ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTestFiles = [ + # Exclude tests that require oslotest + "tests/test_jsonpath_rw_ext.py" + ]; + + pythonImportsCheck = [ "jsonpath_ng" ]; + + meta = with lib; { + description = "JSONPath implementation for Python"; + homepage = "https://github.com/h2non/jsonpath-ng"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index 704d9174ebd..108d11853f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -1,33 +1,40 @@ { lib +, stdenv , buildPythonPackage +, pythonOlder , fetchPypi , fetchzip , alembic -, ipython -, jinja2 -, python-oauth2 -, prometheus_client , async_generator +, certipy +, dateutil +, entrypoints +, jinja2 +, jupyter-telemetry +, oauthlib , pamela +, prometheus_client +, requests , sqlalchemy , tornado , traitlets -, requests -, notebook -, pythonOlder , nodePackages -, oauthlib -, certipy -, jupyter-telemetry +, beautifulsoup4 +, cryptography +, notebook +, pytest-asyncio +, pytestCheckHook +, requests-mock +, virtualenv }: let # js/css assets that setup.py tries to fetch via `npm install` when building - # from source. + # from source. https://github.com/jupyterhub/jupyterhub/blob/master/package.json bootstrap = fetchzip { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"; - sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd"; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; + sha256 = "1ywmxqdccg0mgx0xknrn1hlrfnhcwphc12y9l91zizx26fqfmzgc"; }; font-awesome = fetchzip { @@ -36,30 +43,30 @@ let }; jquery = fetchzip { - url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz"; - sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi"; + url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz"; + sha256 = "0yi9ql493din1qa1s923nd5zvd0klk1sx00xj1wx2yambmq86vm9"; }; moment = fetchzip { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha256 = "12gb3p0rz5wyjwykv9g0pix7dd352lx1z7rzdjsf2brhwc4ffyip"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha256 = "0ifzzla4zffw23g3xvhwx3fj3jny6cjzxfzl1x0317q8wa0c7w5i"; }; requirejs = fetchzip { - url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz"; - sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja"; + url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz"; + sha256 = "165hkli3qcd59cjqvli9r5f92i0h7czkmhcg1cgwamw2d0b7xibz"; }; in buildPythonPackage rec { pname = "jupyterhub"; - version = "1.1.0"; - disabled = pythonOlder "3.5"; + version = "1.3.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1mqknz0rxqzx4nc57vscvfh2d4znzlzpy83ancqxdaq3b8i70al5"; + sha256 = "13pf6qhimpaxj20871ff5rvwwan59320cdhhrn9cfh6314971zq5"; }; # Most of this only applies when building from source (e.g. js/css assets are @@ -86,12 +93,7 @@ buildPythonPackage rec { "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" substituteInPlace setup.py --replace \ - "'npm', 'run', 'lessc', '--'" \ - "'${nodePackages.less}/bin/lessc'" - - substituteInPlace setup.py --replace \ - "'npm', 'install', '--progress=false'" \ - "'true'" + "'npm'" "'true'" declare -A deps deps[bootstrap]=${bootstrap} @@ -109,19 +111,52 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado - traitlets prometheus_client async_generator notebook certipy oauthlib + # https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt + alembic + async_generator + certipy + dateutil + entrypoints + jinja2 jupyter-telemetry + oauthlib + pamela + prometheus_client + requests + sqlalchemy + tornado + traitlets ]; - # Disable tests because they take an excessive amount of time to complete. - doCheck = false; + preCheck = '' + substituteInPlace jupyterhub/tests/test_spawner.py --replace \ + "'jupyterhub-singleuser'" "'$out/bin/jupyterhub-singleuser'" + ''; + checkInputs = [ + # https://github.com/jupyterhub/jupyterhub/blob/master/dev-requirements.txt + beautifulsoup4 + cryptography + notebook + pytest-asyncio + pytestCheckHook + requests-mock + virtualenv + ]; + + disabledTests = [ + # Tries to install older versions through pip + "test_upgrade" + # Testcase fails to find requests import + "test_external_service" + ]; meta = with lib; { description = "Serves multiple Jupyter notebook instances"; homepage = "https://jupyter.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie cstrahan ]; + # E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found + broken = stdenv.isDarwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix index 5a70dcb4676..8b9823b6f03 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "keep"; - version = "2.10"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b"; + sha256 = "3abbe445347711cecd9cbb80dab4a0777418972fc14a14e9387d0d2ae4b6adb7"; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kivy-garden/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kivy-garden/default.nix new file mode 100644 index 00000000000..edfad0c9b91 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kivy-garden/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "kivy-garden"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wkcpr2zc1q5jb0bi7v2dgc0vs5h1y7j42mviyh764j2i0kz8mn2"; + }; + + propagatedBuildInputs = [ requests ]; + + pythonImportsCheck = [ "garden" ]; + + # There are no tests in the Pypi archive and building from source is not + # easily feasible because the build is done using buildozer and multiple + # repositories. + doCheck = false; + + meta = with lib; { + description = "The kivy garden installation script, split into its own package for convenient use in buildozer."; + homepage = "https://pypi.python.org/pypi/kivy-garden"; + license = licenses.mit; + maintainers = with maintainers; [ risson ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kivy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kivy/default.nix new file mode 100644 index 00000000000..d4fa39c0c36 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kivy/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage, fetchPypi +, pkg-config, cython, docutils +, kivy-garden +, mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, gst_all_1 +, pillow, requests, pygments +}: + +buildPythonPackage rec { + pname = "Kivy"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n0j9046vgjncy50v06r3wcg3q2l37jp8n0cznr64dz48kml8pnj"; + }; + + nativeBuildInputs = [ + pkg-config + cython + docutils + ]; + + buildInputs = [ + mesa + mtdev + SDL2 + SDL2_image + SDL2_ttf + SDL2_mixer + + # NOTE: The degree to which gstreamer actually works is unclear + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + ]; + + propagatedBuildInputs = [ + kivy-garden + pillow + pygments + requests + ]; + + KIVY_NO_CONFIG = 1; + KIVY_NO_ARGS = 1; + KIVY_NO_FILELOG = 1; + + postPatch = '' + substituteInPlace kivy/lib/mtdev.py \ + --replace "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')" + ''; + + /* + We cannot run tests as Kivy tries to import itself before being fully + installed. + */ + doCheck = false; + pythonImportsCheck = [ "kivy" ]; + + meta = with lib; { + description = "Library for rapid development of hardware-accelerated multitouch applications."; + homepage = "https://pypi.python.org/pypi/kivy"; + license = licenses.mit; + maintainers = with maintainers; [ risson ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/knack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/knack/default.nix index c08bdab4cf3..4bead996198 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/knack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/knack/default.nix @@ -4,7 +4,6 @@ , argcomplete , colorama , jmespath -, knack , pygments , pyyaml , six diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix index 1aa22a62e19..a5ca1a7ab2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements/test.txt \ --replace "pytest-sugar" "" - substituteInPlace requirements/default.txt \ - --replace "amqp==2.5.1" "amqp~=2.5" ''; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 1efe0109212..85e0fbe7139 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.9"; + version = "2.4.10"; src = fetchPypi { inherit pname version; - sha256 = "488fb0b2233738c3bba3d3bf67b941f105553b7286cca3099ac0120dd247bd84"; + sha256 = "b58604ee50c54a35994e54741d9071ecfebb6d6b9b2737604a95f29c4f23d6ec"; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch new file mode 100644 index 00000000000..d3e3082b352 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch @@ -0,0 +1,33 @@ +From 75baa1751973378cb96fb204b0a18a74e5caa2d1 Mon Sep 17 00:00:00 2001 +From: Rouven Czerwinski +Date: Wed, 17 Feb 2021 14:03:20 +0100 +Subject: [PATCH] serialdriver: remove pyserial version check + +This check isn't required on NixOS, since pyserial within NixOS already +contains the patches. + +Signed-off-by: Rouven Czerwinski +--- + labgrid/driver/serialdriver.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py +index 126f674e..59a92269 100644 +--- a/labgrid/driver/serialdriver.py ++++ b/labgrid/driver/serialdriver.py +@@ -27,12 +27,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol): + bindings = {"port": "SerialPort", } + else: + bindings = {"port": {"SerialPort", "NetworkSerialPort"}, } +- if version.parse(serial.__version__) != version.Version('3.4.0.1'): +- message = ("The installed pyserial version does not contain important RFC2217 fixes.\n" +- "You can install the labgrid fork via:\n" +- "pip uninstall pyserial\n" +- "pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n") # pylint: disable=line-too-long +- warnings.warn(message) + + txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float)) + timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float)) +-- +2.30.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labgrid/default.nix new file mode 100644 index 00000000000..9d42d97e0d8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -0,0 +1,78 @@ +{ ansicolors +, attrs +, autobahn +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, lib +, mock +, pexpect +, psutil +, pyserial +, pytestCheckHook +, pytest-dependency +, pytest-mock +, pyudev +, pyusb +, pyyaml +, requests +, setuptools-scm +, xmodem +}: + +buildPythonPackage rec { + pname = "labgrid"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "labgrid-project"; + repo = "labgrid"; + rev = "v${version}"; + sha256 = "15298prs2f4wiyn8lf475qicp3y22lcjdcpwp2fmrya642vnr6w5"; + }; + + patches = [ + ./0001-serialdriver-remove-pyserial-version-check.patch + ]; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + ansicolors + attrs + autobahn + jinja2 + pexpect + pyserial + pyudev + pyusb + pyyaml + requests + xmodem + ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + checkInputs = [ + mock + psutil + pytestCheckHook + pytest-mock + pytest-dependency + ]; + + disabledTests = [ + "docker" + "sshmanager" + ]; + + meta = with lib; { + description = "Embedded control & testing library"; + homepage = "https://labgrid.org"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix index 4c16010f4af..cf6bdc38ffa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix @@ -9,10 +9,7 @@ , pymatgen , ase , pytestrunner -, pytest_4 -, pytestcov , isPy3k -, openssh }: buildPythonPackage rec { @@ -26,7 +23,6 @@ buildPythonPackage rec { }; buildInputs = [ cython pytestrunner ]; - checkInputs = [ pytest_4 pytestcov openssh ]; propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; preBuild = '' @@ -44,10 +40,14 @@ buildPythonPackage rec { EOF ''; + pythonImportsCheck = [ "lammps" ]; + meta = { description = "Pythonic Wrapper to LAMMPS using cython"; homepage = "https://gitlab.com/costrouc/lammps-cython"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; + # fails import check + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix index 6c5112312bb..e39e313baa7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix @@ -10,6 +10,7 @@ , six , testresources , wadllib +, pytestCheckHook }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { wadllib ]; + checkInputs = [ pytestCheckHook ]; + preCheck = '' export HOME=$TMPDIR ''; @@ -41,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Script Launchpad through its web services interfaces. Officially supported"; homepage = "https://help.launchpad.net/API/launchpadlib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ maintainers.marsam ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix index 93956c51b25..cb78dfff1a2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -8,6 +8,10 @@ , setuptools , six , wadllib +, fixtures +, lazr-uri +, pytestCheckHook +, wsgi-intercept }: buildPythonPackage rec { @@ -23,7 +27,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; - doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept + # E ModuleNotFoundError: No module named 'lazr.uri' + doCheck = false; + checkInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; pythonImportsCheck = [ "lazr.restfulclient" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix index e3694bffe37..0d0c1159332 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lektor/default.nix index 844e28aa078..febb1b1f0b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -12,8 +12,8 @@ , flask , pyopenssl , ndg-httpsclient -, pytest -, pytestcov +, pytestCheckHook +, pytest-cov , pytest-mock , pytest-pylint , pytest-click @@ -39,13 +39,9 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ functools32 ]; checkInputs = [ - pytest pytestcov pytest-mock pytest-pylint pytest-click + pytestCheckHook pytest-cov pytest-mock pytest-pylint pytest-click ]; - checkPhase = '' - pytest - ''; - # many errors -- tests assume inside of git repo, linting errors 13/317 fail doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libnacl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libnacl/default.nix index 2406738cf1b..f8cb85ab418 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libnacl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libnacl/default.nix @@ -1,33 +1,41 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, libsodium +, pytestCheckHook +}: buildPythonPackage rec { pname = "libnacl"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; rev = "v${version}"; - sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg"; + sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ libsodium ]; + buildInputs = [ libsodium ]; postPatch = - let soext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" - ''; + let soext = stdenv.hostPlatform.extensions.sharedLibrary; in + '' + substituteInPlace "./libnacl/__init__.py" --replace \ + "ctypes.cdll.LoadLibrary('libsodium${soext}')" \ + "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" + ''; - checkPhase = '' - py.test - ''; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "libnacl" ]; meta = with lib; { - maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; - homepage = "https://pypi.python.org/pypi/libnacl"; + homepage = "https://libnacl.readthedocs.io/"; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ xvapx ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/librouteros/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/librouteros/default.nix new file mode 100644 index 00000000000..32c9889681c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/librouteros/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, pytest-xdist +}: + +buildPythonPackage rec { + pname = "librouteros"; + version = "3.1.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "luqasz"; + repo = pname; + rev = version; + sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql"; + }; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests which require QEMU to run + "test_login" + "test_long_word" + "test_query" + "test_add_then_remove" + "test_add_then_update" + "test_generator_ditch" + ]; + + pythonImportsCheck = [ "librouteros" ]; + + meta = with lib; { + description = "Python implementation of the MikroTik RouterOS API"; + homepage = "https://librouteros.readthedocs.io/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index 0446299fd1b..cc0ba39e64e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "14ljk7rywy3fiv23dpayvk14y1ywma729r3b1x2cxf68919g2gnh"; + sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libversion/default.nix index 2edc9211d92..4bc2dfa2ffd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libversion/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightparam/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightparam/default.nix index 0c3eb5292a8..936cc9a0626 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightparam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightparam/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , ipython , ipywidgets , numpy diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/linode-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/linode-api/default.nix index 7df182d94fe..48d5a1e8080 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/linode-api/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/linode-api/default.nix @@ -1,41 +1,38 @@ -{ - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - lib, - requests, - future, - enum34, - mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "linode-api"; - version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions. - - disabled = (pythonOlder "2.7"); - - propagatedBuildInputs = [ requests future ] - ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; - - postPatch = (lib.optionalString (!pythonOlder "3.4") '' - sed -i -e '/"enum34",/d' setup.py - ''); - - doCheck = true; - checkInputs = [ mock ]; + version = "5.0.0"; + disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures src = fetchFromGitHub { - rev = "v${version}"; owner = "linode"; repo = "python-linode-api"; - sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg"; + rev = version; + sha256 = "0lqi15vks4fxbki1l7n1bfzygjy3w17d9wchjxvp22ijmas44yai"; }; - meta = { + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "linode_api4" ]; + + meta = with lib; { + description = "Python library for the Linode API v4"; homepage = "https://github.com/linode/python-linode-api"; - description = "The official python library for the Linode API v4 in python."; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ glenns ]; + license = licenses.bsd3; + maintainers = with maintainers; [ glenns ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix index 184a215c407..98878c90640 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index 02ee088782a..609dcb82237 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/lsassy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lsassy/default.nix index 6b1d5ec2bb4..ad9d09b3266 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lsassy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lsassy/default.nix @@ -4,7 +4,6 @@ , impacket , netaddr , pypykatz -, pytestCheckHook }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lxml/default.nix index aa009e0a3e7..b5837603103 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 990545e4173..cc9c35bcb92 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -1,30 +1,29 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder , python -, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog +, alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog , importlib-metadata , importlib-resources -, dbus-next }: buildPythonPackage rec { pname = "maestral"; - version = "1.3.1"; + version = "1.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM="; + sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8="; }; propagatedBuildInputs = [ alembic - bugsnag click + desktop-notifier dropbox fasteners keyring @@ -42,8 +41,6 @@ buildPythonPackage rec { importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources - ] ++ lib.optionals stdenv.isLinux [ - dbus-next ]; makeWrapperArgs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix new file mode 100644 index 00000000000..f8ddac600a6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -0,0 +1,49 @@ +{ lib +, asyncio-dgram +, buildPythonPackage +, click +, dnspython +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "mcstatus"; + version = "5.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Dinnerbone"; + repo = pname; + rev = "release-${version}"; + sha256 = "1a3qrl6w76ayqkl1knaz5ai0brrzpjfdk33lyb1n1p7gnc73nhlr"; + }; + + propagatedBuildInputs = [ + asyncio-dgram + click + dnspython + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt --replace "dnspython3" "dnspython" + ''; + + pythonImportsCheck = [ "mcstatus" ]; + + meta = with lib; { + description = "Python library for checking the status of Minecraft servers"; + homepage = "https://github.com/Dinnerbone/mcstatus"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/meshio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/meshio/default.nix new file mode 100644 index 00000000000..2c293b3b9c2 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/metar/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/metar/default.nix new file mode 100644 index 00000000000..e832c7cf56f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/metar/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "metar"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "python-metar"; + repo = "python-metar"; + rev = "v${version}"; + sha256 = "019vfq9191cdvvq1afdcdgdgbzpj7wq6pz9li8ggim71azjnv5nn"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "metar" ]; + + meta = with lib; { + description = "Python parser for coded METAR weather reports"; + homepage = "https://github.com/python-metar/python-metar"; + license = with licenses; [ bsd1 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index dd351931e06..e9c12548269 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 35f55bb2793..44402b36ec0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -45,5 +45,7 @@ buildPythonPackage rec { license= licenses.bsd3; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; + # incompatible with nixpkgs scikitlearn version + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/modeled/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/modeled/default.nix index 66fe63e3daf..acf8ee4c112 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/modeled/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/modeled/default.nix @@ -24,9 +24,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "modeled" ]; + meta = with lib; { description = "Universal data modeling for Python"; - homepage = "https://bitbucket.org/userzimmermann/python-modeled"; + homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; maintainers = [ maintainers.costrouc ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index b4aee8c61cf..7f6d9893c96 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -7,7 +7,6 @@ , pyglet , pillow , pyrr -, pytest }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix index cc00643b71a..b4ecf28724a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/moinmoin/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "moinmoin"; - version = "1.9.10"; + version = "1.9.11"; # SyntaxError in setup.py disabled = isPy3k; src = fetchurl { url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; - sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja"; + sha256 = "sha256-Ar4x1V851P4MYlPfi0ngG3bQlWNMvRtW0YX2bh4MPPU="; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/moto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/moto/default.nix index 3efc09bc001..ddc3896c6a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch , aws-xray-sdk , backports_tempfile -, boto , boto3 , botocore , cfn-lint @@ -11,7 +10,6 @@ , jinja2 , jsondiff , mock -, nose , pyaml , python-jose , pytz @@ -24,34 +22,42 @@ , xmltodict , parameterized , idna +, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "moto"; - version = "1.3.14"; + version = "1.3.16"; src = fetchPypi { inherit pname version; - sha256 = "0fm09074qic24h8rw9a0paklygyb7xd0ch4890y4v8lj2pnsxbkr"; + sha256 = "0zy0prsyip264i6h03lxsn1qg1n3dc8c4iyfawckjqvm24gnns3c"; }; postPatch = '' substituteInPlace setup.py \ - --replace "jsondiff==1.1.2" "jsondiff~=1.1" - sed -i '/datetime/d' setup.py # should be taken care of by std library + --replace "ecdsa<0.15" "ecdsa" ''; patches = [ - # loosen idna upper limit + # Remove dependence on boto. The boto library (long ago superseded by boto3) + # has not had an official release in over two years or even a commit in the + # last 18 months. These patches should be included in the next moto release + # after 1.3.16 + (fetchpatch { + url = "https://github.com/spulec/moto/pull/3503/commits/ae85c539fd57034c4d5cfd0f95af41ff19862dd1.patch"; + sha256 = "16hr2py6q701d8ih6zcvs3lbanshpbk15ixckgdqngjf160k5m9p"; + excludes = ["tests/test_ec2/test_ec2_cloudformation.py"]; + }) (fetchpatch { - url = "https://github.com/spulec/moto/commit/649b497f71cce95a6474a3ff6f3c9c3339efb68f.patch"; - sha256 = "03qdybzlskgbdadmlcg6ayxfp821b5iaa8q2542cwkcq7msqbbqc"; + url = "https://github.com/spulec/moto/pull/3468/commits/6ee39bd7fda4d3623569e10dcd9561bf2cd1d0bd.patch"; + sha256 = "10m3xdqxgys7spav9mkbhcn4z0124rlprwxnw6ysb10610xlna0i"; }) ]; propagatedBuildInputs = [ aws-xray-sdk - boto boto3 botocore cfn-lint @@ -72,26 +78,183 @@ buildPythonPackage rec { idna ] ++ lib.optionals isPy27 [ backports_tempfile ]; - checkInputs = [ boto3 freezegun nose sure parameterized ]; + # Next release after 1.3.16 will not require `nose` + checkInputs = [ boto3 nose freezegun pytestCheckHook sure parameterized ]; - checkPhase = '' - nosetests -v ./tests/ \ - -e test_invoke_function_from_sns \ - -e test_invoke_requestresponse_function \ - -e test_context_manager \ - -e test_decorator_start_and_stop \ - -e test_invoke_event_function \ - -e test_invoke_function_from_dynamodb \ - -e test_invoke_function_from_sqs \ - -e test_invoke_lambda_error \ - -e test_invoke_async_function \ - -e test_passthrough_requests - ''; + # Multiple test files still import boto, rather than boto3 like + # boto is long-deprecated and broken on python3.9 + # https://github.com/spulec/moto/blob/63ce647123755e4c4693a89f52c254596004c098/tests/test_autoscaling/test_autoscaling.py#L2 + # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that + # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 + pytestFlagsArray = [ + "--ignore=tests/test_awslambda/test_policy.py" + "--ignore=tests/test_autoscaling/test_autoscaling.py" + "--ignore=tests/test_autoscaling/test_cloudformation.py" + "--ignore=tests/test_autoscaling/test_elbv2.py" + "--ignore=tests/test_autoscaling/test_launch_configurations.py" + "--ignore=tests/test_autoscaling/test_policies.py" + "--ignore=tests/test_autoscaling/test_server.py" + "--ignore=tests/test_awslambda/test_lambda.py" + "--ignore=tests/test_awslambda/test_lambda_cloudformation.py" + "--ignore=tests/test_batch/test_cloudformation.py" + "--ignore=tests/test_batch/test_server.py" + "--ignore=tests/test_cloudformation/test_cloudformation_depends_on.py" + "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud.py" + "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py" + "--ignore=tests/test_cloudformation/test_cloudformation_stack_integration.py" + "--ignore=tests/test_cloudformation/test_stack_parsing.py" + "--ignore=tests/test_cloudformation/test_validate.py" + "--ignore=tests/test_cloudwatch/test_cloudwatch.py" + "--ignore=tests/test_cognitoidentity/test_server.py" + "--ignore=tests/test_config/test_config.py" + "--ignore=tests/test_core/test_auth.py" + "--ignore=tests/test_core/test_decorator_calls.py" + "--ignore=tests/test_core/test_nested.py" + "--ignore=tests/test_core/test_server.py" + "--ignore=tests/test_datapipeline/test_datapipeline.py" + "--ignore=tests/test_datapipeline/test_server.py" + "--ignore=tests/test_datasync/test_datasync.py" + "--ignore=tests/test_dynamodb/test_dynamodb.py" + "--ignore=tests/test_dynamodb/test_dynamodb_table_with_range_key.py" + "--ignore=tests/test_dynamodb/test_dynamodb_table_without_range_key.py" + "--ignore=tests/test_dynamodb/test_server.py" + "--ignore=tests/test_dynamodb2/test_dynamodb.py" + "--ignore=tests/test_dynamodb2/test_dynamodb_table_with_range_key.py" + "--ignore=tests/test_dynamodb2/test_dynamodb_table_without_range_key.py" + "--ignore=tests/test_dynamodb2/test_server.py" + "--ignore=tests/test_ec2/test_amazon_dev_pay.py" + "--ignore=tests/test_ec2/test_amis.py" + "--ignore=tests/test_ec2/test_availability_zones_and_regions.py" + "--ignore=tests/test_ec2/test_customer_gateways.py" + "--ignore=tests/test_ec2/test_dhcp_options.py" + "--ignore=tests/test_ec2/test_elastic_block_store.py" + "--ignore=tests/test_ec2/test_elastic_ip_addresses.py" + "--ignore=tests/test_ec2/test_elastic_network_interfaces.py" + "--ignore=tests/test_ec2/test_general.py" + "--ignore=tests/test_ec2/test_instances.py" + "--ignore=tests/test_ec2/test_internet_gateways.py" + "--ignore=tests/test_ec2/test_ip_addresses.py" + "--ignore=tests/test_ec2/test_key_pairs.py" + "--ignore=tests/test_ec2/test_monitoring.py" + "--ignore=tests/test_ec2/test_network_acls.py" + "--ignore=tests/test_ec2/test_placement_groups.py" + "--ignore=tests/test_ec2/test_regions.py" + "--ignore=tests/test_ec2/test_reserved_instances.py" + "--ignore=tests/test_ec2/test_route_tables.py" + "--ignore=tests/test_ec2/test_security_groups.py" + "--ignore=tests/test_ec2/test_spot_instances.py" + "--ignore=tests/test_ec2/test_subnets.py" + "--ignore=tests/test_ec2/test_tags.py" + "--ignore=tests/test_ec2/test_virtual_private_gateways.py" + "--ignore=tests/test_ec2/test_vm_export.py" + "--ignore=tests/test_ec2/test_vm_import.py" + "--ignore=tests/test_ec2/test_vpc_peering.py" + "--ignore=tests/test_ec2/test_vpcs.py" + "--ignore=tests/test_ec2/test_vpn_connections.py" + "--ignore=tests/test_ec2/test_vpn_connections.py" + "--ignore=tests/test_ec2/test_windows.py" + "--ignore=tests/test_ecs/test_ecs_boto3.py" + "--ignore=tests/test_elb/test_elb.py" + "--ignore=tests/test_elb/test_server.py" + "--ignore=tests/test_elbv2/test_elbv2.py" + "--ignore=tests/test_elbv2/test_server.py" + "--ignore=tests/test_emr/test_emr.py" + "--ignore=tests/test_emr/test_server.py" + "--ignore=tests/test_glacier/test_glacier_archives.py" + "--ignore=tests/test_glacier/test_glacier_jobs.py" + "--ignore=tests/test_glacier/test_glacier_vaults.py" + "--ignore=tests/test_iam/test_iam.py" + "--ignore=tests/test_iam/test_iam_cloudformation.py" + "--ignore=tests/test_iam/test_iam_groups.py" + "--ignore=tests/test_iam/test_server.py" + "--ignore=tests/test_iot/test_server.py" + "--ignore=tests/test_iotdata/test_server.py" + "--ignore=tests/test_kinesis/test_kinesis.py" + "--ignore=tests/test_kinesis/test_kinesis_cloudformation.py" + "--ignore=tests/test_kinesis/test_server.py" + "--ignore=tests/test_kinesisvideo/test_server.py" + "--ignore=tests/test_kinesisvideoarchivedmedia/test_server.py" + "--ignore=tests/test_kms/test_kms.py" + "--ignore=tests/test_kms/test_server.py" + "--ignore=tests/test_kms/test_utils.py" + "--ignore=tests/test_logs/test_logs.py" + "--ignore=tests/test_polly/test_server.py" + "--ignore=tests/test_rds/test_rds.py" + "--ignore=tests/test_rds/test_server.py" + "--ignore=tests/test_rds2/test_server.py" + "--ignore=tests/test_redshift/test_redshift.py" + "--ignore=tests/test_redshift/test_server.py" + "--ignore=tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py" + "--ignore=tests/test_route53/test_route53.py" + "--ignore=tests/test_s3/test_s3.py" + "--ignore=tests/test_s3/test_s3_cloudformation.py" + "--ignore=tests/test_s3/test_s3_lifecycle.py" + "--ignore=tests/test_s3/test_s3_storageclass.py" + "--ignore=tests/test_s3/test_s3_utils.py" + "--ignore=tests/test_s3bucket_path/test_s3bucket_path.py" + "--ignore=tests/test_s3bucket_path/test_s3bucket_path_combo.py" + "--ignore=tests/test_secretsmanager/test_server.py" + "--ignore=tests/test_ses/test_server.py" + "--ignore=tests/test_ses/test_ses.py" + "--ignore=tests/test_ses/test_ses_boto3.py" + "--ignore=tests/test_ses/test_ses_sns_boto3.py" + "--ignore=tests/test_sns/test_application.py" + "--ignore=tests/test_sns/test_application_boto3.py" + "--ignore=tests/test_sns/test_publishing.py" + "--ignore=tests/test_sns/test_publishing_boto3.py" + "--ignore=tests/test_sns/test_server.py" + "--ignore=tests/test_sns/test_subscriptions.py" + "--ignore=tests/test_sns/test_subscriptions_boto3.py" + "--ignore=tests/test_sns/test_topics.py" + "--ignore=tests/test_sns/test_topics_boto3.py" + "--ignore=tests/test_sqs/test_server.py" + "--ignore=tests/test_sqs/test_sqs.py" + "--ignore=tests/test_ssm/test_ssm_boto3.py" + "--ignore=tests/test_ssm/test_ssm_docs.py" + "--ignore=tests/test_sts/test_server.py" + "--ignore=tests/test_sts/test_sts.py" + "--ignore=tests/test_swf/models/test_activity_task.py" + "--ignore=tests/test_swf/models/test_decision_task.py" + "--ignore=tests/test_swf/models/test_timeout.py" + "--ignore=tests/test_swf/models/test_workflow_execution.py" + "--ignore=tests/test_swf/responses/test_activity_tasks.py" + "--ignore=tests/test_swf/responses/test_activity_types.py" + "--ignore=tests/test_swf/responses/test_decision_tasks.py" + "--ignore=tests/test_swf/responses/test_domains.py" + "--ignore=tests/test_swf/responses/test_timeouts.py" + "--ignore=tests/test_swf/responses/test_workflow_executions.py" + "--ignore=tests/test_swf/responses/test_workflow_types.py" + ]; - # Disabling because of 20 failing tests due to https://github.com/spulec/moto/issues/2728 - # We should enable these as soon as possible again though. Note the issue - # is unrelated to the docutils 0.16 bump. - doCheck = false; + disabledTests = [ + # these tests rely on the network + "test_server" + "test_managedblockchain_nodes" + "test_swf" + "test_simple_instance" + "test_passthrough_requests" + "test_s3_server_get" + "test_s3_server_bucket_create" + "test_s3_server_post_to_bucket" + "test_s3_server_put_ipv6" + "test_s3_server_put_ipv4" + "test_http_proxying_integration" + "test_submit_job_by_name" + "test_submit_job" + "test_list_jobs" + "test_terminate_job" + "test_idtoken_contains_kid_header" + "test_latest_meta_data" + "test_meta_data_iam" + "test_meta_data_security_credentials" + "test_meta_data_default_role" + "test_reset_api" + "test_data_api" + "test_requests_to_amazon_subdomains_dont_work" + "test_get_records_seq" + "test_stream_with_range_key" + "test_create_notebook_instance_bad_volume_size" + ]; meta = with lib; { description = "Allows your tests to easily mock out AWS Services"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msldap/default.nix index d068380a7a2..2a57f2babee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msldap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.25"; + version = "0.3.26"; src = fetchPypi { inherit pname version; - sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea"; + sha256 = "sha256-cW1757NImdi5tz98qrspzEdI5Q/26ap2jVxyah44qR8="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mullvad-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mullvad-api/default.nix new file mode 100644 index 00000000000..22e6647b57d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix index 0638ce5d1ee..35d1c70a23a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.16.1"; + version = "1.16.4"; src = fetchPypi { inherit pname version; - sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6"; + sha256 = "44b31623fd71fedd891c3f66be3bc1caa6f1caf88076a75236ab74f8807f6ae5"; }; # Remove overly restrictive version constraints diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/myjwt/default.nix new file mode 100644 index 00000000000..d80e66e07bf --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch new file mode 100644 index 00000000000..abae9d0e2ec --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 4bea992f6ba..dbbcb30ffce 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index 299cfc87024..66e1edd9390 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, callPackage, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , hypothesis , setuptools_scm , six @@ -49,7 +49,7 @@ buildPythonPackage rec { "test_filter_cmd_invalid_filter" "test_inline_merge" "test_interrogate_filter_no_repo" - "test_merge_input_strategy_inline_source_conflict" + "test_merge" ]; nativeBuildInputs = [ setuptools_scm ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index 3bd119179a4..a3143780e1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.8"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8"; + sha256 = "sha256-HSI+ZKGL+nzfLbLpuoqBgxL8KgcB0ukQtY32aAk4WlY="; }; LC_ALL="en_US.utf8"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index b7ddf35caec..86c5afd8c4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; + pythonImportsCheck = [ "nbsmoke" ]; meta = with lib; { description = "Basic notebook checks and linting"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 979b357607e..2622b815f1e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -7,7 +7,6 @@ , nbformat , sphinx , traitlets -, python , isPy3k }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix index 175b04d3107..715a1989b45 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8 +{ lib, buildPythonPackage, fetchPypi, watchdog, flake8 , pytest, pytestrunner, coverage, sphinx, twine }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix index bab3aa590ec..926dd3698c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -12,7 +12,6 @@ , tornado , ipython_genutils , traitlets -, jupyter , jupyter_core , jupyter_client , nbformat diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix index aa08ead2d97..48ed52499c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -1,34 +1,31 @@ { lib , stdenv +, pythonAtLeast , pythonOlder , fetchPypi , python , buildPythonPackage -, isPy27 -, isPy3k , numpy , llvmlite -, funcsigs -, singledispatch +, setuptools , libcxx }: 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"; - propagatedBuildInputs = [numpy llvmlite] - ++ lib.optionals isPy27 [ funcsigs singledispatch]; - + propagatedBuildInputs = [ numpy llvmlite setuptools ]; + pythonImportsCheck = [ "numba" ]; # Copy test script into $out and run the test suite. checkPhase = '' ${python.interpreter} -m numba.runtests diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index cb43084556e..2176b5f9497 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.13.0"; + version = "2.15.1"; src = fetchPypi { inherit pname version; - sha256 = "648386e6cdad3218adc4e3e6a349bee41c55a61980dace616c05d6a31e8c652d"; + sha256 = "f57fdb3c0e420f729dbe54ec3add9bdbbd19b62183aa8f4576e00e5834b2ef52"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 2394e32403f..234c4edd1ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -1,41 +1,42 @@ { lib , buildPythonPackage +, pythonOlder +, fetchPypi +, google_api_python_client +, google-auth-oauthlib , jupyterhub -, globus-sdk , mwoauth -, codecov -, flake8 , pyjwt -, pytest -, pytestcov -, pytest-tornado +, pytest-asyncio +, pytestCheckHook , requests-mock -, pythonOlder -, fetchPypi }: buildPythonPackage rec { pname = "oauthenticator"; - version = "0.12.3"; + version = "0.13.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f86e18e954ae37796ee149fe01ab0be0707d9e0415d62336ba3447e7b4383461"; + sha256 = "5202adcd96ddbbccbc267da02f2d14e977300c81291aaa77be4fd9f2e27cfa37"; }; - checkPhase = '' - py.test oauthenticator/tests - ''; - - # No tests in archive - doCheck = false; - - checkInputs = [ globus-sdk mwoauth codecov flake8 pytest - pytestcov pytest-tornado requests-mock pyjwt ]; - - propagatedBuildInputs = [ jupyterhub ]; - - disabled = pythonOlder "3.4"; + propagatedBuildInputs = [ + jupyterhub + ]; + + pytestFlagsArray = [ "oauthenticator/tests" ]; + + checkInputs = [ + google_api_python_client + google-auth-oauthlib + mwoauth + pyjwt + pytest-asyncio + pytestCheckHook + requests-mock + ]; meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix index 278d7c1df04..95e67c58d55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , buildPythonPackage , fetchPypi , pythonOlder diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix index c35405f417b..cae450a9af3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "openrouteservice"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "GIScience"; repo = "${pname}-py"; rev = "v${version}"; - sha256 = "ySXzOQI9NcF1W/otbL7i3AY628/74ZkJjDMQ9ywVEPc="; + sha256 = "1d5qbygb81fhpwfdm1a118r3xv45xz9n9avfkgxkvw1n8y6ywz2q"; }; checkInputs = [ pytestCheckHook responses ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix new file mode 100644 index 00000000000..14d0909e658 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index e1c22ddbfa3..3cd420c7491 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: +, pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}: buildPythonPackage rec { pname = "osmnx"; @@ -14,14 +14,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; - checkInputs = [ coverage pytest coveralls ]; - #Fails when using sandboxing as it requires internet connection, works fine without it + # requires network doCheck = false; - - #Check phase for the record - #checkPhase = '' - # coverage run --source osmnx -m pytest --verbose - #''; + pythonImportsCheck = [ "osmnx" ]; meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix index ccb15aec01b..3cb0bc49e72 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix @@ -13,15 +13,17 @@ buildPythonPackage rec { pname = "osmpythontools"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mocnik-science"; repo = "osm-python-tools"; rev = "v${version}"; - sha256 = "1qpj03fgn8rmrg9a9vk7bw32k9hdy15g5p2q3a6q52ykpb78jdz5"; + sha256 = "0r72z7f7kmvvbd9zvgci8rwmfj85xj34mb3x5dj3jcv5ij5j72yh"; }; + # Upstream setup.py has test dependencies in `install_requires` argument. + # Remove them, as we don't run the tests. patches = [ ./remove-test-only-dependencies.patch ]; propagatedBuildInputs = [ @@ -55,7 +57,7 @@ buildPythonPackage rec { Nominatim, and the OpenStreetMap editing API. ''; homepage = "https://github.com/mocnik-science/osm-python-tools"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ das-g ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix deleted file mode 100644 index a33e5d19b44..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, cmake -, ffmpeg -, netcdf -, qscintilla -, zlib -, boost -, git -, fftw -, hdf5 -, libssh -, qt5 -, python -}: - -stdenv.mkDerivation rec { - version = "3.3.5"; - pname = "ovito"; - - src = fetchFromGitLab { - owner = "stuko"; - repo = pname; - rev = "v${version}"; - sha256 = "2tptLK0RU0afSFFE7uzL8bZ5j+nyRyh97ujJAHFh0wQ="; - }; - - nativeBuildInputs = [ cmake git ]; - buildInputs = [ ffmpeg netcdf qscintilla zlib boost zlib fftw hdf5 libssh qt5.qtbase qt5.qtsvg ]; - - propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ]; - - meta = with lib; { - description = "Scientific visualization and analysis software for atomistic simulation data"; - homepage = "https://www.ovito.org"; - license = with licenses; [ gpl3Only mit ]; - maintainers = with maintainers; [ costrouc ]; - # ensures not built on hydra - # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048 - hydraPlatforms = [ ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix index ea0ba44e99d..d4aa1551bed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , isPy27 , pandas , lxml diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix index ab70a7782ad..832297c979d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -20,7 +20,6 @@ # Test Inputs , glibcLocales , hypothesis -, moto , pytestCheckHook # Darwin inputs , runtimeShell @@ -35,6 +34,8 @@ buildPythonPackage rec { inherit pname version; sha256 = "06vhk75hmzgv1sfbjzgnsw9x10h7y6bd6s6z7d6lfnn7wcgc83zi"; }; + # See https://github.com/scipy/scipy/issues/13585 and https://github.com/pandas-dev/pandas/pull/40020 + patches = [ ./fix-tests.patch ]; nativeBuildInputs = [ cython ]; buildInputs = lib.optional stdenv.isDarwin libcxx; @@ -54,22 +55,12 @@ buildPythonPackage rec { xlwt ]; - checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ]; + checkInputs = [ pytestCheckHook glibcLocales hypothesis ]; # doesn't work with -Werror,-Wunused-command-line-argument # https://github.com/NixOS/nixpkgs/issues/39687 hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString stdenv.isDarwin '' - cpp_sdk="${libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['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)) [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/fix-tests.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/fix-tests.patch new file mode 100644 index 00000000000..8051cfec39a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/fix-tests.patch @@ -0,0 +1,12 @@ +diff --color -ur a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py +--- a/pandas/tests/arrays/sparse/test_array.py 2020-12-07 12:42:08.000000000 +0100 ++++ b/pandas/tests/arrays/sparse/test_array.py 2021-02-27 21:48:16.483903149 +0100 +@@ -1188,7 +1188,7 @@ + row = [0, 3, 1, 0] + col = [0, 3, 1, 2] + data = [4, 5, 7, 9] +- sp_array = scipy.sparse.coo_matrix((data, (row, col))) ++ sp_array = scipy.sparse.coo_matrix((data, (row, col)), dtype="int") + result = pd.Series.sparse.from_coo(sp_array) + + index = pd.MultiIndex.from_arrays([[0, 0, 1, 3], [0, 2, 1, 3]]) diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix index 56536de8446..0311e783d39 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.2.2"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1c452b1c5a9ab52b94c99d8b7705ae7173f6aa88a3d28a5d30cffba48a46f5b6"; + sha256 = "sha256-ptwZXypS9b7Y1CkszqOa8PMzgyS+r9VikPlhbJUDNiM="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix index b05a525d91a..3e7c6ae0011 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pecan/default.nix index a66c4077c3c..50b62503ff8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -16,7 +16,6 @@ , Kajiki , mock , sqlalchemy -, uwsgi , virtualenv }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 9f9bb1702a9..ad51a80674b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,22 +8,25 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.16.6"; - + version = "1.17.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91"; + sha256 = "sha256-FBmMWv6yiRBuQO5uXkwFKcU2mTn2yliKAos3GnX+IN0="; }; 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix index 2d653179431..80bc0737cac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix @@ -2,14 +2,11 @@ , substituteAll , buildPythonApplication , fetchPypi -, python3Packages -, pkgs , joblib , segments , attrs , espeak-ng , pytestCheckHook -, pytestrunner , pytestcov }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix new file mode 100644 index 00000000000..3aed634dfb1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 +, tk, libX11, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: + +import ../pillow/generic.nix (rec { + pname = "Pillow-SIMD"; + version = "7.0.0.post3"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "uploadcare"; + repo = "pillow-simd"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + }; + + meta = with lib; { + homepage = "https://python-pillow.github.io/pillow-perf/"; + description = "The friendly PIL fork - SIMD version"; + longDescription = '' + Pillow-SIMD is "following" Pillow. Pillow-SIMD versions are 100% compatible drop-in replacements for Pillow of the same version. + + SIMD stands for "single instruction, multiple data" and its essence is in performing the same operation on multiple data points simultaneously by using multiple processing elements. Common CPU SIMD instruction sets are MMX, SSE-SSE4, AVX, AVX2, AVX512, NEON. + + Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} // args ) diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/6.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/6.nix index 0e3fabf1fbc..51833edfd0b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/6.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/6.nix @@ -1,75 +1,22 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy -, olefile -, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant -, pytest, pytestrunner, pyroma, numpy -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: -buildPythonPackage rec { +import ./generic.nix (rec { pname = "Pillow"; version = "6.2.2"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; }; - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - checkPhase = '' - runHook preCheck - python -m pytest -v -x -W always${lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"} - runHook postCheck - ''; - - propagatedBuildInputs = [ olefile ]; - - checkInputs = [ pytest pytestrunner pyroma numpy ]; - - buildInputs = [ - freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="-L${libwebp}/lib" - export CFLAGS="-I${libwebp}/include" - '' - # Remove impurities - + lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - meta = with lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library @@ -77,6 +24,6 @@ buildPythonPackage rec { processing and graphics capabilities. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; }; -} +} // args ) diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 4084df19404..051e6ab8c6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -1,12 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy -, olefile -, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant -, pyroma, numpy, pytestCheckHook -, isPy3k -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: -buildPythonPackage rec { +import ./generic.nix (rec { pname = "Pillow"; version = "8.0.1"; @@ -17,56 +14,6 @@ buildPythonPackage rec { sha256 = "11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e"; }; - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; - - propagatedBuildInputs = [ olefile ]; - - checkInputs = [ pytestCheckHook pyroma numpy ]; - - buildInputs = [ - freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="-L${libwebp}/lib" - export CFLAGS="-I${libwebp}/include" - '' - # Remove impurities - + lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - meta = with lib; { homepage = "https://python-pillow.org/"; description = "The friendly PIL fork (Python Imaging Library)"; @@ -77,6 +24,6 @@ buildPythonPackage rec { processing and graphics capabilities. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; }; -} +} // args ) diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/generic.nix new file mode 100644 index 00000000000..dbf27febeb9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/generic.nix @@ -0,0 +1,73 @@ +{ pname +, version +, disabled +, src +, meta +, ... +}@args: + +with args; + +buildPythonPackage rec { + inherit pname version src meta; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = lib.optionals stdenv.isDarwin [ + "test_grab" + "test_grabclipboard" + "test_save" + + # pillow-simd + "test_roundtrip" + "test_basic" + ]; + + propagatedBuildInputs = [ olefile ]; + + checkInputs = [ pytestCheckHook pyroma numpy ]; + + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] + ++ lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="$LDFLAGS -L${libwebp}/lib" + export CFLAGS="$CFLAGS -I${libwebp}/include" + '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + '' + lib.optionalString stdenv.isDarwin '' + # Remove impurities + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pims/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pims/default.nix index bfe4e2b9ea0..2f9fbdccd55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { # not everything packaged with pypi release doCheck = false; + pythonImportsCheck = [ "pims" ]; meta = with lib; { homepage = "https://github.com/soft-matter/pims"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 312c87ae544..7645fdaec8a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; }; + dontUseCmakeConfigure = true; + nativeBuildInputs = with pkgs; [ swig qmake cmake ]; @@ -29,8 +31,7 @@ buildPythonPackage rec { ]; dontUseQmakeConfigure = true; - dontUseCmakeConfigure = true; - + dontWrapQtApps =true; doCheck = false; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix new file mode 100644 index 00000000000..1dca45eca76 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix index e94a234dc1a..345f092a80f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix @@ -34,6 +34,8 @@ buildPythonPackage rec { # no tests, just bindings for `poppler_qt5` doCheck = false; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/wbsoft/python-poppler-qt5"; license = licenses.gpl2; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 1ad17d0459d..63f5feada59 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, python , buildPythonPackage , socat , psutil diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/praw/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/praw/default.nix index 5ca1d3d83c9..5047c1e88b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index 2b6eff885f9..1e38f401a43 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index e7bbdd6ccdf..60c6f333275 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,5 @@ { buildPackages , lib -, stdenv , fetchpatch , python , buildPythonPackage @@ -20,12 +19,6 @@ buildPythonPackage { inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - NIX_CFLAGS_COMPILE = toString ( - # work around python distutils compiling C++ with $CC - lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" - ++ lib.optional (lib.versionOlder protobuf.version "2.7.0") "-std=c++98" - ); - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf3-to-dict/default.nix new file mode 100644 index 00000000000..ffc21c1428f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf3-to-dict/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, protobuf, six }: + +buildPythonPackage rec { + pname = "protobuf3-to-dict"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy"; + }; + + doCheck = false; + + pythonImportsCheck = [ "protobuf_to_dict" ]; + + propagatedBuildInputs = [ protobuf six ]; + + meta = with lib; { + description = "A teeny Python library for creating Python dicts from protocol buffers and the reverse"; + homepage = "https://github.com/kaporzhu/protobuf-to-dict"; + license = licenses.publicDomain; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix new file mode 100644 index 00000000000..cdbec22bc1f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, paramiko +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "proxmoxer"; + version = "1.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "09fz8zbxjaly9zqksvq6cqp66plbsyjsmndy4g25ryys45siz1ny"; + }; + + propagatedBuildInputs = [ + paramiko + requests + ]; + + checkInputs = [ + mock + nose + pytestCheckHook + ]; + + # Tests require openssh_wrapper which is outdated and not available + pytestFlagsArray = [ "tests/paramiko_tests.py" ]; + pythonImportsCheck = [ "proxmoxer" ]; + + meta = with lib; { + description = "Python wrapper for Proxmox API v2"; + homepage = "https://github.com/proxmoxer/proxmoxer"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix index 68d15133670..cfed6dd74cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix @@ -2,12 +2,12 @@ , fonttools , lxml, fs # for fonttools extras , setuptools_scm -, pytestCheckHook, pytest_5, pytestcov, pytest_xdist +, pytestCheckHook, pytestcov, pytest_xdist }: buildPythonPackage rec { pname = "psautohint"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "adobe-type-tools"; repo = pname; rev = "v${version}"; - sha256 = "0gsgfr190xy2rnjf1gf7688xrh13ihgq10s19s4rv5hp6pmg9iaa"; + sha256 = "1y7mqc2myn1gfzg4h018f8xza0q535shnqg6snnaqynz20i8jcfh"; fetchSubmodules = true; # data dir for tests }; @@ -30,14 +30,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools lxml fs ]; checkInputs = [ - # Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6 - # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 - # Override might be able to be removed in future, check package dependency pins (coverage.yml) - (pytestCheckHook.override{ pytest = pytest_5; }) + pytestCheckHook pytestcov pytest_xdist ]; disabledTests = [ + # Test that fails on pytest >= v6 + # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 + "test_hashmap_old_version" # Slow tests, reduces test time from ~5 mins to ~30s "test_mmufo" "test_flex_ufo" diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index e4bab25fd9c..8c9c0ea004c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , pycryptodomex , pytestCheckHook -, pyyaml , pytest-vcr , pytest-asyncio , requests diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-cid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-cid/default.nix new file mode 100644 index 00000000000..86c2e80601f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-cid/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, base58 +, py-multibase +, py-multicodec +, morphys +, py-multihash +, hypothesis +}: + +buildPythonPackage rec { + pname = "py-cid"; + version = "0.3.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "ipld"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aN7ee25ghKKa90+FoMDCdGauToePc5AzDLV3tONvh4U="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "base58>=1.0.2,<2.0" "base58>=1.0.2" \ + --replace "py-multihash>=0.2.0,<1.0.0" "py-multihash>=0.2.0" \ + --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + base58 + py-multibase + py-multicodec + morphys + py-multihash + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ "cid" ]; + + meta = with lib; { + description = "Self-describing content-addressed identifiers for distributed systems implementation in Python"; + homepage = "https://github.com/ipld/py-cid"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix new file mode 100644 index 00000000000..24fa6975cc5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, varint +, base58 +, netaddr +, idna +, py-cid +, py-multicodec +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-multiaddr"; + version = "0.0.9"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "multiformats"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + varint + base58 + netaddr + idna + py-cid + py-multicodec + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "multiaddr" ]; + + meta = with lib; { + description = "Composable and future-proof network addresses"; + homepage = "https://github.com/multiformats/py-multiaddr"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix new file mode 100644 index 00000000000..59a9339c264 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyalmond"; + version = "0.0.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stanford-oval"; + repo = pname; + rev = "v${version}"; + sha256 = "0d1w83lr7k2wxcs846iz4mjyqn1ximnw6155kgl515v10fqyrhgk"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Tests require a running Almond instance + doCheck = false; + pythonImportsCheck = [ "pyalmond" ]; + + meta = with lib; { + description = "Python client for the Almond API"; + homepage = "https://github.com/stanford-oval/pyalmond"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index b9c84c484df..a38d5df50dd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 9cca6cf57ef..034bdb6363a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, isPy27 , click , num2words , numpy @@ -11,8 +10,7 @@ , patsy , bids-validator , sqlalchemy -, pytest -, pathlib +, pytestCheckHook }: buildPythonPackage rec { @@ -36,11 +34,8 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bids" ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycec/default.nix new file mode 100644 index 00000000000..c65ea3a695f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychannels/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychannels/default.nix new file mode 100644 index 00000000000..0c5e290334d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychannels/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pychannels"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "fancybits"; + repo = pname; + rev = version; + sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "pychannels" ]; + + meta = with lib; { + description = "Python library for interacting with the Channels app"; + homepage = "https://github.com/fancybits/pychannels"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 9eefaa5f364..742ea3d08c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0dlxgh57j25cvk2pqr2dj4lv6yn0pix2rcl2kzqsg2405rdjks91"; + sha256 = "sha256-3wKV9lPO51LeOM+O8J8TrZeCxTkk37qhkcpivV4dzhQ="; }; disabled = !isPy3k; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix index d58821569e6..fae49e7be0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix new file mode 100644 index 00000000000..209ef3dbc23 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromBitbucket +, freezegun +, netifaces +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, urllib3 +}: + +buildPythonPackage rec { + pname = "pydaikin"; + version = "2.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromBitbucket { + owner = "mustang51"; + repo = pname; + rev = "v${version}"; + sha256 = "1624adp4lqd1n9flnf0wqrcibml2nd19ga3fmxzjg4x5z6767bs3"; + }; + + propagatedBuildInputs = [ + aiohttp + netifaces + urllib3 + ]; + + checkInputs = [ + freezegun + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydaikin" ]; + + meta = with lib; { + description = "Python Daikin HVAC appliances interface"; + homepage = "https://bitbucket.org/mustang51/pydaikin"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 9bf4bede1fa..d3c6e37bbe4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyeight/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyeight/default.nix new file mode 100644 index 00000000000..b3a2de5ed40 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyeight/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, isPy3k +}: + +buildPythonPackage rec { + pname = "pyeight"; + version = "0.1.5"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "mezz64"; + repo = "pyEight"; + rev = version; + sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyeight" ]; + + meta = with lib; { + description = "Python library to interface with the Eight Sleep API"; + homepage = "https://github.com/mezz64/pyEight"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 64ec58487c4..8ba9b3fc46f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,13 +1,19 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "4.3.2"; + version = "4.3.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070"; + sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs="; }; postPatch = '' @@ -17,28 +23,22 @@ buildPythonPackage rec { substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \ --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows" - substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \ - --replace "test_copy_real_file" "notest_copy_real_file" '' + (lib.optionalString stdenv.isDarwin '' # this test fails on darwin due to case-insensitive file system substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - checkInputs = [ pytest glibcLocales ]; - - checkPhase = '' - export LC_ALL=en_US.UTF-8 - ${python.interpreter} -m pyfakefs.tests.all_tests - ${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages - ${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py - ''; + checkInputs = [ pytestCheckHook ]; + # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) + disabledTests = [ "test_open_existing_pipe" ]; + pythonImportsCheck = [ "pyfakefs" ]; meta = with lib; { description = "Fake file system that mocks the Python file system modules"; - license = licenses.asl20; - homepage = "http://pyfakefs.org/"; - changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + homepage = "http://pyfakefs.org/"; + changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + license = licenses.asl20; maintainers = with maintainers; [ gebner ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix index 155254a6af3..96e807f8eba 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix @@ -10,20 +10,18 @@ buildPythonPackage rec { sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0"; }; + preConfigure = '' + export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib" + export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include" + ''; + buildInputs = [ fftw fftwFloat fftwLongDouble]; propagatedBuildInputs = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - - preConfigure = '' - export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib" - export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include" - ''; - #+ optionalString isDarwin '' - # export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib" - #''; + pythonImportsCheck = [ "pyfftw" ]; meta = with lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflume/default.nix new file mode 100644 index 00000000000..a1d36670a39 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyjwt +, ratelimit +, pytz +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "pyflume"; + version = "0.6.2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ChrisMandich"; + repo = "PyFlume"; + rev = "v${version}"; + sha256 = "0i181c8722j831bjlcjwv5ccy20hl8zzlv7bfp8w0976gdmv4iz8"; + }; + + propagatedBuildInputs = [ + pyjwt + ratelimit + pytz + requests + ]; + + checkInputs = [ + requests-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyflume" ]; + + meta = with lib; { + description = "Python module to work with Flume sensors"; + homepage = "https://github.com/ChrisMandich/PyFlume"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix new file mode 100644 index 00000000000..9b77cc61de6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix @@ -0,0 +1,56 @@ +{ lib +, aiohttp +, aresponses +, aiocache +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, msgpack +, ujson +}: + +buildPythonPackage rec { + pname = "pyflunearyou"; + version = "2.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + aiocache + msgpack + ujson + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytest-aiohttp + pytestCheckHook + ]; + + # Ignore the examples directory as the files are prefixed with test_. + # disabledTestFiles doesn't seem to work here + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyflunearyou" ]; + + meta = with lib; { + description = "Python library for retrieving UV-related information from Flu Near You"; + homepage = "https://github.com/bachya/pyflunearyou"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index e9b66a95771..bac70be9987 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch deleted file mode 100644 index e4ff925009d..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/path.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygraphviz/path.patch new file mode 100644 index 00000000000..a895eae7756 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 8596883326b..cd8c566c465 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix new file mode 100644 index 00000000000..9b3665649a1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix @@ -0,0 +1,29 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, lxml +}: + +buildPythonPackage rec { + pname = "pykmtronic"; + version = "0.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p0i7g4k8ggmzargdi3ch55id04j5qjlhv8hap2162gc77b16d59"; + }; + + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 102619b2b31..19ffb6419d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.6.0"; + version = "2.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210"; + sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k="; }; nativeBuildInputs = [ pytestrunner installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix index b9cf9738ed4..eaf069c8ccb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytestCheckHook, mock, isPy3k, pytestcov, coverage +, pytestCheckHook, mock, pytestcov, coverage , fetchpatch }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylutron/default.nix index 90a45640812..b9ed3cc20e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylutron/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix index c80472a6730..72f362f85c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -3,14 +3,14 @@ , buildPythonPackage , pymatgen , pytestrunner -, pytest +, pytestCheckHook , isPy3k }: buildPythonPackage rec { pname = "pymatgen-lammps"; version = "0.4.5"; - disabled = (!isPy3k); + disabled = !isPy3k; src = fetchurl { url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; @@ -18,13 +18,17 @@ buildPythonPackage rec { }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; + pythonImportsCheck = [ "pmg_lammps" ]; + meta = { description = "A LAMMPS wrapper using pymatgen"; homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; + # not compatible with recent versions of pymatgen + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index bae7a561323..448b4c3c338 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { # No tests in pypi tarball. doCheck = false; + pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { description = "A robust materials analysis code that defines core object representations for structures and molecules"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymazda/default.nix new file mode 100644 index 00000000000..145b405922d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix new file mode 100644 index 00000000000..e977cb23d75 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymfy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymfy/default.nix new file mode 100644 index 00000000000..32483eea7b9 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymitv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymitv/default.nix new file mode 100644 index 00000000000..ffaabb04a29 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymitv/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pymitv"; + version = "1.4.3"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jbs1zhqpnsyad3pd8cqy1byv8m5bq17ydc6crmrfkjbp6xvvg3x"; + }; + + propagatedBuildInputs = [ requests ]; + + # Projec thas no tests + doCheck = false; + pythonImportsCheck = [ "pymitv" ]; + + meta = with lib; { + description = "Python client the Mi Tv 3"; + homepage = "https://github.com/simse/pymitv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix new file mode 100644 index 00000000000..a475d074efd --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymsteams/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pymsteams"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "rveachkc"; + repo = pname; + rev = version; + sha256 = "19gnsjzf3kwcwp2rwa30zpqjqgxb9plgcsx7fqbmxnrxgw99fyqx"; + }; + + propagatedBuildInputs = [ requests ]; + + # Tests require network access + doCheck = false; + pythonImportsCheck = [ "pymsteams" ]; + + meta = with lib; { + description = "Python module to interact with Microsoft Teams"; + homepage = "https://github.com/rveachkc/pymsteams"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymyq/default.nix index e93d0b602b4..71788db45c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymyq/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix new file mode 100644 index 00000000000..bbfeec3a36c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, click +, crcmod +, fetchFromGitHub +, getmac +, intelhex +, paho-mqtt +, pyserial +, pyserial-asyncio +, pytest-sugar +, pytest-timeout +, pytestCheckHook +, pythonOlder +, voluptuous +}: + +buildPythonPackage rec { + pname = "pymysensors"; + version = "0.20.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "theolind"; + repo = pname; + rev = version; + sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; + }; + + propagatedBuildInputs = [ + click + crcmod + getmac + intelhex + paho-mqtt + pyserial + pyserial-asyncio + voluptuous + ]; + + checkInputs = [ + pytest-sugar + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "mysensors" ]; + + meta = with lib; { + description = "Python API for talking to a MySensors gateway"; + homepage = "https://github.com/theolind/pymysensors"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix index de208c7a9db..bf9a9eecfb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix @@ -1,16 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { pname = "pynmea2"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b"; + sha256 = "0w9g5qh573276404f04b46684ydlakv30ds0x0r4kcl370ljmfsg"; }; - checkInputs = [ pytest ]; - checkPhase = "pytest"; + checkInputs = [ pytestCheckHook ]; meta = { homepage = "https://github.com/Knio/pynmea2"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynws/default.nix new file mode 100644 index 00000000000..abe4c93b818 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, freezegun +, metar +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pynws"; + version = "1.3.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "MatthewFlamm"; + repo = pname; + rev = "v${version}"; + sha256 = "13ipmx60kicwh8qxjazap4vk94x8i3r0lnkdsap7gffaizwgp49d"; + }; + + propagatedBuildInputs = [ + aiohttp + metar + ]; + + checkInputs = [ + freezegun + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pynws" ]; + + meta = with lib; { + description = "Python library to retrieve data from NWS/NOAA"; + homepage = "https://github.com/MatthewFlamm/pynws"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyowm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyowm/default.nix index 423d38ab25d..3cfb70e7b87 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyowm/default.nix +++ b/infra/libkookie/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 + ]; + + checkInputs = [ pytestCheckHook ]; - # This may actually break the package. - postPatch = '' - substituteInPlace setup.py \ - --replace "requests>=2.18.2,<2.19" "requests" - ''; + # Run only tests which don't require network access + pytestFlagsArray = [ "tests/unit" ]; - # No tests in archive - doCheck = false; + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypcap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypcap/default.nix index 08c90d82898..fbf6769ab4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypcap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypcap/default.nix @@ -1,34 +1,50 @@ -{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }: +{ lib +, buildPythonPackage +, dpkt +, fetchFromGitHub +, fetchpatch +, libpcap +, pytestCheckHook +}: buildPythonPackage rec { pname = "pypcap"; version = "1.2.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1w5i79gh7cswvznr8rhilcmzhnh2y5c4jwh2qrfnpx05zqigm1xd"; + + src = fetchFromGitHub { + owner = "pynetwork"; + repo = pname; + rev = "v${version}"; + sha256 = "1zscfk10jpqwxgc8d84y8bffiwr92qrg2b24afhjwiyr352l67cf"; }; patches = [ - # The default setup.py searchs for pcap.h in a static list of default - # folders. So we have to add the path to libpcap in the nix-store. - (writeText "libpcap-path.patch" - '' - --- a/setup.py - +++ b/setup.py - @@ -28,6 +28,7 @@ def recursive_search(path, target_files): - - def find_prefix_and_pcap_h(): - prefixes = chain.from_iterable(( - + '${libpcap}', - ('/usr', sys.prefix), - glob.glob('/opt/libpcap*'), - glob.glob('../libpcap*'), - '') + # Support for Python 3.9, https://github.com/pynetwork/pypcap/pull/102 + (fetchpatch { + name = "support-python-3.9.patch"; + url = "https://github.com/pynetwork/pypcap/pull/102/commits/e22f5d25f0d581d19ef337493434e72cd3a6ae71.patch"; + sha256 = "0n1syh1vcplgsf6njincpqphd2w030s3b2jyg86d7kbqv1w5wk0l"; + }) ]; + postPatch = '' + # Add the path to libpcap in the nix-store + substituteInPlace setup.py --replace "('/usr', sys.prefix)" "'${libpcap}'" + # Remove coverage from test run + sed -i "/--cov/d" setup.cfg + ''; + buildInputs = [ libpcap ]; - checkInputs = [ dpkt ]; + + checkInputs = [ + dpkt + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "pcap" ]; meta = with lib; { homepage = "https://github.com/pynetwork/pypcap"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyplaato/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyplaato/default.nix new file mode 100644 index 00000000000..d4e91a985ef --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index 22ac89cf6a9..4e2bf164a33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose +{ lib, buildPythonPackage, fetchPypi, six, chardet, nose , django, jinja2, tornado, pyramid, pyramid_mako, Mako }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 26bf5dc1c4b..6e4b4d37f28 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -57,6 +57,8 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; + dontWrapQtApps = true; + nativeBuildInputs = [ pkg-config qmake diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index 42019e5a002..367c258b5f7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -45,6 +45,8 @@ in buildPythonPackage rec { propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (!isPy3k) enum34; + dontWrapQtApps = true; + configurePhase = '' runHook preConfigure diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyquery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyquery/default.nix index 2bb2eb1c6fc..40139c79567 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyquery/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyquery/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage -, fetchPypi , cssselect +, fetchPypi , lxml -, webob +, pythonOlder }: buildPythonPackage rec { pname = "pyquery"; - version = "1.2.9"; + version = "1.4.3"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -16,15 +17,19 @@ buildPythonPackage rec { sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6"; }; - propagatedBuildInputs = [ cssselect lxml webob ]; + propagatedBuildInputs = [ + cssselect + lxml + ]; # circular dependency on webtest doCheck = false; + pythonImportsCheck = [ "pyquery" ]; meta = with lib; { + description = "A jquery-like library for Python"; homepage = "https://github.com/gawel/pyquery"; - description = "A jquery-like library for python"; + changelog = "https://github.com/gawel/pyquery/blob/${version}/CHANGES.rst"; license = licenses.bsd0; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 44ac5a9221a..a26eff37ef2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { # https://github.com/Pylons/pyramid/issues/1899 doCheck = !isPy35; + pythonImportsCheck = [ "pyramid" ]; + meta = with lib; { description = "The Pyramid Web Framework, a Pylons project"; homepage = "https://trypyramid.com/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix index 5c4e7c104bf..9a529214c2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ beaker pyramid ]; meta = with lib; { + description = "Beaker session factory backend for Pyramid"; + homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/"; + # idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt + # license = licenses.mpl20; maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index d3388fdff35..377317049dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -23,11 +23,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ]; + pythonImportsCheck = [ "pyramid_chameleon" ]; + meta = with lib; { description = "Chameleon template compiler for pyramid"; homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix index 55da77f4964..96570fce884 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid ]; + pythonImportsCheck = [ "pyramid_exclog" ]; + meta = with lib; { description = "A package which logs to a Python logger when an exception is raised by a Pyramid application"; homepage = "https://docs.pylonsproject.org/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix index f2f156e98b6..c2e17f8adde 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -21,10 +21,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ]; buildInputs = [ webtest ]; + pythonImportsCheck = [ "pyramid_hawkauth" ]; + meta = with lib; { homepage = "https://github.com/mozilla-services/pyramid_hawkauth"; description = "A Pyramid authentication plugin for HAWK"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix index 464d8d209bf..d1eaf49e6bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { buildInputs = [ webtest ]; propagatedBuildInputs = [ jinja2 pyramid ]; + pythonImportsCheck = [ "pyramid_jinja2" ]; + meta = with lib; { description = "Jinja2 template bindings for the Pyramid web framework"; homepage = "https://github.com/Pylons/pyramid_jinja2"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix index 2f8c5e1e075..47aa1deb5e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/pyramid_mako"; description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; + maintainers = with maintainers; []; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix index 545883a25c1..859d4c3b433 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; + maintainers = with maintainers; []; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix new file mode 100644 index 00000000000..b9df9d36d41 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyrisco"; + version = "0.3.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = pname; + rev = "v${version}"; + sha256 = "1im29h4rxnp98aqzgzjj5i8jv2h5zw9c5yx8xxzl4cmr3yila9zw"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyrisco" ]; + + meta = with lib; { + description = "Python interface to Risco alarm systems through Risco Cloud"; + homepage = "https://github.com/OnFreund/pyrisco"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix new file mode 100644 index 00000000000..84bf62ff6d3 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/001-rfc2217-only-negotiate-on-value-change.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/001-rfc2217-only-negotiate-on-value-change.patch new file mode 100644 index 00000000000..6bd40bd935d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/001-rfc2217-only-negotiate-on-value-change.patch @@ -0,0 +1,42 @@ +From c8b35f4b871d00e3020f525425517548bed9f6ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Sun, 9 Sep 2018 20:13:27 +0200 +Subject: [PATCH] serial/rfc2217: only subnegotiate on value change +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was suggested and is a direct copy of Uwe Kleine König's patch +from [1]. + +[1]: https://github.com/pyserial/pyserial/issues/376#issuecomment-418885211 +Signed-off-by: Rouven Czerwinski +--- + serial/rfc2217.py | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/serial/rfc2217.py b/serial/rfc2217.py +index d962c1e8..2148512d 100644 +--- a/serial/rfc2217.py ++++ b/serial/rfc2217.py +@@ -330,11 +330,15 @@ def set(self, value): + the client needs to know if the change is performed he has to check the + state of this object. + """ +- self.value = value +- self.state = REQUESTED +- self.connection.rfc2217_send_subnegotiation(self.option, self.value) +- if self.connection.logger: +- self.connection.logger.debug("SB Requesting {} -> {!r}".format(self.name, self.value)) ++ if value != self.value: ++ self.value = value ++ self.state = REQUESTED ++ self.connection.rfc2217_send_subnegotiation(self.option, self.value) ++ if self.connection.logger: ++ self.connection.logger.debug("SB Requesting {} -> {!r}".format(self.name, self.value)) ++ else: ++ if self.connection.logger: ++ self.connection.logger.debug("SB Requesting {} -> {!r} (skipped)".format(self.name, self.value)) + + def is_ready(self): + """\ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/002-rfc2217-timeout-setter-for-rfc2217.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/002-rfc2217-timeout-setter-for-rfc2217.patch new file mode 100644 index 00000000000..39410dee164 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/002-rfc2217-timeout-setter-for-rfc2217.patch @@ -0,0 +1,42 @@ +From a3698dc952fce0d07628133e987b7b43ed6e1157 Mon Sep 17 00:00:00 2001 +From: Rouven Czerwinski +Date: Sun, 9 Sep 2018 20:08:40 +0200 +Subject: [PATCH] serial/rfc2217: add timeout.setter for rfc2217 + +Add a new setter method for the timeout property which does not invoke +the port reconfiguration. +This is a direct copy of the SerialBase timeout property without the port +reconfiguration. + +Signed-off-by: Rouven Czerwinski +--- + serial/rfc2217.py | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/serial/rfc2217.py b/serial/rfc2217.py +index d962c1e8..12615cf3 100644 +--- a/serial/rfc2217.py ++++ b/serial/rfc2217.py +@@ -722,5 +722,22 @@ def cd(self): + raise portNotOpenError + return bool(self.get_modem_state() & MODEMSTATE_MASK_CD) + ++ @property ++ def timeout(self): ++ """Get the current timeout setting.""" ++ return self._timeout ++ ++ @timeout.setter ++ def timeout(self, timeout): ++ """Change timeout setting.""" ++ if timeout is not None: ++ try: ++ timeout + 1 # test if it's a number, will throw a TypeError if not... ++ except TypeError: ++ raise ValueError("Not a valid timeout: {!r}".format(timeout)) ++ if timeout < 0: ++ raise ValueError("Not a valid timeout: {!r}".format(timeout)) ++ self._timeout = timeout ++ + # - - - platform specific - - - + # None so far diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix index 239568f64b7..b45b031fb84 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw"; }; + patches = [ + ./001-rfc2217-only-negotiate-on-value-change.patch + ./002-rfc2217-timeout-setter-for-rfc2217.patch + ]; + checkPhase = "python -m unittest discover -s test"; doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix index 08fd8cbfa86..f880791eeec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; + dontWrapQtApps = true; + meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix index 2690422932f..fb6d2f6d229 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix +++ b/infra/libkookie/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"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix index 095a10c1047..20f1a572f1b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2-tools/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + dontWrapQtApps = true; + # The upstream build system consists of a `setup.py` whichs builds three # different python libraries and calls cmake as a subprocess. We call cmake # directly because that's easier to get working. However, the `setup.py` diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index 6986c8e5384..c2786b647d6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ shiboken2 ]; + dontWrapQtApps = true; + meta = with lib; { description = "LGPL-licensed Python bindings for Qt"; license = licenses.lgpl21; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix new file mode 100644 index 00000000000..ceba7489e8b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cachetools +, paho-mqtt +, pytz +, requests +, requests_oauthlib +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysmappee"; + version = "0.2.17"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "smappee"; + repo = pname; + rev = version; + sha256 = "00274fbclj5kmwxi2bfx4913r4l0y8qvkfcc9d7ryalvf8jq24k6"; + }; + + propagatedBuildInputs = [ + cachetools + paho-mqtt + pytz + requests + requests_oauthlib + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pysmappee" ]; + + meta = with lib; { + description = "Python Library for the Smappee dev API"; + homepage = "https://github.com/smappee/pysmappee"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix index bea1438f679..93aa6606c7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix @@ -1,23 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi -, samba, pkg-config -, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, samba +, pkg-config +}: buildPythonPackage rec { - version = "1.0.21"; pname = "pysmbc"; + version = "1.0.23"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; - sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; + sha256 = "1y0n1n6jkzf4mr5lqfc73l2m0qp56gvxwfjnx2vj8c0hh5i1gnq8"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ setuptools samba ]; + + buildInputs = [ samba ]; + + # Tests would require a local SMB server + doCheck = false; + pythonImportsCheck = [ "smbc" ]; meta = with lib; { description = "libsmbclient binding for Python"; homepage = "https://github.com/hamano/pysmbc"; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix index 9e994860709..37e3490a54c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix new file mode 100644 index 00000000000..69bf0114182 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytankerkoenig/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytankerkoenig/default.nix new file mode 100644 index 00000000000..0a6403107ab --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix index 89200f519e7..855e1fb470c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , setuptools_scm +, py , pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,19 +16,16 @@ buildPythonPackage rec { sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; - buildInputs = [ pytest setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; - # Do not function - doCheck = false; + propagatedBuildInputs = [ py pytest ]; - checkPhase = '' - py.test testing - ''; + checkInputs = [ pytestCheckHook ]; meta = { description = "Run tests in isolated forked subprocesses"; homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix index 424d8fde232..e5fbb6bb070 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -1,18 +1,21 @@ { lib , buildPythonPackage -, fetchPypi +, isPy27 +, fetchFromGitHub , freezegun , pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-freezegun"; version = "0.4.2"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949"; + src = fetchFromGitHub { + owner = "ktosiek"; + repo = "pytest-freezegun"; + rev = version; + sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; }; propagatedBuildInputs = [ @@ -20,6 +23,10 @@ buildPythonPackage rec { pytest ]; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Wrap tests with fixtures in freeze_time"; homepage = "https://github.com/ktosiek/pytest-freezegun"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix new file mode 100644 index 00000000000..508b7b7781b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pytest +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-httpx"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Colin-b"; + repo = "pytest_httpx"; + rev = "v${version}"; + sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; + }; + + propagatedBuildInputs = [ + httpx + pytest + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytest_httpx" ]; + + meta = with lib; { + description = "Send responses to httpx"; + homepage = "https://github.com/Colin-b/pytest_httpx"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix index 3be2adc11a4..c07832c0b05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix index 6bf3483d40f..5833790cf92 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix index 9373c597b36..119f3021b41 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pytest , vcrpy }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix index 12b06c2e1b6..0088bf45e4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix @@ -16,10 +16,11 @@ buildPythonPackage rec { sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9"; }; + propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + # No Tests doCheck = false; - - propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + pythonImportsCheck = [ "pytest_watch" ]; meta = with lib; { homepage = "https://github.com/joeyespo/pytest-watch"; @@ -28,4 +29,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ dmvianna ]; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix index 30e43c17c91..94feb102994 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,28 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage, execnet, pytest_6 -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, setuptools_scm +, pytestCheckHook +, filelock +, execnet +, pytest +, pytest-forked +, psutil +}: buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.1.0"; - disabled = !isPy3k; + version = "2.2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; + sha256 = "1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf"; }; - nativeBuildInputs = [ setuptools_scm pytest_6 ]; - checkInputs = [ pytest_6 filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytestCheckHook filelock ]; + propagatedBuildInputs = [ execnet pytest pytest-forked psutil ]; - # pytest6 doesn't allow for new lines - # capture_deprecated not compatible with latest pytest6 - checkPhase = '' - # Excluded tests access file system - export HOME=$TMPDIR - pytest -n $NIX_BUILD_CORES \ - -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" - ''; + # access file system + disabledTests = [ + "test_distribution_rsyncdirs_example" + "test_rsync_popen_with_path" + "test_popen_rsync_subdir" + "test_rsync_report" + "test_init_rsync_roots" + "test_rsyncignore" + ]; meta = with lib; { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-awair/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-awair/default.nix new file mode 100644 index 00000000000..8489247399a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix index e654826e0bc..1d8a9a85457 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix +++ b/infra/libkookie/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 + pytestCheckHook + sh + ]; - checkInputs = [ ipython mock pytest sh ]; + disabledTests = [ + "cli" + ]; - # cli tests are impure - checkPhase = '' - pytest tests/ -k 'not cli' - ''; + pythonImportsCheck = [ "dotenv" ]; meta = with lib; { description = "Add .env support to your django/flask apps in development and deployments"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix new file mode 100644 index 00000000000..e4c71782f99 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, eventlet +, iana-etc +, libredirect +, mock +, requests +, six +, tornado +, websocket_client +, websockets +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-engineio"; + version = "3.14.2"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-engineio"; + rev = "v${version}"; + sha256 = "1r3gvizrknbv036pvxid1l726wkb0l43bdaz5y879s7j3ipyb464"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + aiohttp + eventlet + mock + requests + tornado + websocket_client + websockets + pytestCheckHook + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + # somehow effective log level does not change? + disabledTests = [ "test_logger" ]; + pythonImportsCheck = [ "engineio" ]; + + meta = with lib; { + description = "Python based Engine.IO client and server v3.x"; + longDescription = '' + Engine.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-engineio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix new file mode 100644 index 00000000000..1548a138947 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-olm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-olm/default.nix index b1e01f7f4ab..2a8295a65bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-olm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-olm/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, olm, - cffi, future, isPy3k, typing }: +{ lib, buildPythonPackage, isPy3k, olm +, cffi, future, typing }: buildPythonPackage { pname = "python-olm"; inherit (olm) src version; - sourceRoot = "${olm.name}/python"; + sourceRoot = "source/python"; buildInputs = [ olm ]; preBuild = '' @@ -17,12 +17,13 @@ buildPythonPackage { future ] ++ lib.optionals (!isPy3k) [ typing ]; + # Some required libraries for testing are not packaged yet. doCheck = false; + pythonImportsCheck = [ "olm" ]; - meta = with lib; { + meta = { + inherit (olm.meta) license maintainers; description = "Python bindings for Olm"; homepage = "https://gitlab.matrix.org/matrix-org/olm/tree/master/python"; - license = olm.meta.license; - maintainers = [ maintainers.tilpner ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix new file mode 100644 index 00000000000..3e5889b9356 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/4.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/4.nix new file mode 100644 index 00000000000..3a6f5d87fdd --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/4.nix @@ -0,0 +1,47 @@ +{ lib +, bidict +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, python-engineio_3 +}: + +buildPythonPackage rec { + pname = "python-socketio"; + version = "4.6.1"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-socketio"; + rev = "v${version}"; + sha256 = "14dijag17v84v0pp9qi89h5awb4h4i9rj0ppkixqv6is9z9lflw5"; + }; + + propagatedBuildInputs = [ + bidict + python-engineio_3 + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "socketio" ]; + + # pytestCheckHook seems to change the default log level to WARNING, but the + # tests assert it is ERROR + disabledTests = [ "test_logger" ]; + + meta = with lib; { + description = "Python Socket.IO server and client 4.x"; + longDescription = '' + Socket.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index e9c2ae146b0..8eb58b244e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { Socket.IO is a lightweight transport protocol that enables real-time bidirectional event-based communication between clients and a server. ''; - homepage = "https://github.com/miguelgrinberg/python-engineio/"; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix new file mode 100644 index 00000000000..30f6ab9a0a7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "python-twitch-client"; + version = "0.7.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsifrer"; + repo = pname; + rev = version; + sha256 = "10wwkam3dw0nqr3v9xzigx1zjlrnrhzr7jvihddvzi84vjb6j443"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "twitch" ]; + + meta = with lib; { + description = "Python wrapper for the Twitch API"; + homepage = "https://github.com/tsifrer/python-twitch-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix new file mode 100644 index 00000000000..a02edfdc1f6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +}: + +buildPythonPackage rec { + pname = "python-velbus"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "thomasdelaet"; + repo = pname; + rev = "v${version}"; + sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has not tests + doCheck = false; + pythonImportsCheck = [ "velbus" ]; + + meta = with lib; { + description = "Python library to control the Velbus home automation system"; + homepage = "https://github.com/thomasdelaet/python-velbus"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytile/default.nix index 771ae4d1328..226fdbc715e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, async-timeout , aresponses , buildPythonPackage , fetchFromGitHub diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index 1ffda5c86b0..0571269fa8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -5,7 +5,6 @@ , isPy38 , isPy39 , python -, nvidia_x11 , addOpenGLRunpath , future , numpy @@ -52,7 +51,7 @@ in buildPythonPackage { ''; postFixup = let - rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; in '' find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index db1914f4ee7..e82054c2885 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/infra/libkookie/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 diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix new file mode 100644 index 00000000000..0a65a960fb7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +, lxml +}: + +buildPythonPackage rec { + pname = "pytrafikverket"; + version = "0.1.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hrjsw53ixgmhsiszdrzzh0wma705nrhq8npzacsyaf43r29zvqy"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + lxml + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pytrafikverket" ]; + + meta = with lib; { + description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; + homepage = "https://github.com/endor-force/pytrafikverket"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 3ce1e70e823..20dbe0ba31c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -17,10 +17,11 @@ buildPythonPackage rec { sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; }; - doCheck = false; - propagatedBuildInputs = [ requests lxml pandas ]; + doCheck = false; + pythonImportsCheck = [ "pytrends" ]; + meta = with lib; { description = "Pseudo API for Google Trends"; homepage = "https://github.com/GeneralMills/pytrends"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix index 0351840b3e0..dab8f479c04 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2020.4"; + version = "2020.5"; src = fetchPypi { inherit pname version; - sha256 = "3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268"; + sha256 = "180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"; }; checkPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix index c703a8fe30c..281511192fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest six mock pyfakefs unittest2 ]; + checkInputs = [ pytest mock pyfakefs unittest2 ]; checkPhase = '' pytest pyu2f/tests diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix new file mode 100644 index 00000000000..95aa57491ca --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyuv/default.nix index 0be0d61ed0d..2d276c6dcca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyuv/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch deleted file mode 100644 index 41e169acd5f..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index ddec4f0f239..13c54f6a41e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix new file mode 100644 index 00000000000..7c87431d80b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvizio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvizio/default.nix new file mode 100644 index 00000000000..807278d967d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix new file mode 100644 index 00000000000..da3ac35c462 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyvolumio"; + version = "0.1.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "PyVolumio"; + rev = "v${version}"; + sha256 = "0x2dzmd9lwnak2iy6v54y24qjq37y3nlfhsvx7hddgv8jj1klvap"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyvolumio" ]; + + meta = with lib; { + description = "Python module to control Volumio"; + homepage = "https://github.com/OnFreund/PyVolumio"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix index 9b8b6eeac8f..b97de368d82 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix +++ b/infra/libkookie/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 = "sha256-xqPthVAlZi35s1ri0crD+kF3WnYSZVgEvecnaoyrjRw="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix new file mode 100644 index 00000000000..1d3a83177ed --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +}: + +buildPythonPackage rec { + pname = "pyxiaomigateway"; + version = "0.13.4"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "PyXiaomiGateway"; + rev = version; + sha256 = "1xg89sdds04wgil88ihs84cjr3df6lajjbkyb1aymj638ibdyqns"; + }; + + propagatedBuildInputs = [ cryptography ]; + + # Tests are not mocking the gateway completely + doCheck = false; + pythonImportsCheck = [ "xiaomi_gateway" ]; + + meta = with lib; { + description = "Python library to communicate with the Xiaomi Gateway"; + homepage = "https://github.com/Danielhiversen/PyXiaomiGateway/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxml/default.nix index a528de8e0ca..49796054b56 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxml/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix index 95ceeab3a04..93cfad78d50 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyyaml/default.nix @@ -2,18 +2,13 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.3.1"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0pb4zvkfxfijkpgd1b86xjsqql97ssf1knbd1v53wkg1qm9cgsmq"; + sha256 = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"; }; - # force regeneration using Cython - postPatch = '' - rm ext/_yaml.c - ''; - nativeBuildInputs = [ cython buildPackages.stdenv.cc ]; buildInputs = [ libyaml ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix index 8040458bf76..4f3c53fe483 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , fetchFromGitHub , pytest-asyncio -, pytest-cov , pytest-mock , pytestCheckHook , pythonOlder @@ -13,19 +12,18 @@ buildPythonPackage rec { pname = "pyzerproc"; - version = "0.4.6"; + version = "0.4.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "emlove"; repo = pname; rev = version; - sha256 = "1qlxvvy9fyff56dvc46nsd5ngkxqhdi7s4gwfndj7dn76j81srpq"; + sha256 = "sha256-PNvkgjPcBbnETjWpVF3De9O9IprdpCke0nWvJ9Tju1M="; }; - # Remove pytest-runner, https://github.com/emlove/pyzerproc/pull/1 - patchPhase = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" + postPatch = '' + sed -i "/--cov/d" setup.cfg ''; propagatedBuildInputs = [ @@ -34,11 +32,11 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest pytest-asyncio - pytest-cov pytest-mock pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest ]; pythonImportsCheck = [ "pyzerproc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index e5eb877b6b2..10a3b4482fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,7 +2,6 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch # C Inputs , blas , catch2 @@ -28,7 +27,8 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.7.1"; + version = "0.7.6"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y"; + sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn"; }; nativeBuildInputs = [ @@ -61,10 +61,14 @@ buildPythonPackage rec { pybind11 ]; - patches = [ - # TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable - ./remove-conan-install.patch - ]; + postPatch = '' + substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" + ''; + + # Disable using conan for build + preBuild = '' + export DISABLE_CONAN=1 + ''; dontUseCmakeConfigure = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch deleted file mode 100644 index 1c5ae87b082..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efeacfc..77bd6bd 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -121,7 +121,11 @@ endif() - # Looking for external libraries - # - --setup_conan() -+find_package(muparserx REQUIRED) -+find_package(nlohmann_json REQUIRED) -+find_package(spdlog REQUIRED) -+# for tests only -+find_package(catch2) - - # If we do not set them with a space CMake fails afterwards if nothing is set for this vars! - set(AER_LINKER_FLAGS " ") -@@ -269,16 +273,16 @@ endif() - set(AER_LIBRARIES - ${AER_LIBRARIES} - ${BLAS_LIBRARIES} -- CONAN_PKG::nlohmann_json -+ nlohmann_json - Threads::Threads -- CONAN_PKG::spdlog -+ spdlog - ${DL_LIB} - ${THRUST_DEPENDANT_LIBS}) - - set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES}) - # Cython build is only enabled if building through scikit-build. - if(SKBUILD) # Terra Addon build -- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx) -+ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx) - add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy) - add_subdirectory(qiskit/providers/aer/backends/wrappers) - add_subdirectory(src/open_pulse) -diff --git a/setup.py b/setup.py -index fd71e9f..1561cc4 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,12 +11,6 @@ import inspect - - PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer') - --try: -- from conans import client --except ImportError: -- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan']) -- from conans import client -- - try: - from skbuild import setup - except ImportError: -@@ -46,8 +40,6 @@ common_requirements = [ - - setup_requirements = common_requirements + [ - 'scikit-build', -- 'cmake!=3.17,!=3.17.0', -- 'conan>=1.22.2' - ] - - requirements = common_requirements + ['qiskit-terra>=0.12.0'] diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix index 11274c525f0..0e6e8e25b53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.8.1"; + version = "0.8.2"; disabled = pythonOlder "3.6"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b"; + sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw="; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. @@ -73,13 +73,8 @@ buildPythonPackage rec { # It can also be installed at runtime from the pip wheel. # We disable appropriate tests below to allow building without pyscf installed - # NOTE: we remove cplex b/c we can't build pythonPackages.cplex. - # cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible - postPatch = '' - substituteInPlace setup.py \ - --replace "pyscf; sys_platform != 'win32'" "" \ - --replace "cplex; python_version >= '3.6' and python_version < '3.8'" "" + substituteInPlace setup.py --replace "docplex==2.15.194" "docplex" # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 7374d7ce017..9346fae9743 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index b5295dbd041..f73b46a520a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -2,7 +2,6 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , numpy , qiskit-terra @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; @@ -33,11 +32,11 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y"; + sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw="; }; # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532. - # TODO: remove on qiskit-ignis v0.5.1 + # TODO: remove on qiskit-ignis v0.5.2 postPatch = '' substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'" ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index 89d39b718cd..ff51e82e351 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.16.1"; + version = "0.16.4"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq"; + sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc="; }; nativeBuildInputs = [ cython ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index 7c79d517ce5..5051c6541cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/infra/libkookie/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.1"; + version = "0.24.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1"; + sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h"; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix index 2ee9c82f08d..dcbe213966f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -14,6 +14,8 @@ buildPythonPackage { buildInputs = [ qscintilla ]; propagatedBuildInputs = [ pyqt5 ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace Python/configure.py \ --replace \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/quandl/default.nix index 56b80a4676b..0247d20ec7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { importlib-metadata ]; + pythonImportsCheck = [ "quandl" ]; + meta = with lib; { description = "Quandl Python client library"; homepage = "https://github.com/quandl/quandl-python"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/questionary/default.nix new file mode 100644 index 00000000000..ecb33f6adb1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix new file mode 100644 index 00000000000..9cefe8839c1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "radiotherm"; + version = "2.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mhrivnak"; + repo = pname; + rev = version; + sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks"; + }; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "radiotherm" ]; + + meta = with lib; { + description = "Python library for Wifi Radiothermostat"; + homepage = "https://github.com/mhrivnak/radiotherm"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix new file mode 100644 index 00000000000..f706d043bf8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ratelimit"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "tomasbasham"; + repo = pname; + rev = "v${version}"; + sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2"; + }; + + postPatch = '' + sed -i "/--cov/d" pytest.ini + ''; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "ratelimit" ]; + + meta = with lib; { + description = "Python API Rate Limit Decorator"; + homepage = "https://github.com/tomasbasham/ratelimit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix index 57a84e69d20..0d22a0c56c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix @@ -1,40 +1,45 @@ { lib +, bleach , buildPythonPackage -, fetchPypi -, pytest -, mock , cmarkgfm -, bleach , 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 + ]; + + checkInputs = [ + mock + pytestCheckHook ]; - checkPhase = '' - # disable one failing test case - # fixtures test is failing for incorrect class name - py.test -k "not test_invalid_link and not fixtures" - ''; + pythonImportsCheck = [ "readme_renderer" ]; - meta = { - description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix index e0dfb9a24a6..060866b04e8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/respx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/respx/default.nix index 61e2016a497..68da058194b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -1,5 +1,4 @@ { lib -, attrs , buildPythonPackage , fetchFromGitHub , httpcore @@ -8,7 +7,6 @@ , pytest-cov , pytestCheckHook , trio -, xmltodict }: buildPythonPackage rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix index 02a3ef64c57..c4b7a6323e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix +++ b/infra/libkookie/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"; - - propagatedBuildInputs = [ python ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo="; + }; - 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/rfcat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rfcat/default.nix new file mode 100644 index 00000000000..7bb390e79a2 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix new file mode 100644 index 00000000000..f70e4921b9e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/roboschool/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/roboschool/default.nix index 3e15f18a3dd..97eee2155a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/roboschool/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/roboschool/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { boost ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix index 9b90b25bfb7..77a7fe13df9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , robotframework , moretools , pathpy , six , zetup , modeled -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -20,9 +19,7 @@ buildPythonPackage rec { sha256 = "0377ikajf6c3zcy3lc0kh4w9zmlqyplk2c2hb0yyc7h3jnfnya96"; }; - nativeBuildInputs = [ - zetup - ]; + nativeBuildInputs = [ zetup ]; propagatedBuildInputs = [ robotframework @@ -32,19 +29,21 @@ buildPythonPackage rec { modeled ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - # tests require network - pytest test --ignore test/remote/test_remote.py + postPatch = '' + # Remove upstream's selfmade approach to collect the dependencies + # https://github.com/userzimmermann/robotframework-tools/issues/1 + substituteInPlace setup.py --replace \ + "setup_requires=SETUP_REQUIRES + (zfg.SETUP_REQUIRES or [])," "" ''; + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "test" ]; + pythonImportsCheck = [ "robottools" ]; + meta = with lib; { description = "Python Tools for Robot Framework and Test Libraries"; - homepage = "https://bitbucket.org/userzimmermann/robotframework-tools"; - license = licenses.gpl3; + homepage = "https://github.com/userzimmermann/robotframework-tools"; + license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 0b042288fb7..cae84f8cbe9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -1,8 +1,6 @@ { stdenv , lib -, python , buildPythonPackage -, fetchpatch , fetchPypi , isPyPy , R diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix new file mode 100644 index 00000000000..116f4b6f676 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, boto3 +, google-pasta +, importlib-metadata +, numpy +, protobuf +, protobuf3-to-dict +, smdebug-rulesconfig +, pandas +}: + +buildPythonPackage rec { + pname = "sagemaker"; + version = "2.28.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-SOk4VM227gAlLX615xPy0lcATRzth7M3HGH557iF2Wc="; + }; + + pythonImportsCheck = [ + "sagemaker" + "sagemaker.lineage.visualizer" + ]; + + propagatedBuildInputs = [ + attrs + boto3 + google-pasta + importlib-metadata + numpy + protobuf + protobuf3-to-dict + smdebug-rulesconfig + pandas + ]; + + doCheck = false; + + postFixup = '' + [ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ] + ''; + + meta = with lib; { + description = "Library for training and deploying machine learning models on Amazon SageMaker"; + homepage = "https://github.com/aws/sagemaker-python-sdk/"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index f14c4d82f42..f13fecc0855 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -32,12 +32,6 @@ buildPythonPackage rec { checkInputs = [ coverage ]; propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; - # remove on when version > 0.5.4 - postPatch = '' - sed -i "s/numpy >= 1.9.2, < 1.14.0/numpy/" setup.py - sed -i "s/pandas >= 0.19.2, < 0.23.0/pandas/" setup.py - ''; - # cython package not included for tests doCheck = false; @@ -45,6 +39,8 @@ buildPythonPackage rec { ${python.interpreter} -m skbio.test ''; + pythonImportsCheck = [ "skbio" ]; + meta = with lib; { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 8d08e43bc71..0bc8499a373 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index b3bf8fce0fc..8c771ea286c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { # Computationally very demanding tests doCheck = false; + pythonImportsCheck= [ "seaborn" ]; meta = { description = "Statisitical data visualization"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix index 15787647676..5b7b7ea2797 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index 77cd3593863..704549e987d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.5.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "14kqjdv49486ksc1s0m0hc4k5nf9vn1v1g489mpib01hiiqxjp1b"; + sha256 = "sha256-R9ASHDIGuPRh4yf0FAlpjUZ6QAakYs35EFSqAPc02Q8="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix index 1e6f8307fbc..2a8267710a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix @@ -29,10 +29,6 @@ buildPythonPackage rec { pytest tests/unit ''; - postPatch = '' - substituteInPlace setup.py --replace "pyyaml~=3.12" "pyyaml~=5.1" - ''; - meta = with lib; { homepage = "https://github.com/awslabs/aws-serverlessrepo-python"; description = "Helpers for working with the AWS Serverless Application Repository"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index ee4a3b55164..e24c771457f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sfepy/default.nix index 8a37f41086e..dacd589b121 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sfepy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix index b5dd0be5445..e8ea874e5ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -1,47 +1,75 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder -, geos, pytest, 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 ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + numpy + ]; - propagatedBuildInputs = [ numpy ]; + 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"; }) - ]; + ]; - # Disable the tests that improperly try to use the built extensions - checkPhase = '' + preCheck = '' rm -r shapely # prevent import of local shapely - py.test tests ''; + disabledTests = [ + "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/infra/libkookie/nixpkgs/pkgs/development/python-modules/sharkiqpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sharkiqpy/default.nix new file mode 100644 index 00000000000..9d696bf0a21 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix index b7508a8f644..23836addd0c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + dontWrapQtApps = true; + postInstall = '' rm $out/bin/shiboken_tool.py ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/simplehound/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/simplehound/default.nix new file mode 100644 index 00000000000..1ecd446c5b4 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix index bb41f61517f..fd161ecd753 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix @@ -26,10 +26,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; - # on CPU, these expect artifacts from previous GPU run disabledTests = [ + # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" + # failing tests "test_pickle_load" + "test_grid_search_with_slds_" + "test_grid_search_with_dict_works" ]; meta = with lib; { @@ -38,5 +41,7 @@ buildPythonPackage rec { changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + # TypeError: __init__() got an unexpected keyword argument 'iid' + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix new file mode 100644 index 00000000000..c94b03bcc66 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix new file mode 100644 index 00000000000..cb491cf6007 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -0,0 +1,74 @@ +{ lib +, aiodns +, aiohttp +, boto3 +, buildPythonPackage +, codecov +, databases +, fetchFromGitHub +, flake8 +, flask-sockets +, isPy3k +, psutil +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pytestrunner +, sqlalchemy +, websocket_client +, websockets +}: + +buildPythonPackage rec { + pname = "slack-sdk"; + version = "3.4.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "slackapi"; + repo = "python-slack-sdk"; + rev = "v${version}"; + sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY="; + }; + + propagatedBuildInputs = [ + aiodns + aiohttp + boto3 + sqlalchemy + websocket_client + websockets + ]; + + checkInputs = [ + codecov + databases + flake8 + flask-sockets + psutil + pytest-asyncio + pytest-cov + pytestCheckHook + pytestrunner + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Exclude tests that requires network features + pytestFlagsArray = [ "--ignore=integration_tests" ]; + disabledTests = [ + "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" + "test_org_installation" + ]; + + pythonImportsCheck = [ "slack_sdk" ]; + + meta = with lib; { + description = "Slack Developer Kit for Python"; + homepage = "https://slack.dev/python-slack-sdk/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index d990295bff6..4a3c2927218 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -1,15 +1,15 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiohttp -, black +, buildPythonPackage , codecov +, fetchFromGitHub , flake8 , isPy3k , mock +, psutil +, pytest-cov , pytest-mock , pytestCheckHook -, pytestcov , pytestrunner , requests , responses @@ -19,15 +19,15 @@ buildPythonPackage rec { pname = "python-slackclient"; - version = "2.5.0"; + version = "2.9.3"; disabled = !isPy3k; src = fetchFromGitHub { - owner = "slackapi"; - repo = pname; - rev = version; - sha256 = "1ngj1mivbln19546195k400w9yaw69g0w6is7c75rqwyxr8wgzsk"; + owner = "slackapi"; + repo = "python-slack-sdk"; + rev = "v${version}"; + sha256 = "1rfb7izgddv28ag37gdnv3sd8z2zysrxs7ad8x20x690zshpaq16"; }; propagatedBuildInputs = [ @@ -38,17 +38,21 @@ buildPythonPackage rec { ]; checkInputs = [ - black codecov flake8 mock + psutil + pytest-cov pytest-mock pytestCheckHook - pytestcov pytestrunner responses ]; + # Exclude tests that requires network features + pytestFlagsArray = [ "--ignore=integration_tests" ]; + disabledTests = [ "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" ]; + pythonImportsCheck = [ "slack" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix index 08bdc183186..506fad5db48 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index 341f53cfe0b..f648905251e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix index 3a1c890f048..389feef2b42 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix @@ -21,11 +21,6 @@ buildPythonPackage rec { sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e"; }; - # nixpkgs version of moto is >=1.2.0, remove version pin to fix build - postPatch = '' - substituteInPlace ./setup.py --replace "moto==0.4.31" "moto" - ''; - # moto>=1.0.0 is backwards-incompatible and some tests fail with it, # so disable tests for now doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smdebug-rulesconfig/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smdebug-rulesconfig/default.nix new file mode 100644 index 00000000000..864a395cc88 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smdebug-rulesconfig/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "smdebug-rulesconfig"; + version = "1.0.1"; + + src = fetchPypi { + inherit version; + pname = "smdebug_rulesconfig"; + sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs"; + }; + + doCheck = false; + + pythonImportsCheck = [ "smdebug_rulesconfig" ]; + + meta = with lib; { + description = "These builtin rules are available in Amazon SageMaker"; + homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 96f489ec6ed..a2f6a7aae92 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -57,11 +57,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \ - --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ - --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \ - --replace "'idna<2.10'," "'idna'," \ - --replace "'requests<2.24.0'," "'requests'," + --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," ''; # tests require encrypted secrets, see diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix index e203dc1c7aa..e86144dff04 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/solo-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/solo-python/default.nix index 0ce6e338e61..72546642009 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/solo-python/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/solo-python/default.nix @@ -1,9 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, click +, cryptography +, ecdsa +, fido2 +, intelhex +, pyserial +, pyusb +, requests +}: buildPythonPackage rec { pname = "solo-python"; - version = "0.0.26"; + version = "0.0.27"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -11,7 +22,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; + sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE="; }; # replaced pinned fido, with unrestricted fido version @@ -21,6 +32,7 @@ propagatedBuildInputs = [ click + cryptography ecdsa fido2 intelhex diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 7b549933588..c541751bd24 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -6,7 +6,6 @@ , pyenchant , pygeoip , pytestCheckHook -, python , pytz , sqlalchemy , xmltodict diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix index 958c1a6b19c..739ea2afa82 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , sphinx diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix index a760033c915..43a2f5b460f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { "test_turtle_launc" "test_umr_skip_cython" "test_umr_pathlist" + "test_user_sitepackages_in_pathlist" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/3.nix index 0fb98fa38e3..2618ccfcd8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/3.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; + pythonImportsCheck = [ "spyder" ]; + meta = with lib; { description = "Library providing a scientific python development environment"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 83fd3e7b10b..7d35bb8487c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch , mock , pysqlite , pytestCheckHook @@ -13,6 +13,14 @@ buildPythonPackage rec { sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1"; }; + patches = [ + # fix test_pyodbc_extra_connect_azure test failure + (fetchpatch { + url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch"; + sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db"; + }) + ]; + checkInputs = [ pytestCheckHook mock diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 1c49e1f4a02..3ec4246cd02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.4.1"; + version = "3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LJuvUTbsL2anQENEuW1oaSUsMEiXnSgLEAhZ6EP5bNs="; + sha256 = "sha256-i9SnT+DcQOcujV25bD/SNV1uRA2IgfiSWhEWlQC5TiA="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 94513e5d620..071bbcd3061 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix index d17aed6ae43..3a62dd4ecf1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , confluent-kafka , distributed , flaky diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/stytra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/stytra/default.nix index 88adbe4f7d9..80eefc0a639 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/stytra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/stytra/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k, callPackage +{ lib, buildPythonPackage, fetchPypi, isPy3k , opencv3 , pyqt5 , pyqtgraph @@ -19,7 +19,7 @@ , imageio-ffmpeg , av , nose -, pytest +, pytestCheckHook , pyserial , arrayqueues , colorspacious @@ -37,14 +37,18 @@ buildPythonPackage rec { inherit pname version; sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; }; - doCheck = false; + + # crashes python + preCheck = '' + rm stytra/tests/test_z_experiments.py + ''; + checkInputs = [ nose - pytest + pytestCheckHook pyserial ]; - propagatedBuildInputs = [ opencv3 pyqt5 diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index 5b6362b76a1..ac80be2fe0c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/surepy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/surepy/default.nix new file mode 100644 index 00000000000..dd071b5cf08 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/surepy/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiodns +, aiohttp +, async-timeout +, brotlipy +, buildPythonPackage +, cchardet +, click +, colorama +, fetchFromGitHub +, halo +, poetry-core +, pythonOlder +, requests +, rich +}: + +buildPythonPackage rec { + pname = "surepy"; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "benleb"; + repo = pname; + rev = "v${version}"; + sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + async-timeout + brotlipy + cchardet + click + colorama + halo + requests + rich + ]; + + postPatch = '' + # halo is out-dated, https://github.com/benleb/surepy/pull/7 + substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31" + ''; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "surepy" ]; + + meta = with lib; { + description = "Python library to interact with the Sure Petcare API"; + homepage = "https://github.com/benleb/surepy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/survey/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/survey/default.nix index 436127fae9c..99a2d85aaa2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/survey/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/survey/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "survey"; - version = "3.1.1"; + version = "3.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M="; + sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/swspotify/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/swspotify/default.nix index e213e9e265e..020e4fe1472 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/swspotify/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/swspotify/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Library to get the currently playing song and artist from Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix new file mode 100644 index 00000000000..44021822311 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tahoma-api"; + version = "0.0.17"; + + src = fetchFromGitHub { + owner = "philklei"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4="; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tahoma_api" ]; + + meta = with lib; { + description = "Python module to interface with Tahoma REST API"; + homepage = "https://github.com/philklei/tahoma-api/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tellduslive/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tellduslive/default.nix new file mode 100644 index 00000000000..5a6a84af839 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tellduslive/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, docopt +, fetchFromGitHub +, requests +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "tellduslive"; + version = "0.10.11"; + + src = fetchFromGitHub { + owner = "molobrakos"; + repo = pname; + rev = "v${version}"; + sha256 = "0aqhj6fq2z2qb4jyk23ygjicf5nlj8lkya7blkyqb7jra5k1gyg0"; + }; + + propagatedBuildInputs = [ + docopt + requests + requests_oauthlib + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tellduslive" ]; + + meta = with lib; { + description = "Python module to communicate with Telldus Live"; + homepage = "https://github.com/molobrakos/tellduslive"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix new file mode 100644 index 00000000000..adccc99ac2f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 46c8a2853b5..59af2b33d2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, pytest-asyncio , pytestCheckHook , wrapt }: @@ -35,15 +36,11 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ pytestCheckHook ]; - - # Not all Home Assistant related check pass - # https://github.com/zabuldon/teslajsonpy/issues/121 - # https://github.com/zabuldon/teslajsonpy/pull/124 - disabledTests = [ - "test_values_on_init" - "test_get_value_on_init" + checkInputs = [ + pytest-asyncio + pytestCheckHook ]; + pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix index 616db71a94f..31b02e3f264 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index d5379b849ad..ddfa83e30f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -81,6 +81,7 @@ buildPythonPackage rec { homepage = "https://github.com/TileDB-Inc/TileDB-Py"; license = licenses.mit; maintainers = with maintainers; [ fridh ]; + # tiledb/core.cc:556:30: error: ‘struct std::array’ has no member named ‘second’ + broken = true; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiros/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiros/default.nix deleted file mode 100644 index edc4bbdebb1..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tiros/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchPypi, buildPythonPackage -, semantic-version, boto3, flask, docutils, requests -}: - -buildPythonPackage rec { - pname = "tiros"; - version = "1.0.44"; - - src = fetchPypi { - inherit pname version; - sha256 = "d6bf7410967554ec283f9d4eabc0ce6821d6e6d36001afbdb7fe0826423d4f37"; - }; - - patchPhase = '' - sed -E -i "s/'([[:alnum:].-_]+)[=><]{2}[[:digit:].]*'/'\\1'/g" setup.py - sed -i "s/'datetime',//" setup.py - ''; - - propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ]; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix new file mode 100644 index 00000000000..7aee895c6cb --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index cf122613f63..ef265b87c05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/infra/libkookie/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,7 +47,7 @@ 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"; @@ -60,19 +58,22 @@ in rustPlatform.buildRustPackage rec { hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; - cargoSha256 = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + name = "${pname}-${version}"; + hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; + }; 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix index 6e621ee8b68..dbfad336d0f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytest , pytestrunner , pytestCheckHook , pytorch @@ -23,12 +22,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytest pytestrunner pytestCheckHook ]; - disabledTests = [ "test_inplace_on_requires_grad" ]; - # seems like a harmless failure: - ## AssertionError: - ## Pattern 'a leaf Variable that requires grad has been used in an in-place operation.' - ## does not match 'a leaf Variable that requires grad is being used in an in-place operation.' + checkInputs = [ pytestrunner pytestCheckHook ]; + disabledTests = [ + "test_inplace_on_requires_grad" + "test_input_requiring_grad" + ]; meta = with lib; { description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 79f6a19ffcb..35759215182 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ericsagnes SuperSandro2000 ]; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix new file mode 100644 index 00000000000..544c1a3084a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index ba40723e7dd..950a618a527 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/traittypes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/traittypes/default.nix index 2c8f6dd8031..290892672e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/traittypes/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/traittypes/default.nix @@ -3,10 +3,9 @@ , fetchFromGitHub , fetchpatch , isPy27 -, pytest +, pytestCheckHook , nose , numpy -, scipy , pandas , xarray , traitlets @@ -35,7 +34,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ traitlets ]; - checkInputs = [ numpy pandas xarray nose pytest ]; + checkInputs = [ numpy pandas xarray nose pytestCheckHook ]; + pythonImportsCheck = [ "traittypes" ]; meta = with lib; { description = "Trait types for NumPy, SciPy, XArray, and Pandas"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 2dda33fd968..013cf73ee1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -1,21 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, six, pytestCheckHook, mock, dill, pycodestyle }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pygraphviz +, pytestCheckHook +, mock +, graphviz +, pycodestyle +}: buildPythonPackage rec { pname = "transitions"; - version = "0.8.6"; + version = "0.8.7"; - # test_codestyle.py fails in PyPI sdist - src = fetchFromGitHub { - owner = "pytransitions"; - repo = "transitions"; - rev = version; - sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v"; + src = fetchPypi { + inherit pname version; + sha256 = "8c60ec0828cd037820726283cad5d4d77a5e31514e058b51250420e9873e9bc7"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + pygraphviz # optional + ]; - checkInputs = [ pytestCheckHook mock dill pycodestyle ]; + checkInputs = [ + pytestCheckHook + mock + graphviz + pycodestyle + ]; + + disabledTests = [ + # Fontconfig error: Cannot load default config file + "test_diagram" + ]; meta = with lib; { homepage = "https://github.com/pytransitions/transitions"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix new file mode 100644 index 00000000000..235540209e3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, typing-extensions +, requests +, yarl +}: + +buildPythonPackage rec { + pname = "transmission-rpc"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y5048109j6z4smzwysvdjfn6cj9698dsxfim9i4nqam4nmw2wi7"; + }; + + propagatedBuildInputs = [ + six + typing-extensions + requests + yarl + ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "transmission_rpc" ]; + + meta = with lib; { + description = "Python module that implements the Transmission bittorent client RPC protocol"; + homepage = "https://pypi.python.org/project/transmission-rpc/"; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix index a9f3042fb39..3a484692d1a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix @@ -17,10 +17,12 @@ buildPythonPackage rec { # 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 = licenses.mit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index 7a4b4454b3b..927fe1e5629 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.21"; + version = "0.0.23"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6"; + sha256 = "d504327e055889edfe56512a829f76b24b40c5965b93120f8b9300f5390014b4"; }; postPatch = '' @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Youtube (and other video site) to Internet Archive Uploader"; homepage = "https://github.com/bibanon/tubeup"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.marsam ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix new file mode 100644 index 00000000000..a53124783d1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tuyaha"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "PaulAnnekov"; + repo = pname; + rev = version; + sha256 = "0n08mqrz76zv1cyqky6ibs6im1fqcywkiyvfmfabml0vzvr43awf"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tuyaha" ]; + + meta = with lib; { + description = "Python module with the Tuya API"; + homepage = "https://github.com/PaulAnnekov/tuyaha"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix new file mode 100644 index 00000000000..fb561732174 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "twentemilieu"; + version = "0.3.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-twentemilieu"; + rev = "v${version}"; + sha256 = "1ff35sh73m2s7fh4d8p2pjwdbfljswr8b8lpcjybz8nsh0286xph"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "twentemilieu" ]; + + meta = with lib; { + description = "Python client for Twente Milieu"; + homepage = "https://github.com/frenck/python-twentemilieu"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix new file mode 100644 index 00000000000..fc856430da9 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix new file mode 100644 index 00000000000..b244167f88e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "twitterapi"; + version = "2.6.8"; + + src = fetchFromGitHub { + owner = "geduldig"; + repo = "TwitterAPI"; + rev = "v${version}"; + sha256 = "sha256-X/j+3bWLQ9b4q0k/JTE984o1VZS0KTQnC0AdZpNsksY="; + }; + + propagatedBuildInputs = [ + requests + requests_oauthlib + ]; + + # Tests are interacting with the Twitter API + doCheck = false; + pythonImportsCheck = [ "TwitterAPI" ]; + + meta = with lib; { + description = "Python wrapper for Twitter's REST and Streaming APIs"; + homepage = "https://github.com/geduldig/TwitterAPI"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/typesystem/default.nix index e93fd83656f..c278680404b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/typesystem/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix index 21fe31630de..aca6095d333 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { # No tests on PyPi doCheck = false; + pythonImportsCheck = [ "uproot3_methods" ]; meta = with lib; { homepage = "https://github.com/scikit-hep/uproot3-methods"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3/default.nix index 1150c76d2b4..c6923773427 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot3/default.nix @@ -1,21 +1,24 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy27 , awkward0, backports_lzma, cachetools, lz4, pandas -, pytestCheckHook, pytestrunner, pkgconfig, mock +, pytestCheckHook, pkgconfig, mock , numpy, requests, uproot3-methods, xxhash, zstandard }: buildPythonPackage rec { pname = "uproot3"; - version = "3.14.2"; + version = "3.14.4"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot3"; rev = version; - sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc="; + sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE="; }; - nativeBuildInputs = [ pytestrunner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; propagatedBuildInputs = [ awkward0 diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 27f7b68fe89..1bc73a37734 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.15.0"; + version = "0.15.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0rfhr84km8k5gj0036b2pznwmc8macx56vkxc3aksvns95dksl0s"; + sha256 = "1p33xfzcy60qqca3rplzbh8h4x7x9l77vi6zbyy9md5z2a0q4ikq"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega/default.nix index 083aa630209..04c38838a43 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage , fetchPypi, pythonOlder -, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: +, jupyter_core, pandas, ipywidgets, jupyter }: buildPythonPackage rec { pname = "vega"; @@ -11,12 +11,11 @@ buildPythonPackage rec { sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d"; }; - buildInputs = [ pytest ]; propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; - checkInputs = [ altair ]; + pythonImportsCheck = [ "vega" ]; meta = with lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix new file mode 100644 index 00000000000..713059ad908 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "venstarcolortouch"; + version = "0.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "04y9gmxb0vsmc5c930x9ziis5v83b29kfzsgjlww3pssj69lmw1s"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "venstarcolortouch" ]; + + meta = with lib; { + description = "Python interface for Venstar ColorTouch thermostats Resources"; + homepage = "https://github.com/hpeyerl/venstar_colortouch"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vidstab/default.nix index 4119b26259d..7137205b350 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vidstab/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vidstab/default.nix @@ -6,7 +6,6 @@ , imutils , progress , matplotlib -, pytest }: buildPythonPackage rec { @@ -18,11 +17,11 @@ buildPythonPackage rec { sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; # tests not packaged with pypi doCheck = false; + pythonImportsCheck = [ "vidstab" ]; meta = with lib; { homepage = "https://github.com/AdamSpannbauer/python_video_stab"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 233101728f8..6d2c19d3675 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -1,18 +1,25 @@ { buildPythonPackage -, fetchPypi -, lib -, stdenv -, pythonOlder -, isPy27 , appdirs , contextlib2 +, cython , distlib +, fetchPypi , filelock +, fish +, flaky , importlib-metadata , importlib-resources +, isPy27 +, lib , pathlib2 +, pytest-freezegun +, pytest-mock +, pytest-timeout +, pytestCheckHook +, pythonOlder , setuptools_scm , six +, stdenv }: buildPythonPackage rec { @@ -47,10 +54,37 @@ buildPythonPackage rec { ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ]; - meta = { + checkInputs = [ + cython + fish + flaky + pytest-freezegun + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Ignore tests which require network access + disabledTestPaths = [ + "tests/unit/create/test_creator.py" + "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" + ]; + + disabledTests = [ + "test_can_build_c_extensions" + "test_xonsh" # imports xonsh, which is not in pythonPackages + ]; + + pythonImportsCheck = [ "virtualenv" ]; + + meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ goibhniu ]; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/w3lib/default.nix index 0c80423e36a..a626bdd6ec0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/w3lib/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 62c8a2a06b7..28c9b8b5c16 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -1,63 +1,34 @@ { lib , rustPlatform , fetchFromGitHub -, maturin , buildPythonPackage -, isPy38 -, python }: let pname = "wasmer"; version = "1.0.0"; +in buildPythonPackage rec { + inherit pname version; - 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; + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + }; - installPhase = '' - runHook preInstall - install -Dm644 -t $out target/wheels/*.whl - runHook postInstall - ''; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; }; -in -buildPythonPackage rec { - inherit pname version; + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - format = "wheel"; - src = wheel; + buildAndTestSubdir = "packages/api"; - unpackPhase = '' - mkdir -p dist - cp $src/*.whl dist - ''; + doCheck = false; pythonImportsCheck = [ "wasmer" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 693cfcce926..31f41c50097 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/infra/libkookie/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 = "1.0.2"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI="; + 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/infra/libkookie/nixpkgs/pkgs/development/python-modules/web-cache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/web-cache/default.nix new file mode 100644 index 00000000000..9246b2b571e --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/wiffi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wiffi/default.nix new file mode 100644 index 00000000000..a3da3f2f027 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wiffi/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wiffi"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mampfes"; + repo = "python-wiffi"; + rev = version; + sha256 = "1bsx8dcmbkajh7hdgxg6wdnyxz4bfnd45piiy3yzyvszfdyvxw0f"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "wiffi" ]; + + meta = with lib; { + description = "Python module to interface with STALL WIFFI devices"; + homepage = "https://github.com/mampfes/python-wiffi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/winacl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/winacl/default.nix index c08c5541a61..9aca67e2ed8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/winacl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/python-modules/wrapio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wrapio/default.nix index bbbc1917f54..3e6a4372a64 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wrapio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wrapio/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "wrapio"; - version = "0.3.8"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo"; + sha256 = "sha256-JWcPsqZy1wM6/mbU3H0W3EkpLg0wrEUUg3pT/QrL+rE="; }; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix new file mode 100644 index 00000000000..7303a27f5b3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, six, httplib2, py, pytestCheckHook, requests, urllib3 }: + +buildPythonPackage rec { + pname = "wsgi-intercept"; + version = "1.9.2"; + + src = fetchPypi { + pname = "wsgi_intercept"; + inherit version; + sha256 = "1b6251d03jnhqywr54bzj9fnc3qzp2kvz22asxpd27jy984qx21n"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ httplib2 py pytestCheckHook requests urllib3 ]; + + disabledTests = [ + "test_http_not_intercepted" + "test_https_not_intercepted" + "test_https_no_ssl_verification_not_intercepted" + ]; + + pythonImportsCheck = [ "wsgi_intercept" ]; + + meta = with lib; { + description = "wsgi_intercept installs a WSGI application in place of a real URI for testing"; + homepage = "https://github.com/cdent/wsgi-intercept"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix index d72d4aa35d4..2fc9a98a26f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.0.nix @@ -10,9 +10,6 @@ , doxygen , ncurses , libintl -, numpy -, pillow -, six , wxGTK , wxmac , IOKit diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix index e4cb6ec79e0..a86e07729d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix @@ -6,7 +6,6 @@ , pkg-config , python , isPy27 -, pyopengl , doxygen , cairo , ncurses diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xarray/default.nix index d905a11e341..a245efe7e48 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -1,34 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , numpy , pandas -, python , setuptools , isPy3k }: buildPythonPackage rec { pname = "xarray"; - version = "0.16.1"; + version = "0.16.2"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5e1af056ff834bf62ca57da917159328fab21b1f8c25284f92083016bb2d92a5"; + sha256 = "sha256-OOhDnWyRvNW3wPyjSdr44GQ6xohQyYcmLVNSbp19AeQ="; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy pandas setuptools ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest $out/${python.sitePackages} - ''; - - # There always seem to be broken tests... - doCheck = false; - - disabled = !isPy3k; + pythonImportsCheck = [ "xarray" ]; meta = { description = "N-D labeled arrays and datasets in Python"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 221076fae84..72a54748863 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.3"; + version = "0.17.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8="; + sha256 = "sha256-FNI6zodwlYdJDxncCOubClG9L1U6HGkQxdEEp0LdW04="; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix deleted file mode 100644 index 65e2b3711fa..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchurl, isPy3k }: -buildPythonPackage rec { - pname = "xmpp.py"; - version = "0.5.0rc1"; - - patches = [ ./ssl.patch ]; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; - sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; - }; - - preInstall = '' - mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) - export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) - ''; - - disabled = isPy3k; - - meta = with lib; { - description = "XMPP python library"; - homepage = "http://xmpppy.sourceforge.net/"; - license = licenses.gpl3; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch deleted file mode 100644 index 915602dc23e..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py ---- xmpppy-0.5.0rc1/xmpp/transports.py 2009-04-07 12:34:09.000000000 +0400 -+++ xmpppy-0.5.0rc1.q/xmpp/transports.py 2015-05-08 13:06:03.049252065 +0300 -@@ -27,7 +27,7 @@ - Also exception 'error' is defined to allow capture of this module specific exceptions. - """ - --import socket,select,base64,dispatcher,sys -+import socket,ssl,select,base64,dispatcher,sys - from simplexml import ustr - from client import PlugIn - from protocol import * -@@ -312,9 +312,9 @@ - """ Immidiatedly switch socket to TLS mode. Used internally.""" - """ Here we should switch pending_data to hint mode.""" - tcpsock=self._owner.Connection -- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None) -- tcpsock._sslIssuer = tcpsock._sslObj.issuer() -- tcpsock._sslServer = tcpsock._sslObj.server() -+ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None) -+ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer') -+ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server') - tcpsock._recv = tcpsock._sslObj.read - tcpsock._send = tcpsock._sslObj.write - diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix new file mode 100644 index 00000000000..a4ca97e27ac --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "yalesmartalarmclient"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "domwillcode"; + repo = "yale-smart-alarm-client"; + rev = "v${version}"; + sha256 = "0fscp9n66h8a8khvjs2rjgm95xsdckpknadnyxqdmhw3hlj0aw6h"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "yalesmartalarmclient" ]; + + meta = with lib; { + description = "Python module to interface with Yale Smart Alarm Systems"; + homepage = "https://github.com/mampfes/python-wiffi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yapsy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yapsy/default.nix index e60b0a11473..a6471d8f07e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yapsy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yapsy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi }: @@ -16,6 +17,7 @@ buildPythonPackage rec { homepage = "http://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; + # tests fail and are not using pytest to easily disable them + broken = stdenv.isDarwin; }; - } diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zetup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zetup/default.nix index 85e950b830e..3862a8e757d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zetup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zetup/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools_scm, pathpy, nbconvert -, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, nbconvert +, pathpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "zetup"; @@ -11,18 +16,25 @@ buildPythonPackage rec { sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; }; - # Python 3.8 compatibility + # Python > 3.7 compatibility postPatch = '' substituteInPlace zetup/zetup_config.py \ - --replace "'3.7']" "'3.7', '3.8']" + --replace "'3.7']" "'3.7', '3.8', '3.9', '3.10']" ''; checkPhase = '' py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers ''; - checkInputs = [ pytest pathpy nbconvert ]; - propagatedBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ setuptools-scm ]; + + checkInputs = [ + pathpy + nbconvert + pytestCheckHook + ]; + + pythonImportsCheck = [ "zetup" ]; meta = with lib; { description = "Zimmermann's Extensible Tools for Unified Project setups"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/r-modules/cran-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/r-modules/cran-packages.nix index 1482a872dff..f579b108eb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/r-modules/cran-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/r-modules/cran-packages.nix @@ -5534,7 +5534,7 @@ in with self; { arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.9"; sha256="0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="2.0.0"; sha256="0n9g8j7bis7aga2icc8gd6mv7fnh2d5m7fy62fqs4z69l69y19r8"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; }; + arrow = derive { snapshot = "2021-02-01"; } { name="arrow"; version="3.0.0"; sha256="0wgdj6fr4vbz91s76gfwyv2q66p8z3fwf9zgk4112rjhj60q7qfq"; depends=[assertthat bit64 cpp11 purrr R6 rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.5.0"; sha256="0avi434wkk3w7axd89a4jwsbb11fi0239mkkla6zasnjwbqgjim0"; depends=[knitr]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/r-modules/default.nix b/infra/libkookie/nixpkgs/pkgs/development/r-modules/default.nix index e827c9b807f..fe823c17d93 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/r-modules/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/r-modules/default.nix @@ -231,6 +231,7 @@ let }; packagesWithNativeBuildInputs = { + arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ]; adimpro = [ pkgs.imagemagick ]; animation = [ pkgs.which ]; audio = [ pkgs.portaudio ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 00c6fb73214..791ae3d0d31 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -201,13 +201,23 @@ in gitlab-markup = attrs: { meta.priority = 1; }; - gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.1") { dontBuild = false; postPatch = '' - sed -i 's;"https://gitlab.com.*";"${fetchurl { - url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz"; - sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j"; - }}";' ext/pg_query/extconf.rb + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.3"; + sha256 = "0jfij8apzxsdabl70j42xgd5f3ka1gdcrk764nccp66164gpcchk"; + }}';" ext/pg_query/extconf.rb + ''; + }; + + pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + dontBuild = false; + postPatch = '' + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.4"; + sha256 = "0f0kshhai0pnkqj0w4kgz3fssnvwidllc31n1fysxjjzdqlr1k48"; + }}';" ext/pg_query/extconf.rb ''; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix b/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix index 946854e4545..bcd9a787f7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ruby-modules/with-packages/test.nix @@ -6,7 +6,6 @@ let stdenv = pkgs.stdenv; rubyVersions = with pkgs; [ - ruby_2_5 ruby_2_6 ruby_2_7 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/air/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/air/default.nix new file mode 100644 index 00000000000..912328ead26 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ameba/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ameba/default.nix index 13e9c56be9f..48182760dca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index e5325f7da8c..d6fa39036aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 4d7bc7c277b..fb5d5b0c53f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 5578e03dc96..5c6fd8e3b90 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.144.0"; + version = "0.145.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU="; + sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4="; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix index 35c75d67da5..30df5daed6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix index 0ef33270e92..f7f933392ab 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix +++ b/infra/libkookie/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 @@ -23,6 +22,8 @@ rustPlatform.buildRustPackage rec { git ]; + dontWrapQtApps = true; + cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index a75445c363b..3aa37d650cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.29.0"; + version = "6.30.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "08iibpf9jhkk7ihsmlm85wpjwy1bvznbvggvqyw6109f9gzlrvvq"; + sha256 = "sha256-LgQmoUdsG5sAyHs9YyiaOFonMFaVtHKdp/KvSAWSy8w="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index 0145e51ee26..5e321db01aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -12,6 +12,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 14153b920e8..1c26f64b21a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.38.1"; + version = "0.38.4"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ezTmtKR6ng3fuVJzLP81o0aoaqu3XPUMF0BIKFCwXdw="; + sha256 = "sha256-BWWW54AXj/aV+Yar0EVZPl9fN2l29SgzpRDin1Y76BA="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 0859ed51323..1429fcab4c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,5 +1,4 @@ -{ fetchFromGitHub -, lib +{ lib , python3 , enableTelemetry ? false }: diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix index 98a6bcd5bbc..6b94ed0a93f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix index ba9412c286c..39379924178 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 182b8633aa0..93644caa5a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix index d88068c1c3e..d2ef8361ec0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index 4658703f8b1..3a1866e0b39 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index 12fd01e5e4e..1b4f74f91d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.6"; + version = "1.4.8"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "1fx80yrf03llhxcd8az5vzralz01wdfk7000q8l04rj1ax3daqia"; + sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70"; }; bloop-bash = fetchurl { @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hg02a3ildgqv8864zg08hvk4y0kmsxsg7ncbsl933rclhk2lybd" - else if stdenv.isDarwin && stdenv.isx86_64 then "1i9kh4h5w3gr4w6rf5m7xpfqwps91mfddl1zk25v7f6vsraayam0" - else throw "unsupported platform"; + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa" + else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r" + else throw "unsupported platform"; }; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 5e5875cc36c..7c2e5372e73 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -14,18 +14,18 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" + 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 = [ @@ -130,4 +130,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; }; -} +} // (if withQt5 then { dontWrapQtApps = true; } else {}) +) diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index c73b7149a36..da5e11cce2c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index d314064904d..4c5d9a5df80 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/infra/libkookie/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"; @@ -54,12 +55,12 @@ rec { gradle_latest = gradle_6_8; gradle_6_8 = gradleGen rec { - name = "gradle-6.8.1"; + name = "gradle-6.8.3"; nativeVersion = "0.22-milestone-9"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1zfn7400k39qbiidd5zxay6v5f5xz8x4g7rrf04p71bkmws1lngx"; + sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz"; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 488697033d9..51b97b242d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 3bf7623ed04..73c23b88752 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ]; buildInputs = [ qtbase qtscript ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix index d22f4bc487f..093a825723c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index efc6523cd98..f25dfe6c28a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,24 +1,25 @@ { lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript -, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused -, nixosTests }: +, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused }: stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "830b72140583e2790bbd3649890ac8ef5371d0c6"; - version = "2021-02-04"; + rev = "2c582cdbb37dd487bf2140010ddd2e20f3c1394e"; + version = "2021-03-03"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0wq2mf8s254ns0sss5q394c1j2rnvl42x9l6kkrav505hbx0gyq6"; + sha256 = "1j4j46gzw05bis7akvzfdj36xdwxcabq66wyf917z8vsy31vvajp"; }; 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"' @@ -26,43 +27,44 @@ stdenv.mkDerivation rec { install bin/sbt $out/bin wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} - ''; - passthru = { - tests = { inherit (nixosTests) sbt-extras; }; - - updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -xo errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - curl - cacert - git - nixfmt - nix - jq - coreutils - gnused - ] - } + runHook postInstall + ''; - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + doInstallCheck = true; + installCheckPhase = '' + $out/bin/sbt -h >/dev/null + ''; - if [ ! "null" = "$latestSha" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" - latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version ${pname} "$latestSha" --version-key=rev - update-source-version ${pname} "$latestDate" --ignore-same-hash - nixfmt "$default_nix" - else - echo "${pname} is already up-to-date" - fi - ''; - }; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -xo errexit + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + cacert + git + nixfmt + nix + jq + coreutils + gnused + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + if [ ! "null" = "$latestSha" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" + latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version ${pname} "$latestSha" --version-key=rev + update-source-version ${pname} "$latestDate" --ignore-same-hash + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; meta = { description = diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 9e45c3e8b90..7ea10ac90ab 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript -, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: +{ lib +, stdenv +, fetchurl +, jre +, autoPatchelfHook +, zlib +}: stdenv.mkDerivation rec { pname = "sbt"; @@ -11,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0="; }; - patchPhase = '' + postPatch = '' echo -java-home ${jre.home} >>conf/sbtopts ''; @@ -20,12 +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 + + runHook postInstall ''; meta = with lib; { @@ -35,35 +44,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nequissimus ]; platforms = platforms.unix; }; - - passthru = { - tests = { inherit (nixosTests) sbt; }; - - updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -o errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - git - nixfmt - nix - coreutils - gnused - ] - } - - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')" - latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" - - if [ ! "$oldVersion" = "$latestTag" ]; then - update-source-version sbt "$latestTag" --version-key=version --print-changes - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix" - nixfmt "$default_nix" - else - echo "sbt is already up-to-date" - fi - ''; - }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index 8cab1667b21..5c852f21557 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , crystal_0_34 -, crystal_0_35 +, crystal_0_36 }: let generic = @@ -36,17 +36,18 @@ let in rec { + # needed for anything that requires the old v1 shards format shards_0_11 = generic { version = "0.11.1"; sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71"; crystal = crystal_0_34; }; - shards_0_12 = generic { + shards_0_13 = generic { version = "0.12.0"; sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c"; - crystal = crystal_0_35; + crystal = crystal_0_36; }; - shards = shards_0_12; + shards = shards_0_13; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix index 68c1e945191..24ee987099b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,17 +14,21 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.4"; + version = "1.19.6"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0hyjyk3yw2yjb47j9kd6as5bsa2wkjricnx0803sg2p4qc8rb72f"; + sha256 = "sha256-YTguBkQcMNjHMVMEN3/P+8fOC5eqmQvlRd1ny9umS/4="; }; outputs = [ "out" "man" ]; + patches = [ + ../../../applications/virtualization/podman/remove-unconfigured-runtime-warn.patch + ]; + vendorSha256 = null; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix index dfa465cfdea..a31dece7df5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/buildah/wrapper.nix @@ -17,6 +17,8 @@ let buildah = buildah-unwrapped; + preferLocalBuild = true; + binPath = lib.makeBinPath ([ runc crun diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix index 55894058794..806eb7c5b0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/checkmake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/checkmake/default.nix new file mode 100644 index 00000000000..3c21af8ff38 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile index 47451c66d27..0717cd32232 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'chef-dk', '4.7.73' +gem 'chef-dk', '4.13.3' gem 'pry' gem 'test-kitchen' gem 'inspec' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock index ce23018bd73..1f71a4a7132 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.1) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -9,166 +9,213 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) app_conf (0.4.2) - ast (2.4.0) - aws-eventstream (1.0.3) - aws-partitions (1.275.0) - aws-sdk-apigateway (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + ast (2.4.2) + aws-eventstream (1.1.0) + aws-partitions (1.426.0) + aws-sdk-apigateway (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.15.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-apigatewayv2 (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.22.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-applicationautoscaling (1.49.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.22.0) - aws-sdk-core (~> 3, >= 3.52.1) + aws-sdk-athena (1.35.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-autoscaling (1.53.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-batch (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.19.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-budgets (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudformation (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudfront (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.32.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsm (1.28.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsmv2 (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudtrail (1.33.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatch (1.49.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchevents (1.40.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.40.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchlogs (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.90.1) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sdk-codecommit (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codedeploy (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentity (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentityprovider (1.48.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.56.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.112.0) + aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-costandusagereportservice (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-databasemigrationservice (1.50.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-dynamodb (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecr (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.43.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ecs (1.74.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.144.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-efs (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.25.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-eks (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.57.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticache (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticbeanstalk (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancing (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.26.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancingv2 (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.19.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticsearchservice (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.39.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-firehose (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-glue (1.82.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.24.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-guardduty (1.44.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.33.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.17.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kafka (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kinesis (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-lambda (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-organizations (1.17.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.78.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-organizations (1.55.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.37.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ram (1.22.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-rds (1.112.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-redshift (1.54.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.11.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-route53 (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.60.2) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-route53domains (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53resolver (1.23.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-ses (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-sms (1.17.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-sns (1.21.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.23.1) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.71.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - azure_graph_rbac (0.17.1) - ms_rest_azure (~> 0.11.0) - azure_mgmt_key_vault (0.17.5) - ms_rest_azure (~> 0.11.1) - azure_mgmt_resources (0.17.8) - ms_rest_azure (~> 0.11.1) - azure_mgmt_security (0.18.0) - ms_rest_azure (~> 0.11.1) - azure_mgmt_storage (0.19.2) - ms_rest_azure (~> 0.11.1) - backports (3.16.1) - bcrypt_pbkdf (1.0.1) - berkshelf (7.0.9) - chef (>= 13.6.52) + aws-sdk-secretsmanager (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-securityhub (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-servicecatalog (1.57.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-ses (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-shield (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sms (1.28.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sns (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ssm (1.104.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-states (1.37.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-transfer (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + azure_graph_rbac (0.17.2) + ms_rest_azure (~> 0.12.0) + azure_mgmt_key_vault (0.17.7) + ms_rest_azure (~> 0.12.0) + azure_mgmt_resources (0.18.1) + ms_rest_azure (~> 0.12.0) + azure_mgmt_security (0.19.0) + ms_rest_azure (~> 0.12.0) + azure_mgmt_storage (0.22.0) + ms_rest_azure (~> 0.12.0) + bcrypt_pbkdf (1.1.0) + berkshelf (7.1.0) + chef (>= 15.7.32) chef-config cleanroom (~> 1.0) concurrent-ruby (~> 1.0) @@ -181,18 +228,18 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (15.8.23) + chef (15.15.0) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.8.23) - chef-utils (= 15.8.23) + chef-config (= 15.15.0) + chef-utils (= 15.15.0) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) ffi (~> 1.9, >= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 2) iniparse (~> 1.4) @@ -202,37 +249,37 @@ GEM mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 15.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.1) + train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef-cli (2.0.0) - addressable (>= 2.3.5, < 2.6) - chef (>= 14.0) + chef-cli (3.1.1) + addressable (>= 2.3.5, < 2.8) + chef (>= 15.0) cookbook-omnifetch (~> 0.5) - diff-lcs (~> 1.0) + diff-lcs (>= 1.0, < 1.4) ffi-yajl (>= 1.0, < 3.0) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3) minitar (~> 0.6) mixlib-cli (>= 1.7, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - paint (~> 1.0) + pastel (~> 0.7) solve (> 2.0, < 5.0) - chef-config (15.8.23) + chef-config (15.15.0) addressable - chef-utils (= 15.8.23) + chef-utils (= 15.15.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-dk (4.7.73) + chef-dk (4.13.3) addressable (>= 2.3.5, < 2.6) chef (~> 15.0) cookbook-omnifetch (~> 0.5) @@ -254,13 +301,12 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.0) - chef-telemetry (1.0.3) + chef-telemetry (1.0.14) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - http (~> 2.2) - chef-utils (15.8.23) - chef-vault (4.0.1) + chef-utils (15.15.0) + chef-vault (4.1.0) chef-zero (14.0.17) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) @@ -270,51 +316,47 @@ GEM cheffish (14.0.13) chef-zero (~> 14.0) net-ssh - chefspec (9.1.0) + chefspec (9.2.1) chef (>= 14) chef-cli fauxhai-ng (>= 7.5) rspec (~> 3.0) cleanroom (1.0.0) - coderay (1.1.2) - concurrent-ruby (1.1.6) - cookbook-omnifetch (0.9.1) + coderay (1.1.3) + concurrent-ruby (1.1.8) + cookbook-omnifetch (0.11.1) mixlib-archive (>= 0.4, < 2.0) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-tag_expressions (1.1.1) - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) diff-lcs (1.3) - diffy (3.3.0) - docker-api (1.34.2) + diffy (3.4.0) + docker-api (2.0.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) - equatable (0.6.1) - erubi (1.9.0) + erubi (1.10.0) erubis (2.7.0) - excon (0.72.0) - faraday (0.17.3) + excon (0.79.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - fauxhai-ng (7.6.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fauxhai-ng (8.7.0) net-ssh - ffi (1.12.2) - ffi-libarchive (1.0.0) + ffi (1.14.2) + ffi-libarchive (1.0.17) ffi (~> 1.0) - ffi-yajl (2.3.3) + ffi-yajl (2.3.4) libyajl2 (~> 1.2) - foodcritic (16.2.0) - cucumber-core (>= 1.3, < 4.0) + foodcritic (16.3.0) erubis ffi-yajl (~> 2.0) nokogiri (>= 1.5, < 2.0) @@ -322,138 +364,124 @@ GEM rufus-lru (~> 1.0) treetop (~> 1.4) fuzzyurl (0.9.0) - gherkin (5.1.0) - git (1.6.0) + git (1.8.1) rchardet (~> 1.8) - google-api-client (0.34.1) + google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) - googleauth (0.10.0) - faraday (~> 0.12) + googleauth (0.14.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.12) - gssapi (1.3.0) + signet (~> 0.14) + gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.6.0) highline (1.7.10) - htmlentities (4.3.4) - http (2.2.2) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 1.0.1) - http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) - http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.8) concurrent-ruby (~> 1.0) inifile (3.0.0) - iniparse (1.4.4) - inspec (4.18.85) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.18.85) + iniparse (1.5.0) + inspec (4.26.4) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.26.4) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.18.85) + inspec-core (4.26.4) addressable (~> 2.4) chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - htmlentities (~> 4.3) - json-schema (~> 2.8) - license-acceptance (>= 0.2.13, < 2.0) - method_source (~> 0.8) + faraday (>= 0.9.0, < 1.4) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0) - rspec (~> 3.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) sslshake (~> 1.2) - term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) - tomlrb (~> 1.2) + tomlrb (>= 1.2, < 2.1) train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) - jaro_winkler (1.5.4) jmespath (1.4.0) - json (2.3.0) - json-schema (2.8.1) - addressable (>= 2.4) - jwt (2.2.1) - kitchen-inspec (1.3.1) - hashie (~> 3.4) - inspec (>= 1.47, < 5.0) - test-kitchen (>= 1.6, < 3) - kitchen-vagrant (1.6.1) + json (2.5.1) + jwt (2.2.2) + kitchen-inspec (2.3.0) + hashie (>= 3.4, <= 5.0) + inspec (>= 2.2.64, < 5.0) + test-kitchen (>= 2.7, < 3) + kitchen-vagrant (1.8.0) test-kitchen (>= 1.4, < 3) - knife-spork (1.7.2) + knife-spork (1.7.3) app_conf (>= 0.4.0) chef (>= 11.0.0) diffy (>= 3.0.1) git (>= 1.2.5) libyajl2 (1.2.0) - license-acceptance (1.0.13) + license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) memoist (0.16.2) - method_source (0.9.2) + method_source (1.0.0) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitar (0.9) - minitest (5.14.0) - mixlib-archive (1.0.5) + minitest (5.14.3) + mixlib-archive (1.1.4) mixlib-log - mixlib-authentication (3.0.6) - mixlib-cli (2.1.5) - mixlib-config (3.0.6) + mixlib-authentication (3.0.7) + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - mixlib-install (3.11.26) + mixlib-install (3.12.5) mixlib-shellout mixlib-versioning thor - mixlib-log (3.0.8) - mixlib-shellout (3.0.9) + mixlib-log (3.0.9) + mixlib-shellout (3.2.2) + chef-utils mixlib-versioning (1.2.12) - molinillo (0.6.6) - ms_rest (0.7.5) + molinillo (0.7.0) + ms_rest (0.7.6) concurrent-ruby (~> 1.0) - faraday (~> 0.9) + faraday (>= 0.9, < 2.0.0) timeliness (~> 0.3.10) - ms_rest_azure (0.11.1) + ms_rest_azure (0.12.0) concurrent-ruby (~> 1.0) - faraday (~> 0.9) + faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) - ms_rest (~> 0.7.4) - unf_ext (= 0.0.7.2) - multi_json (1.14.1) + ms_rest (~> 0.7.6) + multi_json (1.15.0) multipart-post (2.1.1) - necromancer (0.5.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -464,13 +492,14 @@ GEM net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nori (2.6.0) - octokit (4.16.0) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (15.7.4) + ohai (15.12.0) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -482,26 +511,27 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - os (1.0.1) + os (1.1.1) paint (1.0.1) - parallel (1.19.1) - parser (2.7.0.2) - ast (~> 2.4.0) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) parslet (1.8.2) - pastel (0.7.3) - equatable (~> 0.6) + pastel (0.8.0) tty-color (~> 0.5) - plist (3.5.0) + plist (3.6.0) polyglot (0.3.5) proxifier (1.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.14.0) + coderay (~> 1.1) + method_source (~> 1.0) public_suffix (3.1.1) - rack (2.2.2) + racc (1.5.2) + rack (2.2.3) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rchardet (1.8.0) + regexp_parser (2.0.3) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -509,110 +539,118 @@ GEM retriable (3.1.2) retryable (3.0.5) rexml (3.2.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.9.1) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - rubocop (0.80.0) - jaro_winkler (~> 1.5.1) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.9.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) rexml + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.10.1) - rubyntlm (0.6.2) - rubyzip (1.3.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.4) + rubyntlm (0.6.3) + rubyzip (2.3.0) rufus-lru (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) semverse (3.0.0) - signet (0.12.0) + signet (0.14.1) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - solve (4.0.3) + solve (4.0.4) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) - sslshake (1.3.0) - strings (0.1.8) - strings-ansi (~> 0.1) + sslshake (1.3.1) + strings (0.2.0) + strings-ansi (~> 0.2) unicode-display_width (~> 1.5) unicode_utils (~> 1.4) strings-ansi (0.2.0) - sync (0.5.0) syslog-logger (1.6.8) systemu (2.6.5) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-kitchen (2.3.4) + test-kitchen (2.10.0) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 4.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 6.0) + net-scp (>= 1.1, < 4.0) + net-ssh (>= 2.9, < 7.0) net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) + thor (>= 0.19, < 2.0) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (0.20.3) + thor (1.1.0) thread_safe (0.3.6) timeliness (0.3.10) - tins (1.24.1) - sync - tomlrb (1.2.9) - train (3.2.22) - activesupport (~> 5.2.3) + tomlrb (1.3.0) + train (3.4.9) + activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) - docker-api (~> 1.26) - google-api-client (>= 0.23.9, < 0.35.0) - googleauth (>= 0.6.6, < 0.11.0) - train-core (= 3.2.22) + docker-api (>= 1.26, < 3.0) + google-api-client (>= 0.23.9, <= 0.52.0) + googleauth (>= 0.6.6, <= 0.14.0) + inifile (~> 3.0) + train-core (= 3.4.9) train-winrm (~> 0.2) - train-aws (0.1.15) + train-aws (0.1.35) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-applicationautoscaling (>= 1.46, < 1.50) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-autoscaling (>= 1.22, < 1.54) + aws-sdk-batch (>= 1.36, < 1.44) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) + aws-sdk-cloudfront (~> 1.0) aws-sdk-cloudhsm (~> 1.0) aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchevents (>= 1.36, < 1.41) aws-sdk-cloudwatchlogs (~> 1.13) aws-sdk-codecommit (~> 1.0) aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) + aws-sdk-cognitoidentity (>= 1.26, < 1.30) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.49) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-databasemigrationservice (>= 1.42, < 1.51) aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) aws-sdk-ecs (~> 1.30) + aws-sdk-efs (~> 1.0) aws-sdk-eks (~> 1.9) aws-sdk-elasticache (~> 1.0) aws-sdk-elasticbeanstalk (~> 1.0) @@ -620,68 +658,74 @@ GEM aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-firehose (~> 1.0) + aws-sdk-glue (>= 1.71, < 1.83) + aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-organizations (~> 1.17.0) + aws-sdk-organizations (>= 1.17, < 1.56) + aws-sdk-ram (>= 1.21, < 1.23) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) aws-sdk-route53domains (~> 1.0) aws-sdk-route53resolver (~> 1.0) aws-sdk-s3 (~> 1.30) + aws-sdk-secretsmanager (>= 1.42, < 1.44) aws-sdk-securityhub (~> 1.0) + aws-sdk-servicecatalog (>= 1.48, < 1.58) aws-sdk-ses (~> 1.0) + aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.2.22) + aws-sdk-states (>= 1.35, < 1.38) + aws-sdk-transfer (>= 1.26, < 1.30) + train-core (3.4.9) addressable (~> 2.5) - inifile (~> 3.0) + ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) - net-ssh (>= 2.9, < 6.0) - train-habitat (0.2.13) - train-winrm (0.2.6) - winrm (~> 2.0) + net-scp (>= 1.2, < 4.0) + net-ssh (>= 2.9, < 7.0) + train-habitat (0.2.22) + train-winrm (0.2.12) + winrm (>= 2.3.6, < 3.0) + winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) - treetop (1.6.10) + treetop (1.6.11) polyglot (~> 0.3) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) tty-cursor (~> 0.7) - tty-color (0.5.1) + tty-color (0.6.0) tty-cursor (0.7.1) - tty-prompt (0.20.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.7.0) - tty-reader (0.7.0) + tty-prompt (0.23.0) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.7.1) - tty-table (0.11.0) - equatable (~> 0.6) - necromancer (~> 0.5) - pastel (~> 0.7.2) - strings (~> 0.1.5) - tty-screen (~> 0.7) - tzinfo (1.2.6) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.6.1) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) unicode_utils (1.4.0) uuidtools (2.1.5) - winrm (2.3.4) + winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) @@ -689,15 +733,15 @@ GEM httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.1) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) wmi-lite (1.0.5) @@ -707,7 +751,7 @@ PLATFORMS DEPENDENCIES berkshelf - chef-dk (= 4.7.73) + chef-dk (= 4.13.3) chef-provisioning chef-vault chefspec diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/default.nix index 1a5f6c8626a..6a1470e1074 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - name = "chef-dk-4.7.73"; + name = "chef-dk-4.13.3"; inherit ruby; gemdir = ./.; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/gemset.nix index 1f9522ba4c5..14c81742cd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/chefdk/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,30 +36,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkzzk4mxsxvnd8sr5xx57vc29j69h48gj2g24fzjn7ika6az18z"; + sha256 = "0nrqbbzykj9ckri3ci1wsksy8rhz13rigm3aznxy08gqvzv7bcy9"; type = "gem"; }; - version = "1.275.0"; + version = "1.426.0"; }; aws-sdk-apigateway = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106wn66gnn1rk9z4w84iwqb26wbyz3i2q9ck3xxabc47ly9mj03m"; + sha256 = "15vwm6a18v1xqfpn2ipx1h5wqwd5yipgp624p4pkchcdqacb7gvm"; type = "gem"; }; - version = "1.36.0"; + version = "1.59.0"; }; aws-sdk-apigatewayv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -78,10 +78,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x9qaxi1614pfp9hy5ywk7y76gfmk5d0iz6lj9p9qy92gfzx169c"; + sha256 = "171v0xng5h6hk1nqrivv49rpz1f4jhj2lhq3pxk5izx3q1lf7rc7"; type = "gem"; }; - version = "1.15.0"; + version = "1.31.0"; + }; + aws-sdk-applicationautoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01zldlqn573bmlpg7qm562cy9miyrirzknagjbnzs4iwjnm4rgn4"; + type = "gem"; + }; + version = "1.49.0"; }; aws-sdk-athena = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -89,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hvskqq406vh9xa29jzyjhfpf6m834872p87a2j0ly5kh4ydldkz"; + sha256 = "0lmbchjn30rpk311q2z5g8j96g5mi8hajc3fbzh3nam7wj4hmdbn"; type = "gem"; }; - version = "1.22.0"; + version = "1.35.0"; }; aws-sdk-autoscaling = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -100,10 +111,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jrz4brxbi8rxqk1jg5wcdsa1knfrgzrmx9dygfzbfi2szcfmbhv"; + sha256 = "1vkfybjdmxn7hwsywfgkcr8mms88l4v6kwj29c8qr2k7ds4l4bsn"; type = "gem"; }; - version = "1.22.0"; + version = "1.53.0"; + }; + aws-sdk-batch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14q0b84qa5mc24nw1fqns822wkg1gvlwvwbia1m7bzzmj98maikw"; + type = "gem"; + }; + version = "1.43.0"; }; aws-sdk-budgets = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -111,10 +133,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xxgldgin1gavz7w37pmsxrhiwr8bvssjgv3lwzbwdsjqk0jd0f3"; + sha256 = "0lm7m09fp5jlranzv1hfc3xv8fn6bmw2g3kwjsj6r094qi3nyp42"; type = "gem"; }; - version = "1.27.0"; + version = "1.37.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -122,10 +144,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxipaq1g6c5g8zirqlbq74kmy8fglavhyrxyd91sy9yj2d9q26r"; + sha256 = "09lcq8gpi4x7xvwy8njmbcbbgyrq6xsfbyc7hwj3m4dps9f116gw"; type = "gem"; }; - version = "1.30.0"; + version = "1.47.0"; + }; + aws-sdk-cloudfront = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w70d8wv5cb8p5wpyq828fjrccz0xxbvg5sk66bmwq0zjcxnvpb6"; + type = "gem"; + }; + version = "1.48.0"; }; aws-sdk-cloudhsm = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -133,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096dpm87k0q1kqnvf5v0sb98gdsq41390pxvs014qphqycqjchc6"; + sha256 = "0a4imw0rahd6bh4clcwxkcvl4lf8pmyba1sjlc1hx37jv641wlqf"; type = "gem"; }; - version = "1.19.0"; + version = "1.28.0"; }; aws-sdk-cloudhsmv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -144,10 +177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cyc1brjppnkmynkb3qf7ar78a4dhngg3fmmfxnxlcrigwbrxpa"; + sha256 = "13kdq0xnbgrvi9f9jqrig453bc5mf7by3cjcdd8jsv8aay0gqads"; type = "gem"; }; - version = "1.20.0"; + version = "1.32.0"; }; aws-sdk-cloudtrail = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -155,10 +188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034psp0g7ab9al7389y64pr2ar2jvxsg6p1djj4w53700xrj602g"; + sha256 = "083nld91s8klfr2p0mwrdlx4lgiig9kx0cikiqrifd30lbja51wg"; type = "gem"; }; - version = "1.20.0"; + version = "1.33.0"; }; aws-sdk-cloudwatch = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -166,10 +199,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvjjlcyp1sx0gsgm82h84n32sb51m8ih53ab4qq94m9jcxk49cr"; + sha256 = "1vsb01nw85sk3zsdyw5ix0yw3n81xjhj4h0431qm60mdg9akgbs4"; type = "gem"; }; - version = "1.32.0"; + version = "1.49.0"; + }; + aws-sdk-cloudwatchevents = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hhy8zbyn5x2660pg5aq02lni69clx3y7rkvzqrldcy0482863y"; + type = "gem"; + }; + version = "1.40.0"; }; aws-sdk-cloudwatchlogs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -177,10 +221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhnlh3skqw3l2yfr6nd97arlcmijpm51k664m51l5xw2971bc51"; + sha256 = "0aravrxjnp886kaag037z45xiyfr75gz0p4psjq9x3qj6gzsjn8y"; type = "gem"; }; - version = "1.28.0"; + version = "1.39.0"; }; aws-sdk-codecommit = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -188,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00mkgfywxqzbbin2qidx4qvb5xcjjl41v6am023bl2yww5x8hi5p"; + sha256 = "1cb1bqlf3kh8akll1xybrn314ngk62jqhpli99kdjq27hxir5jq2"; type = "gem"; }; - version = "1.30.0"; + version = "1.41.0"; }; aws-sdk-codedeploy = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -199,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m5i5g2j2yylksficbla25cjsdw42y5gbzmx5ycxvxz3c4n3qh1"; + sha256 = "117rv0hx77kyhz9zm1fqbxdbk3lhyxcbibwn27nyafch6sl1x2j4"; type = "gem"; }; - version = "1.27.0"; + version = "1.38.0"; }; aws-sdk-codepipeline = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -210,10 +254,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09dkyclanvxz77hh933ph2ad4yh7midy09hbprszfikhfkvi4z2m"; + sha256 = "0xdkc3xmff901bjfsyg454dn27gfr6nzvgkia0kngdzgq6x4xb45"; type = "gem"; }; - version = "1.28.0"; + version = "1.40.0"; + }; + aws-sdk-cognitoidentity = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122i3g320ccaqg541kzb0pawiz61zyphvbwnkv5rlqpwspca1m3b"; + type = "gem"; + }; + version = "1.29.0"; + }; + aws-sdk-cognitoidentityprovider = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m09dxwyw01vh9rksz8dwdx36vsr8f7p5qmjmvfazjapzv3q6qmn"; + type = "gem"; + }; + version = "1.48.0"; }; aws-sdk-configservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -221,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjw5jv4p9zhdh4cg982x7x3lpfhgi7an14gjwz1llxmmkzv15wr"; + sha256 = "1msdg1gpq9y9maf2fdljcp2vbydbjqfk07ff9j532bvikax0qmfy"; type = "gem"; }; - version = "1.40.0"; + version = "1.56.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -232,10 +298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.90.1"; + version = "3.112.0"; }; aws-sdk-costandusagereportservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -243,10 +309,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yzz7av4z8qh321r0ih6m5lc1x4mh10pn67z6y70ny8syxm4kl6"; + sha256 = "1dzbh8xf8j466gwrawmprwclslvd8sqlzzzxpzyxv4y9m09bhypk"; type = "gem"; }; - version = "1.18.0"; + version = "1.29.0"; + }; + aws-sdk-databasemigrationservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vd4a5z1q282xx7717f542yavb6x13fli64rhwnc143xij4izgpn"; + type = "gem"; + }; + version = "1.50.0"; }; aws-sdk-dynamodb = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -254,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06nbf297r85ix92x9ilx8ysz67sm59mprscmmdp4rsn74v78dzaj"; + sha256 = "19k3iznglnwwgqd95i5zmim41c98l8ydf6ih9am50gs0n6bky41q"; type = "gem"; }; - version = "1.43.0"; + version = "1.59.0"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -265,10 +342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.144.0"; + version = "1.224.0"; }; aws-sdk-ecr = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -276,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1smq30avqjq6h4yvw9h0k2gwp97c4l4868f2vdj93l84i80gh1pi"; + sha256 = "0di8s9dpyzal5n2qpx8l3jnbkm72h6kz759l04kxfapgzd5ppwhv"; type = "gem"; }; - version = "1.25.0"; + version = "1.41.0"; }; aws-sdk-ecs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -287,10 +364,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "113kwczkqr4jsyrnnxkm0kpdqs3ysc0913nclb5mdwapd5dbq3br"; + sha256 = "0qilim7dm5hc4knhvz9090hzbmlrd24m5fywj9kr60fvhgnm0wf0"; type = "gem"; }; - version = "1.57.0"; + version = "1.74.0"; + }; + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03bf0g1nky772r4xz3w6nvpf09wf1096qifd0i8hgzp7cwirbmby"; + type = "gem"; + }; + version = "1.37.0"; }; aws-sdk-eks = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -298,10 +386,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h3bvqizz95lngmpsgysdpnn1fshrppfc6zq3qphv5hagpa1gj5n"; + sha256 = "0nj666bl877n61h6s570ad9mcvjq4m2s6yink218zslfp10y03v4"; type = "gem"; }; - version = "1.31.0"; + version = "1.47.0"; }; aws-sdk-elasticache = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -309,10 +397,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0805g31chgr65bc74g8s33vk8id0gmyzvwpxjvf5drsrplbv1kca"; + sha256 = "1kgpn2n1ap943q5nzxrl95v6g7fyff6bw5i4mhcw6g97gvv7p675"; type = "gem"; }; - version = "1.29.0"; + version = "1.53.0"; }; aws-sdk-elasticbeanstalk = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -320,10 +408,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxrcfwngmbrvcbxh0cl6mqbvxda82k9kpjr1a0agypazapmy980"; + sha256 = "1a9k9srp1q5qhlcwna7zyvviimri4gi9smlqshbvcfvy2lys5w2z"; type = "gem"; }; - version = "1.26.0"; + version = "1.41.0"; }; aws-sdk-elasticloadbalancing = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -331,10 +419,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mc6mahnnrcgf2ah3p12sm538mfdygz6a6afgwijaar0za126l3"; + sha256 = "1n6ssl3hqqm658k5ig667bgy457rs8gynl8vvin4xwknxws186di"; type = "gem"; }; - version = "1.19.0"; + version = "1.30.0"; }; aws-sdk-elasticloadbalancingv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -342,10 +430,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvv3wlp7bm2f1cfkd8cvwz51kg6pzj8cw6jh4fvlnahx7cilr0"; + sha256 = "0cqb2bncvqqqcqks7d6lrjb7pl06fcjizdfjpr44a7v6sjyx3bcr"; type = "gem"; }; - version = "1.39.0"; + version = "1.59.0"; }; aws-sdk-elasticsearchservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -353,10 +441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lzm94grzggz6vrlzbk6226vlyfnxbq0rih71vdnj1h63f8gj73m"; + sha256 = "1379lp7jqigp03zv25fgbx4bwacypjj38qbki648398r161f4bzy"; type = "gem"; }; - version = "1.30.0"; + version = "1.48.0"; }; aws-sdk-firehose = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -364,10 +452,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpx6r6z2gfybfsndi7n6wr6zv6gqzfz9fm39wj8ljhsmbf2p2ch"; + sha256 = "0ji75vqfprnkjsy6gdk9qci6wd9kwm7h7lycpx7jsw0fbv6hjx0p"; type = "gem"; }; - version = "1.24.0"; + version = "1.36.0"; + }; + aws-sdk-glue = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "026hka71fnzmqrn5yyb50pz1wa44irqncsk6kcgb476px4zxqwmd"; + type = "gem"; + }; + version = "1.82.0"; + }; + aws-sdk-guardduty = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n963y20rafh51xanx0bff7jqbjcgg3wj5hs4js8h9sax48k97q9"; + type = "gem"; + }; + version = "1.44.0"; }; aws-sdk-iam = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -375,10 +485,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.33.0"; + version = "1.47.0"; }; aws-sdk-kafka = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -386,10 +496,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6pixxh9vfq2bhm89h1jpdzpikh600xmp1m1zqh9k8qa62g0glm"; + sha256 = "182g1ya4bhxw90zb0jfqlb5s46r8k3mvl2dczir5jamjp2h1n24y"; type = "gem"; }; - version = "1.17.0"; + version = "1.34.0"; }; aws-sdk-kinesis = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -397,10 +507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mx60qi7sgr8a2k8h1c0ify2l3dvp509hflmbwq87jgq6npz89jr"; + sha256 = "1wsnn4303q7501xp10gfr8s15cazm4a0xy8knz5b8pmaw93x0g4b"; type = "gem"; }; - version = "1.20.0"; + version = "1.31.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -408,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.29.0"; + version = "1.42.0"; }; aws-sdk-lambda = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -419,10 +529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16llkc8dl88m2f58kpn81lnw37zlh0ghlb1g5bzli5hm8ygn1z5s"; + sha256 = "15fvdqp8k5w7wjgc7f5h9syd8v14h8pzklg5ldb49n5jsr0i3n73"; type = "gem"; }; - version = "1.36.0"; + version = "1.59.0"; }; aws-sdk-organizations = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -430,10 +540,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z71zxsvz1g3i6mnpvb05gzk2lay4dzrl45lby8n7acpp4wb2j1g"; + sha256 = "00i8kbcx1vdch1g6pznvm0hg0hsz2kfd5vpdlfarbilv6zyh9mp7"; + type = "gem"; + }; + version = "1.55.0"; + }; + aws-sdk-ram = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04n9x3nrxakx1zys0cc6vmkyqlqa83h6abdfyqaah1icxp585zjb"; type = "gem"; }; - version = "1.17.0"; + version = "1.22.0"; }; aws-sdk-rds = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -441,10 +562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ld8vrhrhywc4imvbj238pic7qi2mg1n3421s0iwd1xhf5fvakp"; + sha256 = "1jnmk7z4ys13vv2i1r6pvpiblgaqlpvjhcslcnqyqlmjh2ydwjxk"; type = "gem"; }; - version = "1.78.0"; + version = "1.112.0"; }; aws-sdk-redshift = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -452,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8y5vlzzws2fqpjjq59gmgrf1l5whm1zcm7fhlkikxspq9iw16b"; + sha256 = "1f54ig5vyc2cvipsv5d62n5xd6a1i9myjgayf6x6slkvnzk5xk4g"; type = "gem"; }; - version = "1.37.0"; + version = "1.54.0"; }; aws-sdk-route53 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -463,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "132c11g43zbmn2wzrnys7viymcdsznzl26igpv6ixv4jvi62r7fq"; + sha256 = "1jxm6knx9rp5m3an93c187ds8zla4chl7zdvwnml2imna3adk4z7"; type = "gem"; }; - version = "1.30.0"; + version = "1.46.0"; }; aws-sdk-route53domains = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -474,10 +595,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01flbzipphp2qm4lcrxbmwqlgl7jy5w7gyj6hbgb8aich927w5qx"; + sha256 = "0k3b37q9mhfnf4mzbhhhgx0v6y82ivq6v01g8fvdfb5n6235j0yg"; type = "gem"; }; - version = "1.18.0"; + version = "1.29.0"; }; aws-sdk-route53resolver = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -485,10 +606,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hlyd4h49sa3s61l1w362l2qmnm78kfj2ks6mshrjwr8l8zql1q5"; + sha256 = "1qyb2n40v52n0xjqncaflb6cl1y0p7szlx1bzxpcnm4g5nfdcf3l"; type = "gem"; }; - version = "1.11.0"; + version = "1.23.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -496,10 +617,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; + type = "gem"; + }; + version = "1.88.0"; + }; + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pv5idvap742r4mfwgi01l0sd7skz3m9iy28piy236f6xjiiqsw3"; type = "gem"; }; - version = "1.60.2"; + version = "1.43.0"; }; aws-sdk-securityhub = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -507,10 +639,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a88i8bkqjy91ydj95h9v9mmlsqnx62hkinsprrx6ym0ix78kzim"; + sha256 = "0j6wl0v5p19h3x1fphyq8db5appig7w3gsxnj6mmlm77smlkwjlq"; type = "gem"; }; - version = "1.18.0"; + version = "1.40.0"; + }; + aws-sdk-servicecatalog = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awf0gcywzylqsdypx2lpib5jiy02fd4iz5q19q9qkpvxw7zj9cd"; + type = "gem"; + }; + version = "1.57.0"; }; aws-sdk-ses = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -518,10 +661,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "046bsyj6zblcbffj15qbdz5fp8ipr6vfhrycsv6hznciy6jvpq4h"; + sha256 = "1j45jykqll5s8y71bp4723mvcxbrihp4rhlhq1rvcyyr4y0706yy"; + type = "gem"; + }; + version = "1.37.0"; + }; + aws-sdk-shield = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0416mrby897fnhc3iwb698m0gyih7pfgmx35h5f618i8my53alin"; type = "gem"; }; - version = "1.27.0"; + version = "1.34.0"; }; aws-sdk-sms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -529,10 +683,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1x1hrs8v4vb5l79dp5qpdi0znb5cxviwk1zcx6zajpzabv7hdl"; + sha256 = "0121bx79galz99x2wdksmzyibdy6l18k2i2nzc8lsmrgkdz22c03"; type = "gem"; }; - version = "1.17.0"; + version = "1.28.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -540,10 +694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vfyn7hc21qgarhrfghyw3qi550656834b51n5vnginraryk6ji8"; + sha256 = "0cqri14igfmcxlapbagg0nmy79zzg29awzybv51gl76m3mljbafb"; type = "gem"; }; - version = "1.21.0"; + version = "1.38.0"; }; aws-sdk-sqs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -551,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c81w75ph7c3g8fkq8xxs1f5zkvv5yv0k3xy6441gjxvwkpiaih6"; + sha256 = "07qg8awkqpdwf2r7y54183jfcffwjl1mdd98vmgsxv94617bnh4q"; type = "gem"; }; - version = "1.23.1"; + version = "1.36.0"; }; aws-sdk-ssm = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -562,10 +716,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "116vbhw7l2hk1vk3dq79czp857bcw7giw00ip4par1cgwkxym03c"; + sha256 = "1svhxfjmvb6m8h7lm5cr7mmz6zngrhknrrkmwilnrq0lzg1wfp1r"; type = "gem"; }; - version = "1.71.0"; + version = "1.104.0"; + }; + aws-sdk-states = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04pdrsijckiz9fyzyvdndwci004a4fswv8mq5jm53bzmybwhndz2"; + type = "gem"; + }; + version = "1.37.0"; + }; + aws-sdk-transfer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ivbkfw7j83c7nagdhzdmcmwxn6ym50ak0jfkq1rdc1ppyir31dp"; + type = "gem"; + }; + version = "1.29.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -573,10 +749,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.2"; }; azure_graph_rbac = { dependencies = ["ms_rest_azure"]; @@ -584,10 +760,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq9gnsihrrljmlsg70kmryf72rxyy8kb4v9fa9z28abj0lncqgk"; + sha256 = "0mmx8jp85xa13j3asa9xnfi6wa8a9wwlp0hz0nj70fi3ydmcpdag"; type = "gem"; }; - version = "0.17.1"; + version = "0.17.2"; }; azure_mgmt_key_vault = { dependencies = ["ms_rest_azure"]; @@ -595,10 +771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vcdhzndwa81lg877b1mg2804vhvvnw83qagx6v99adicjf8y8b"; + sha256 = "0f4fai5l3453yirrwajds0jgah60gvawffx53a0jyv3b93ag88mz"; type = "gem"; }; - version = "0.17.5"; + version = "0.17.7"; }; azure_mgmt_resources = { dependencies = ["ms_rest_azure"]; @@ -606,10 +782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036p2d59jdjx5a49jz4swf37kfpc9ryyrb13xrdyghk1q79qli8p"; + sha256 = "1hb9010cxrmm23v4dfrsf9wgvr53qkcd6397c4azg3wc65a6i1vc"; type = "gem"; }; - version = "0.17.8"; + version = "0.18.1"; }; azure_mgmt_security = { dependencies = ["ms_rest_azure"]; @@ -617,10 +793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01rk0wbfbhrxnm0vv520ilxd55hv7n3w0sq5j0v17mnwjgm7pa6d"; + sha256 = "11h2dyz4awzidvfj41h7k2q7mcqqcgzvm95fxpfxz609pbvck0g2"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; azure_mgmt_storage = { dependencies = ["ms_rest_azure"]; @@ -628,30 +804,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1xajw39958kcv4qlhad2n19flijn9aqzxks2wx4b0k207vp87c"; + sha256 = "0r8klsq3x7s4nn42h9w1kbqblrxnj7z7cpa8bxvc3xwv0vvql7m0"; type = "gem"; }; - version = "0.19.2"; - }; - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5"; - type = "gem"; - }; - version = "3.16.1"; + version = "0.22.0"; }; bcrypt_pbkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; berkshelf = { dependencies = ["chef" "chef-config" "cleanroom" "concurrent-ruby" "minitar" "mixlib-archive" "mixlib-config" "mixlib-shellout" "octokit" "retryable" "solve" "thor"]; @@ -659,10 +825,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pb20i2blbj9w4cf9nxxxskbd7q5zk8rrirppsfjx8r02dywpq8f"; + sha256 = "1mkakim23w7b38c8lw81wxqw68q6g7rlvxx82lq6bpp1hmmni64n"; type = "gem"; }; - version = "7.0.9"; + version = "7.1.0"; }; builder = { groups = ["default"]; @@ -680,21 +846,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfx43yl77x074vjg77ixfxnxwl103ywjya55m4lj4vj0b2nxxxn"; + sha256 = "068jzw97g40wbpzn51vcvwdp012202rkmjfafxwhx31wxjzhwy0n"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-cli = { - dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; + dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "pastel" "solve"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05178w55vwqgrv8jaic2f77h6hx5b40lsmlaqfvdq63a459wl5sd"; + sha256 = "1nw73p8wg67qkzx07v21fwiqljb0yndjm10z56li72d6b1hbw0sb"; type = "gem"; }; - version = "2.0.0"; + version = "3.1.1"; }; chef-config = { dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; @@ -702,10 +868,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbl4pgn4kavi6b1m1f232xx4l9fhlz7d4ndmb11m36wb8l05hsk"; + sha256 = "1ji166i5n7cxn69amsfxsvy3b7bf5ksgxxg985w5jfl1gp5bihfl"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-dk = { dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; @@ -713,10 +879,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhfq3kwchay6aj6128pr13xabrfprs288ma9abnv9d6vz3ddpw6"; + sha256 = "0zqznvry08pyiv8820b962fzvabzwbsmmwlyvk4ayjr2wshyi6g2"; type = "gem"; }; - version = "4.7.73"; + version = "4.13.3"; }; chef-provisioning = { dependencies = ["cheffish" "inifile" "mixlib-install" "net-scp" "net-ssh" "net-ssh-gateway" "winrm" "winrm-elevated" "winrm-fs"]; @@ -730,35 +896,35 @@ version = "2.7.6"; }; chef-telemetry = { - dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl" "http"]; + dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lx85wy6d1khrya0idwqkdvh1x57qak3d8y699gwccfhl88xymg3"; + sha256 = "0hnmqr6vkgsbnzdzcc6j6svnms14irrcd70wk8qg3p98cy359rm5"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.14"; }; chef-utils = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149pgbybdpi9y11qfsm4bmnqm655s682yv7qkwxhzwqn2fylzb2j"; + sha256 = "1j8rhqc6mj8iay755rl5yaf0rqs54gwcygib1s8g7dxl3vqcpwxa"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-vault = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0famr2cbrrarp4rpzcymqnpnwg734psbf0pxhasxdsjjg8nl6f"; + sha256 = "1rpcgzawdgzvk60fw9s40i5alc7b1rc2phkgm89dckfmklfh6794"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; chef-zero = { dependencies = ["ffi-yajl" "hashie" "mixlib-log" "rack" "uuidtools"]; @@ -788,10 +954,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ry6707plcrj7aicadmzxzfmlvz43i2g55k2iph8m390wpxhnhcl"; + sha256 = "15sz88xxh48phq1w3rsivzasg4r36dhqnpqna5cfi120vk28ylb2"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.1"; }; cleanroom = { groups = ["default"]; @@ -808,20 +974,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; cookbook-omnifetch = { dependencies = ["mixlib-archive"]; @@ -829,41 +995,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w4xh4ffcm4jd3fys9yg3rb8asngll15mvra8lfi2328alvbanvb"; - type = "gem"; - }; - version = "0.9.1"; - }; - cucumber-core = { - dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c"; - type = "gem"; - }; - version = "3.2.1"; - }; - cucumber-tag_expressions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; + sha256 = "1qw8ayyflx222igmrmp1jpgfcfhpnc4myaxv9lk3ckd5l6n3w7qh"; type = "gem"; }; - version = "1.1.1"; + version = "0.11.1"; }; declarative = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -890,10 +1035,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhx743lcx61r2d3925jk61c6r8clfjmpf5g93cdy5sq00ig76lh"; + sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; docker-api = { dependencies = ["excon" "multi_json"]; @@ -901,10 +1046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04dkbg7x2m4102dnwil2v688gblxh1skh374nkzksn18jjrivkdp"; + sha256 = "09lkc50nl3158za0fk8kpd05zlzfxiajnf6zrxpamw1nzdw89ac9"; type = "gem"; }; - version = "1.34.2"; + version = "2.0.0"; }; domain_name = { dependencies = ["unf"]; @@ -927,25 +1072,15 @@ }; version = "1.2.4"; }; - equatable = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf"; - type = "gem"; - }; - version = "0.6.1"; - }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; erubis = { groups = ["default"]; @@ -962,21 +1097,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhc5c16i8zrm3d98ppsnw514d7jvwdg0wk60kc9i1xw3797qkkd"; + sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; type = "gem"; }; - version = "0.72.0"; + version = "0.79.0"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "0.17.3"; + version = "1.3.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -984,10 +1119,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + type = "gem"; + }; + version = "0.0.7"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; - version = "0.0.6"; + version = "1.0.1"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -995,10 +1140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.12.2"; + version = "1.0.0"; }; fauxhai-ng = { dependencies = ["net-ssh"]; @@ -1006,20 +1151,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vm9hz6k8v4i7r1s5z489n58liaaxmb8bgcvklfg1hf8k3d5afdp"; + sha256 = "0pxzmsp31lxlkq1p0205j2s9kkjqs5a9zy2qpqabbmhny0d9ri8k"; type = "gem"; }; - version = "7.6.0"; + version = "8.7.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.12.2"; + version = "1.14.2"; }; ffi-libarchive = { dependencies = ["ffi"]; @@ -1027,10 +1172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs8s37lr3bgw5d3mb6vamcqy16dj61yzzq0xf453lhr3dcampkb"; + sha256 = "1wmbwg6hirxr85c3skdq2na8xwg4ky880qbs1z1adb9aizcjbdkx"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.17"; }; ffi-yajl = { dependencies = ["libyajl2"]; @@ -1038,21 +1183,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11m9pkx2a1vssplzb3fwx4kc25bg5xmjf0j97l5kv6mhnhd93sik"; + sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5"; type = "gem"; }; - version = "2.3.3"; + version = "2.3.4"; }; foodcritic = { - dependencies = ["cucumber-core" "erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; + dependencies = ["erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11dzfcf6p1z75anizwqm48nadd84j5wk0vm4mp4s5a7xfqjh3psi"; + sha256 = "1gnp8lr37cv87adr3568kh7p55vwdqp01f2hwjxlvqkwkwk3fvn4"; type = "gem"; }; - version = "16.2.0"; + version = "16.3.0"; }; fuzzyurl = { groups = ["default"]; @@ -1064,37 +1209,27 @@ }; version = "0.9.0"; }; - gherkin = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s"; - type = "gem"; - }; - version = "5.1.0"; - }; git = { dependencies = ["rchardet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15sbv16dlap5d6naybl8cc99zffrpzygkhjz3m6l3r5y5yrhwwjc"; + sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xndfscxxaw73qah484vmhcd60hlbyrr9rlh7sf2n2sjfcqikjsf"; + sha256 = "1q1lsyyyfvff7727sr01j8qx6b30qpx6h0bna5s0bfz853fhl33b"; type = "gem"; }; - version = "0.34.1"; + version = "0.52.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1102,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnkh017ln5g7x3y0w743g61bxb2cdcyr1vax9ic3gx7vkrfj3iw"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.10.0"; + version = "0.14.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1113,10 +1248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh"; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; gyoku = { dependencies = ["builder"]; @@ -1149,27 +1284,6 @@ }; version = "1.7.10"; }; - htmlentities = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; - type = "gem"; - }; - version = "2.2.2"; - }; http-cookie = { dependencies = ["domain_name"]; groups = ["default"]; @@ -1181,26 +1295,6 @@ }; version = "1.0.3"; }; - http-form_data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; - type = "gem"; - }; - version = "1.0.3"; - }; - "http_parser.rb" = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; - type = "gem"; - }; - version = "0.6.0"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -1217,10 +1311,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.8"; }; inifile = { groups = ["default"]; @@ -1237,10 +1331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws"; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; inspec = { dependencies = ["faraday_middleware" "inspec-core" "train" "train-aws" "train-habitat" "train-winrm"]; @@ -1248,21 +1342,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cyv81rgspr9xachq2dk9xgb740jrq7vpy2r88lqdzlzbpz3f4n"; + sha256 = "0jg818r56vzzh971ckzbknv8b70da73njr3x2y7xd6jwv5pjs93m"; type = "gem"; }; - version = "4.18.85"; + version = "4.26.4"; }; inspec-core = { - dependencies = ["addressable" "chef-telemetry" "faraday" "hashie" "htmlentities" "json-schema" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "term-ansicolor" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; + dependencies = ["addressable" "chef-telemetry" "faraday" "faraday_middleware" "hashie" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ha6dmi5lywv4gldpv2pyj0zwqv4wsf422jd4x8licmkpkcrwc2r"; + sha256 = "0nrd4ny5cyah76pchr5xyi2m9rx0lkyk9vd2sp68rjp0x1x5y3p8"; type = "gem"; }; - version = "4.18.85"; + version = "4.26.4"; }; ipaddress = { groups = ["default"]; @@ -1274,16 +1368,6 @@ }; version = "0.8.3"; }; - jaro_winkler = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; - type = "gem"; - }; - version = "1.5.4"; - }; jmespath = { groups = ["default"]; platforms = []; @@ -1299,31 +1383,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.0"; - }; - json-schema = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5"; - type = "gem"; - }; - version = "2.8.1"; + version = "2.5.1"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01zg1vp3lyl3flyjdkrcc93ghf833qgfgh2p1biqfhkzz11r129c"; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; kitchen-inspec = { dependencies = ["hashie" "inspec" "test-kitchen"]; @@ -1331,10 +1404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v85hnmhqdbl9zxphvbqfgma9rl095mq9jz223mkffdh9q5xv282"; + sha256 = "1fx27vkc29kx59qmkrkl53sbyigny3rkqlfp836rwlxf1wfbbdlv"; type = "gem"; }; - version = "1.3.1"; + version = "2.3.0"; }; kitchen-vagrant = { dependencies = ["test-kitchen"]; @@ -1342,10 +1415,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01wwryb4ha6gzhnmbg7xir32rpynbw4zc2l9dch02pwizw0n669x"; + sha256 = "1pix3n9hbr9s736n4jh8dn71ccsm5xcqvx9clwilzhr3r89qfiwg"; type = "gem"; }; - version = "1.6.1"; + version = "1.8.0"; }; knife-spork = { dependencies = ["app_conf" "chef" "diffy" "git"]; @@ -1353,10 +1426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcry9fbsi9kqfi8rrdda17yzmfyg21g9jv01sgzg1sj59kzb79s"; + sha256 = "1ddgmv3j75m908ldykrgn9rdjdw09yakmxav7569f18lhxxfs9l0"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; libyajl2 = { groups = ["default"]; @@ -1374,10 +1447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lxgpmzb9hafzx7f5fssb1mamcbzbdp87awvjr33fk6nsvyg3zaj"; + sha256 = "03n3jpzivqxajvf3507c2z9vq2mrriqqc1yg3g0pgzacb3d38k2d"; type = "gem"; }; - version = "1.0.13"; + version = "1.0.19"; }; little-plugger = { groups = ["default"]; @@ -1395,10 +1468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; memoist = { groups = ["default"]; @@ -1415,10 +1488,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mini_mime = { groups = ["default"]; @@ -1435,10 +1508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitar = { groups = ["default"]; @@ -1455,10 +1528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.3"; }; mixlib-archive = { dependencies = ["mixlib-log"]; @@ -1466,30 +1539,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c7g55x126cj2493wx03n9b83i9m1rdfx2aivg1yg8d1lmj8jdg"; + sha256 = "0dj52irvnp1riz52kg6fddmdvl9nxsrxk3vyidr7lfzhw5sj8vdk"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; mixlib-authentication = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d854b55d0hx0q12gwbycfdcpnxx88zz0jk557ngq2cqq94g96jy"; + sha256 = "1wfyn645wnb79rl3ys83171ymv56k8zks9qvxh29vj8nicyrzr23"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.7"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yrfgg18hlm0hkg81w5bw3fbk0m89lg96a0b65q9mrrscg37rvn2"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -1497,10 +1570,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lb9dg4wg86qhbd0rykdjr00arkyvmrg20a5ylf0zd6wp7w01jk"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.9"; }; mixlib-install = { dependencies = ["mixlib-shellout" "mixlib-versioning" "thor"]; @@ -1508,30 +1581,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bsn4d0m3xw142v1vssyrxwa6y64fqd5hx2hsnm5vc1xj4xmcg0f"; + sha256 = "0p11qf6b86dzl3q5gqi63myz484dicmn90d8v8jjb1dm51gqpajq"; type = "gem"; }; - version = "3.11.26"; + version = "3.12.5"; }; mixlib-log = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00kmwx7s3xpxmy44saxjk36gbhsywyxy4f8jf4gjvwwpr0ps8q0g"; + sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; type = "gem"; }; - version = "3.0.8"; + version = "3.0.9"; }; mixlib-shellout = { + dependencies = ["chef-utils"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2nqa82xp0hg8sj69cypar8n7p3azl5pl2v2mjbkhgmmhqxa8km"; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; type = "gem"; }; - version = "3.0.9"; + version = "3.2.2"; }; mixlib-versioning = { groups = ["default"]; @@ -1548,10 +1622,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "17kvf6fijn6k886dhj89h0x39qh90c47asa2k16s913fcgn3a1n3"; type = "gem"; }; - version = "0.6.6"; + version = "0.7.0"; }; ms_rest = { dependencies = ["concurrent-ruby" "faraday" "timeliness"]; @@ -1559,31 +1633,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mgfspn3g75mhmfprpr2pnkmav34gix8cfga43g7162d0i1pd9l"; + sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; ms_rest_azure = { - dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest" "unf_ext"]; + dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "135va1hzxwn0apb2lf7b9yi8d1czid250cgf91dm331rqz84jnvz"; + sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; multipart-post = { groups = ["default"]; @@ -1595,16 +1669,6 @@ }; version = "2.1.1"; }; - necromancer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w2y31947axs62bsf0xrpgalsw4ip1m44vpw7p8f4s9zvnayj2vd"; - type = "gem"; - }; - version = "0.5.1"; - }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -1660,15 +1724,15 @@ version = "1.2.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.8"; + version = "1.11.1"; }; nori = { groups = ["default"]; @@ -1686,10 +1750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.16.0"; + version = "4.20.0"; }; ohai = { dependencies = ["chef-config" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "systemu" "wmi-lite"]; @@ -1697,20 +1761,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6c22nqg905sivr099qrwbvnwwyvm37xzxxrysvkalxglkvxr23"; + sha256 = "0qw3mz8f9hpzfchwqa1nix7fcvy34k5n7lln91b8gsbx2l6aycs6"; type = "gem"; }; - version = "15.7.4"; + version = "15.12.0"; }; os = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; paint = { groups = ["default"]; @@ -1727,10 +1791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -1738,10 +1802,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145lv6rbbnbddbk79l10kadycjq05vyrzq5d733zswmypshpq6ni"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.0.2"; + version = "3.0.0.0"; }; parslet = { groups = ["default"]; @@ -1754,25 +1818,25 @@ version = "1.8.2"; }; pastel = { - dependencies = ["equatable" "tty-color"]; + dependencies = ["tty-color"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm"; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.0"; }; plist = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp"; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; polyglot = { groups = ["default"]; @@ -1800,10 +1864,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + sha256 = "1shq3vfdg7c9l1wppl8slridl95wmwvnngqhga6j2571nnv50piv"; type = "gem"; }; - version = "0.12.2"; + version = "0.14.0"; }; public_suffix = { groups = ["default"]; @@ -1815,15 +1879,25 @@ }; version = "3.1.1"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; rainbow = { groups = ["default"]; @@ -1840,10 +1914,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rchardet = { groups = ["default"]; @@ -1855,6 +1929,16 @@ }; version = "1.8.0"; }; + regexp_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; + type = "gem"; + }; + version = "2.0.3"; + }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; groups = ["default"]; @@ -1902,10 +1986,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -1913,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd"; + sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1924,10 +2008,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjqfb39da6gywdcp4h77738r7khbrn2v4y45589z25bj4z9paf0"; + sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; rspec-its = { dependencies = ["rspec-core" "rspec-expectations"]; @@ -1946,61 +2030,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.2"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3"; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.2"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922"; + type = "gem"; + }; + version = "1.9.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adfpv76whv5dy5wr5brqkki39jfv6r08482saj64h9j4wzwcznb"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "0.80.0"; + version = "1.4.1"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; }; rubyntlm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; rubyzip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; rufus-lru = { groups = ["default"]; @@ -2039,10 +2144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8brljfgrxpr5j7kggv3dphqj9in3rkbf5dryx8f7nprkk85wdd"; + sha256 = "1zmrsnrrj5j3bp9fmaa74cvlkpdwspv8gv5vpz1lclhirkiqz1xv"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.1"; }; solve = { dependencies = ["molinillo" "semverse"]; @@ -2050,20 +2155,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zymaik4cxd4kmd8f4n1ij8ykrfinhnlvlhjnsdv2cv1xnqnjqmk"; + sha256 = "059lrsf40rl5kclp1w8pb0fzz5sv8aikg073cwcvn5mndk14ayky"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; sslshake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dy7pnvn0zb3qbfahgksfxqw1hxhk2i2wlw34bvr2iyzqlw04a3s"; + sha256 = "0r3ifksx8a05yqhv7nc4cwan8bwmxgq5kyv7q7hy2h9lv5zcjs8h"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; @@ -2071,10 +2176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; + sha256 = "0xgw0zmwansvmk8dnxgd83pvrj4f5y8j72bpzp409hwd6xy1hy7m"; type = "gem"; }; - version = "0.1.8"; + version = "0.2.0"; }; strings-ansi = { groups = ["default"]; @@ -2086,16 +2191,6 @@ }; version = "0.2.0"; }; - sync = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; - type = "gem"; - }; - version = "0.5.0"; - }; syslog-logger = { groups = ["default"]; platforms = []; @@ -2116,37 +2211,26 @@ }; version = "2.6.5"; }; - term-ansicolor = { - dependencies = ["tins"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; - type = "gem"; - }; - version = "1.7.1"; - }; test-kitchen = { dependencies = ["bcrypt_pbkdf" "ed25519" "license-acceptance" "mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "thor" "winrm" "winrm-elevated" "winrm-fs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14wvv8vgm3lqqk9ifywjhhxlvnbx5gpl4f8zbw5gj41sq8hdqgqj"; + sha256 = "1s5sj6x2dscd3wci7ns1m3jwfp1b7h8535q44ggdsz60gp63p974"; type = "gem"; }; - version = "2.3.4"; + version = "2.10.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "0.20.3"; + version = "1.1.0"; }; thread_safe = { groups = ["default"]; @@ -2168,80 +2252,69 @@ }; version = "0.3.10"; }; - tins = { - dependencies = ["sync"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nghqcdg7ak91n2h6igx8i2ykbhna93xpg33w6232451vphlwdm0"; - type = "gem"; - }; - version = "1.24.1"; - }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg"; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.0"; }; train = { - dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "train-core" "train-winrm"]; + dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "inifile" "train-core" "train-winrm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y7aggjyarc531a0vmh86vdqr6ws3y3h64jnkh8cavpqns4jhmjg"; + sha256 = "09nflqvdgzxfncr8qki0jhnarfg36mii0h6hi2cd71q49613m6gk"; type = "gem"; }; - version = "3.2.22"; + version = "3.4.9"; }; train-aws = { - dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-firehose" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-securityhub" "aws-sdk-ses" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm"]; + dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-applicationautoscaling" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-databasemigrationservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-firehose" "aws-sdk-glue" "aws-sdk-guardduty" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-ram" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-secretsmanager" "aws-sdk-securityhub" "aws-sdk-servicecatalog" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-transfer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dvwzk9h5kzbb9v6qm387mfysjz4nfcr56685ccl5c1jj5a59553"; + sha256 = "014cbgkzkw1rf7652h1xqshb9crr6pn2yhlv1z41ndxlkmmdx4fg"; type = "gem"; }; - version = "0.1.15"; + version = "0.1.35"; }; train-core = { - dependencies = ["addressable" "inifile" "json" "mixlib-shellout" "net-scp" "net-ssh"]; + dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfqyfi4q2vykbiw4b373n7n2aqzhq9gkn8sr3sx2w7hpd7lkd3x"; + sha256 = "1pbfbmi9l5hxr1zly1bc72fk8a6by4d19wdap8q3mi3rlflqzbfp"; type = "gem"; }; - version = "3.2.22"; + version = "3.4.9"; }; train-habitat = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w642zkvgq0d1dy622lk50ngr0872v6ghd4r1g692qv8g4k6d90n"; + sha256 = "0qdi2q5djzfl6x3fv2vrvybjdvrnx53nfh4vzrcl2h7nrf801n6v"; type = "gem"; }; - version = "0.2.13"; + version = "0.2.22"; }; train-winrm = { - dependencies = ["winrm" "winrm-fs"]; + dependencies = ["winrm" "winrm-elevated" "winrm-fs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4sv6hblq9y259aka6j868di2w669f6aj2m7ssi5jxhanaf5mqk"; + sha256 = "0nin3qfkh173yjcihxaz0sbnskds9n1n0ciphc7y70647vpsqgrh"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.12"; }; treetop = { dependencies = ["polyglot"]; @@ -2249,10 +2322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; tty-box = { dependencies = ["pastel" "strings" "tty-cursor"]; @@ -2260,20 +2333,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; + sha256 = "12yzhl3s165fl8pkfln6mi6mfy3vg7p63r3dvcgqfhyzq6h57x0p"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; tty-color = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0czbnp19cfnf5zwdd22payhqjv57mgi3gj5n726s20vyq3br6bsp"; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; tty-cursor = { groups = ["default"]; @@ -2286,15 +2359,15 @@ version = "0.7.1"; }; tty-prompt = { - dependencies = ["necromancer" "pastel" "tty-reader"]; + dependencies = ["pastel" "tty-reader"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19kbxny8cfsy1r02awih1gf76mi3a7zqg3ymxpmf9720khlmziax"; + sha256 = "0rhvwpl5wk51njrh3avm09c8pwl2z5iwc0l67h40gq3r7ix2fjk2"; type = "gem"; }; - version = "0.20.0"; + version = "0.23.0"; }; tty-reader = { dependencies = ["tty-cursor" "tty-screen" "wisper"]; @@ -2302,31 +2375,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1977ajs9sxwhd88qqmf6l1hw63dqxlvg9mx626rymsc5ap2xa1r4"; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; type = "gem"; }; - version = "0.7.0"; + version = "0.9.0"; }; tty-screen = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwgr2i3wilng3mx851xczmkzllbirmsmr42ik4amqyyvry1yzyf"; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.1"; }; tty-table = { - dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"]; + dependencies = ["pastel" "strings" "tty-screen"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y07yikpk65jqmxinw8l4c45pbw1b2h4fv9fikb43a7sdlr6sn69"; + sha256 = "0fcrbfb0hjd9vkkazkksri93dv9wgs2hp6p1xwb1lp43a13pmhpx"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -2334,10 +2407,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.9"; }; uber = { groups = ["default"]; @@ -2365,20 +2438,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.2"; + version = "0.0.7.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; unicode_utils = { groups = ["default"]; @@ -2406,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym"; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.6"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; @@ -2417,10 +2490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -2428,10 +2501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6"; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.5"; }; wisper = { groups = ["default"]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 0cc386b657c..5539489afb0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.12.12"; + version = "2021.02.13"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "27b8a82fb613803ab9c712866b7cc89c40fcafc4ac3af178c11b4ed7549934dc"; + sha256 = "sha256-Rq7W5sP9nRB0TGRUSQIyC3U568uExmcM/gd+1HjAqac="; }; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/clpm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/clpm/default.nix index 03174d6c4fc..0dfa99367ac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/clpm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/clpm/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchgit , wrapLisp , sbcl @@ -7,13 +8,13 @@ stdenv.mkDerivation rec { pname = "clpm"; - version = "0.3.5"; + version = "0.3.6"; src = fetchgit { url = "https://gitlab.common-lisp.net/clpm/clpm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if"; + sha256 = "04w46yhv31p4cfb84b6qvyfw7x5nx6lzyd4yzhd9x6qvb7p5kmfh"; }; buildInputs = [ @@ -22,13 +23,21 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + runHook preBuild + ln -s ${openssl.out}/lib/libcrypto.so.* . ln -s ${openssl.out}/lib/libssl.so.* . common-lisp.sh --script scripts/build.lisp + + runHook postBuild ''; installPhase = '' + runHook preInstall + INSTALL_ROOT=$out sh install.sh + + runHook postInstall ''; # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 64ca730d7dc..3b9de427bde 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index da926174151..3b0a0f40227 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.5"; + version = "7.0.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-pL8h/hsaiVveZ32ee0bUepzcS7igJGVtGuHocrC21pY="; + sha256 = "sha256-WpwMx8mPedunBKlRUDdcVA1sLWkZvuoaw6DEtvGSyAg="; }; - vendorSha256 = "sha256-IcIUYFmiVuRrZQisjWX5grOZPqovibgF5NmbG96FISI="; + vendorSha256 = "sha256-OxU+Hb8bX71SFuyAw583Z7bEu+b/j2i/fOGE5S9C91M="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 20cb953edea..ad886e0c3c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.8.0"; + version = "13.9.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68"; + sha256 = "0zgnp6l0p1i7x6lppd24nfb6kqa8mw7rnr2p5gmwbmjv9i9zkycs"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0"; + sha256 = "06b5p9ygcnrjrisp6bcgw9s3j2zlycp8jsri259bjf7rrfbwpkma"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421"; + sha256 = "0wzqrfjg43wnf9lr34jn3ydlxi7vsnqs55pm5igba592q8ykfbxk"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix index f64cbd5e85f..9d78f57425a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -8,18 +8,16 @@ , zlib , rapidjson , pandoc -, enableSystemd ? false -, customConfig ? null }: let js.vue = fetchurl { - url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js"; - sha256 = "01zklp5cyik65dfn64m8h2y2dxzgbyzgmbf99y7fwgnf0155r7pq"; + url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js"; + sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99"; }; js.vue-router = fetchurl { url = - "https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js"; - sha256 = "07gx7znb30rk1z7w6ca7dlfjp44q12bbq6jghwfm27mf6psa80as"; + "https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js"; + sha256 = "0418waib896ywwxkxliip75zp94k3s9wld51afrqrcq70axld0c9"; }; js.ansi_up = fetchurl { url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; @@ -29,17 +27,12 @@ let url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9"; }; - css.bootstrap = fetchurl { - url = - "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"; - sha256 = "11vx860prsx7wsy8b0yrrk04ih8kvrxkk8l16snsc4n286bdkyri"; - }; in stdenv.mkDerivation rec { name = "laminar"; - version = "0.8"; + version = "1.0"; src = fetchurl { url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "05g73j3vpib47kr7mackcazf7s6bc3xwz4h6k7sp7yb5ng7gj20g"; + sha256 = "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g"; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; @@ -50,31 +43,23 @@ in stdenv.mkDerivation rec { cp ${js.vue-router} js/vue-router.min.js cp ${js.ansi_up} js/ansi_up.js cp ${js.Chart} js/Chart.min.js - cp ${css.bootstrap} css/bootstrap.min.css ''; + postInstall = '' - mv $out/usr/share $out - mkdir $out/bin - mv $out/usr/{bin,sbin}/* $out/bin - rmdir $out/usr/{bin,sbin} - rmdir $out/usr + mv $out/usr/share/* $out/share/ + rmdir $out/usr/share $out/usr mkdir -p $out/share/doc/laminar pandoc -s ../UserManual.md -o $out/share/doc/laminar/UserManual.html - '' + lib.optionalString (customConfig != null) '' - cp ${customConfig} /etc/etc/laminar.conf - '' + (if enableSystemd then '' - sed -i "s,/etc/,$out/etc/," $out/lib/systemd/system/laminar.service - sed -i "s,/usr/sbin/,$out/bin/," $out/lib/systemd/system/laminar.service - '' else '' - rm -r $out/lib # it contains only systemd unit file - ''); + rm -rf $out/lib # remove upstream systemd units + rm -rf $out/etc # remove upstream config file + ''; meta = with lib; { description = "Lightweight and modular continuous integration service"; homepage = "https://laminar.ohwg.net"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ kaction ]; + maintainers = with maintainers; [ kaction maralorn ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch index 80e74de95aa..355baeb837a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -6,21 +6,36 @@ put into correct location before build phase starts. --- laminar-0.8/CMakeLists.txt +++ laminar-0.8-new/CMakeLists.txt -@@ -69,17 +69,6 @@ +@@ -82,15 +82,6 @@ COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' DEPENDS src/resources/index.html) -# Download 3rd-party frontend JS libs... --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js -- js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -- js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js +- js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js +- js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b) -file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js - js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js - js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) --file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -- css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42) # ...and compile them generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js - js/ansi_up.js js/Chart.min.js css/bootstrap.min.css) + js/ansi_up.js js/Chart.min.js) +@@ -141,12 +132,12 @@ + target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) + endif() + +-set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files") +-set(BASH_COMPLETIONS_DIR /usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory") +-set(ZSH_COMPLETIONS_DIR /usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory") ++set(SYSTEMD_UNITDIR lib/systemd/system CACHE PATH "Path to systemd unit files") ++set(BASH_COMPLETIONS_DIR usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory") ++set(ZSH_COMPLETIONS_DIR usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory") + install(TARGETS laminard RUNTIME DESTINATION sbin) + install(TARGETS laminarc RUNTIME DESTINATION bin) +-install(FILES etc/laminar.conf DESTINATION /etc) ++install(FILES etc/laminar.conf DESTINATION etc) + install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc) + install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc) + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/convco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/convco/default.nix index d6be170bb8f..c152197358c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/convco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4"; + sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw="; }; - cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z"; + cargoSha256 = "sha256-hAUg2mh4VyyjkBRBs5YWi14yeGlMXxt+cdoz5xOS+1A="; nativeBuildInputs = [ openssl perl pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix index e016f0ef7c9..65077d6134b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.9"; + version = "2.0.12"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c="; + sha256 = "sha256-SLl8pXGl9612FDEOy1vz/mXTb3+7YAJ/wq/njBL+V+I="; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,14 +37,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - lib.makeBinPath [ - common-updater-scripts - coreutils - git - gnused - nix - nixfmt - ] + lib.makeBinPath [ common-updater-scripts coreutils git gnused nix nixfmt ] } oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix index ae10c402945..0fb3ae81030 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index eacd35ed760..0be77237f42 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,14 +10,15 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU="; + sha256 = "sha256-hOemDLfkjjPXQErKKCIMl8c5EPZe40B1HlNfvg7IZKU="; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; unpackPhase = '' tar xfz ${src} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index c42197e13cf..8fb7677f584 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/diesel-cli/default.nix index bd8e71090c5..20185ff7d13 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/diesel-cli/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/dockle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/dockle/default.nix index c20e2866dc7..5ecaddc6f1b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,30 +2,35 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.1"; + version = "0.3.11"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY="; + sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw="; }; - vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4="; + vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4="; 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 - rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go + rm pkg/scanner/scan_test.go + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/dockle --help + $out/bin/dockle --version | grep "dockle version ${version}" + runHook postInstallCheck ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix index 4d05bd3ed11..c83b6142b06 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.55.0"; + version = "1.57.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-vhg5X8H4VegSDORtj1rgNKlWQo1H1e/vvO01LJkVK+A="; + sha256 = "sha256-waaBillxI7tKQAugyolAWQWf4CG+uIkjtvNXNNFpqRY="; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index d82c288e5aa..e74a6b9c3c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix index c8e6cafa27a..68be931aa44 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix index 3d420bf1901..7f439d9b59e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/dt-schema/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2020.12"; + version = "2021.2.1"; src = fetchPypi { inherit pname version; - sha256 = "01de2598075909f2afb2d45277d0358645066f5bbb1770fca5f1d6f399846924"; + sha256 = "d9f88f069068dc5dc7e895785d7172d260cbbc34cab3b52704b20e89b80c6de8"; }; nativeBuildInputs = [ setuptools_scm git ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 633e13d25f7..4f475440b04 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -1,5 +1,4 @@ -{ buildEnv -, fetchurl +{ fetchurl , fontconfig , freetype , glib diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix index e906936d2e7..e0792fbc36b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix index e29064e673a..c60ab738aa4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix index eb9589f723d..a387c14c0a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/errcheck/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index dd9282c6896..75aa8a00f00 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.11"; + version = "1.0.12"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "EYNLdrvSs8S/GCYy0jGsnP1+C988y1j7WzcLfczM1Ew="; + sha256 = "sha256-R4DBuOCDj/tk6WOb14AUF5ZP2BjHxtXpr8pNVRHe0sg="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix index 4f2bd805260..f581806433f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.5.2"; + 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-oO7k6JOKUm11OYNN+tH/zqF9ucgrsnF4PcphT8+xnS8="; + sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/github/github-release/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/github/github-release/default.nix index 81b125ac058..4326d4bf71c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/github/github-release/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix index 78038440a96..460f59dc3d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.9"; + version = "1.3.0"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s"; + sha256 = "sha256-nu6PRFk+GoN1gT1RTbX6mTPZByAGf0bSsj2C5YriGp8="; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/gnulib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gnulib/default.nix index 2a2ce1b190f..7441d4018a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gnulib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, python3 }: stdenv.mkDerivation { pname = "gnulib"; @@ -10,19 +10,26 @@ stdenv.mkDerivation { sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; }; - dontFixup = true; - # no "make install", gnulib is a collection of source code + postPatch = '' + patchShebangs gnulib-tool.py + ''; + + buildInputs = [ python3 ]; + installPhase = '' - mkdir -p $out; mv * $out/ - ln -s $out/lib $out/include mkdir -p $out/bin + cp -r * $out/ + ln -s $out/lib $out/include ln -s $out/gnulib-tool $out/bin/ ''; - meta = { + # do not change headers to not update all vendored build files + dontFixup = true; + + meta = with lib; { homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/go-mockery/default.nix new file mode 100644 index 00000000000..db876ea09f2 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix index 57e836d8f4e..8e58a811305 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.2.1"; + version = "2020.2.2"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh"; + sha256 = "1vk9c4hsv8i3zhkyrsd0cb5mscxl35ws5bykpp5h6g366rpl0dy1"; }; vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 2e973e9a0b0..49928b1a08b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.36.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-AObZI104q+kOvV3/6aAusl5PMro1nbNUasvmJ4mRGz8="; + sha256 = "sha256-x0VLNQeTVN9aPO06Yi1DTb8bTjq+9VemJaX1R+8s/Bg="; }; - vendorSha256 = "sha256-jr8sYfonggAHqtq3A8YVuTqJu3/iIu0OgBEUWj6bq+A="; + vendorSha256 = "sha256-uduT4RL6p6/jdT8JeTx+FY9bz0P2eUSaFNDIzi7jcqg="; doCheck = false; @@ -19,7 +19,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=19700101-00:00:00" ]; + preBuild = '' + buildFlagsArray+=("-ldflags=-s -w -X main.version=${version} -X main.commit=v${version} -X main.date=19700101-00:00:00") + ''; postInstall = '' for shell in bash zsh; do @@ -31,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Fast linters Runner for Go"; homepage = "https://golangci-lint.run/"; - license = licenses.gpl3; - maintainers = with maintainers; [ anpryl manveru ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ anpryl manveru mic92 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/golint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/golint/default.nix index 89b9f146495..3187f793127 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/golint/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/golint/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/golint/deps.nix deleted file mode 100644 index e2640098933..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 4d572e070e7..c20d7a2e49a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/gops/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gops/default.nix new file mode 100644 index 00000000000..0f0230049cf --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix index bbc19894661..5f0f2da2daa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 435edd61623..d75dae12bcb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-eJxrdR3JYqF+GexcwnyHV4xO75stEDNFzxDtky7PVc8="; + sha256 = "sha256-/DpsB3MS0iPYFSug3RTWOprB8tclVP6v3dbS3mC3S+g="; }; - vendorSha256 = "sha256-VQ3/VkxoYtY71xJQj6/XAoIEH4jr4Rq4hFqFnwxzkSU="; + vendorSha256 = "sha256-AOdWv0PkDi8o5V71DVzAd/sRibbMf3CkqmJGmuxHtuc="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 4203564ae4a..364117577bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 52ccc3d9150..4425071cb14 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.6"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "19xf79rbilslpibi1mi31jplrgf8anpm06s6sxqh8v1qs84vkxdm"; + sha256 = "sha256-HoDV8Z024+WnECw1ZVwA3dEfbKtuTd4he40UwQnpiGQ="; }; desktopItem = makeDesktopItem { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix index 97d1c753682..e14cfe87404 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jbake/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/jbang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jbang/default.nix index c41fb4c639f..c10fa46f670 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix index e8fe27aae09..ad4304fc6e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/jq/default.nix @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { postInstallCheck = '' $bin/bin/jq --help >/dev/null + $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null ''; - passthru.tests = { inherit (nixosTests) jq; }; - meta = with lib; { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/jsduck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/jsduck/default.nix index 233b3933876..15a3a683403 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/jsduck/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix index 9f553aa6bae..fc13b68258a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, asciidoc, cmake, libxslt }: stdenv.mkDerivation rec { pname = "genkfs"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; }; - nativeBuildInputs = [ asciidoc cmake ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix index 5f047d79a13..90a493697c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; }; - nativeBuildInputs = [ cmake bison flex ]; + strictDeps = true; + + nativeBuildInputs = [ bison cmake flex ]; buildInputs = [ boost ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix index 33ec5b8bbb2..70eea0f7b6a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; - nativeBuildInputs = [ cmake asciidoc ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix index 43a8e4eddfa..447959a1e61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: stdenv.mkDerivation rec { pname = "kpack"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; }; - nativeBuildInputs = [ cmake ]; + strictDeps = true; - buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "fortify" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix index b1ee36ac2da..2e067e92d91 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mkrom"; @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2"; }; - nativeBuildInputs = [ - asciidoc - cmake - ]; + strictDeps = true; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix index a91d1e5beda..efe8d454b2c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mktiupgrade"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; }; - nativeBuildInputs = [ asciidoc cmake ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix index 33ed8d38c63..67d7159e502 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: stdenv.mkDerivation rec { @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; }; - nativeBuildInputs = [ cmake asciidoc docbook_xsl ]; + strictDeps = true; - buildInputs = [ libxslt ]; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/scas/default.nix index 573d261306a..ceb8212cf7f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/scas/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; + strictDeps = true; + nativeBuildInputs = [ cmake ]; meta = with lib; { @@ -21,6 +23,6 @@ stdenv.mkDerivation rec { description = "Assembler and linker for the Z80"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix index 6d66f141e91..b8aa281d413 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; - nativeBuildInputs = [ cmake knightos-scas ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ readline SDL2 ]; + buildInputs = [ readline SDL2 knightos-scas ]; cmakeFlags = [ "-Denable-sdl=YES" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/krew/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/krew/default.nix index f2a4f390f82..f0d0f186511 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/krew/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/krew/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krew"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "krew"; rev = "v${version}"; - sha256 = "1fcbpipnbms096c36b2z06ysfwyjj22lm1zd1r5xlv5gp24qimlv"; + sha256 = "sha256-+YwBkXrj5sWlMA01GfBhu12st+es5YygkD16jc+blt8="; }; - vendorSha256 = "1bmsjv5snrabd9h9szkpcl15rwxm54jgm361ghhy234d2s45c3gn"; + vendorSha256 = "sha256-49kWaU5dYqd86DvHi3mh5jYUQVmFlI8zsWtAFseYriE="; subPackages = [ "cmd/krew" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/kubectx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/kubectx/default.nix index 46955855332..f9d109f3387 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix new file mode 100644 index 00000000000..4c8693b0e51 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kustomize-sops"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "viaduct-ai"; + repo = pname; + rev = "v${version}"; + sha256 = "0sr4d7amwn62xywwn83y58ynl8xv6l1q6zwbky5rmy0qxk909bqp"; + }; + + vendorSha256 = "0vn6vrczbdln7ngz061xixjwn899jn7p2a46770xqx44bh3f2lgv"; + + installPhase = '' + mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ + mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec + ''; + + # Tests are broken in a nix environment + doCheck = false; + + meta = with lib; { + description = "A Flexible Kustomize Plugin for SOPS Encrypted Resource"; + longDescription = '' + KSOPS can be used to decrypt any Kubernetes resource, but is most commonly + used to decrypt encrypted Kubernetes Secrets and ConfigMaps. + ''; + homepage = "https://github.com/viaduct-ai/kustomize-sops"; + license = licenses.asl20; + maintainers = with maintainers; [ starcraft66 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix index a2707eb72e9..10e701d1e93 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/luaformatter/default.nix new file mode 100644 index 00000000000..991f1a37717 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix index 729ab88c680..100190b0894 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/ide.nix index 0683b9e1265..a1ce9d0a696 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -20,6 +20,7 @@ mkDerivation { sourceRoot = "source/MiniZincIDE"; enableParallelBuilding = true; + dontWrapQtApps = true; postInstall = '' wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix index da387105cef..186608cde3f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index c49187273c4..fc1af1a4d68 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; buildPhase = "${stdenv.shell} ${./helper.sh}"; - installPhase = ":"; # buildPhase does this. + dontInstall = true; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix index 0f7edeea812..62aa0ab5dec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index 40b53ca6934..218a396490f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20201025"; + version = "0.20201219"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p"; + sha256 = "sha256-qCZYSzUh5WBQxMX6LtWRBz0VWnZVNR4v06aH9bJIb1o="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 140e4869e88..80e8119b6b3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11924"; + version = "0.1.12214"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354="; + sha256 = "sha256-YV/fqATdGqlAdpKuOMq8KO9UQ+4D1PHwIE5O1zqndHQ="; }; vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs="; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index d99649fd2a9..c0d4567fe0b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,24 +1,59 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, callPackage, fetchFromGitHub, leiningen, openjdk11 +, graalvm11-ce, babashka }: -stdenv.mkDerivation rec { +let pname = "clojure-lsp"; - version = "2021.02.10-21.13.12"; + version = "2021.02.14-19.46.47"; + leiningen11 = leiningen.override ({ jdk = openjdk11; }); - src = fetchurl { - url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-kYetCpInY87l1NTaIhjzkNc2LQctMbSmcdQuI7zrFG4="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Zj7/8RcuxCy2xdd+5jeOb1GTsQsX0EVW32k32fA6uf4="; }; - dontUnpack = true; + repository = callPackage ./repository.nix { + inherit src pname version; + leiningen = leiningen11; + }; +in stdenv.mkDerivation rec { + inherit src pname version; + + postPatch = '' + # Hack to set maven cache in another directory since MAVEN_OPTS doesn't work + substituteInPlace project.clj \ + --replace ":main" ":local-repo \"${repository}\" :main" + ''; + + GRAALVM_HOME = graalvm11-ce; + + buildInputs = [ graalvm11-ce leiningen11 repository ]; + + buildPhase = with lib; '' + runHook preBuild + + export LEIN_HOME="$(mktemp -d)" + bash ./graalvm/native-unix-compile.sh - buildInputs = [ makeWrapper ]; + runHook postBuild + ''; installPhase = '' - install -Dm644 $src $out/share/java/${pname}.jar - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-Xmx2g" \ - --add-flags "-server" \ - --add-flags "-jar $out/share/java/${pname}.jar" + runHook preInstall + + install -Dm755 ./clojure-lsp $out/bin/clojure-lsp + + runHook postInstall + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + ${babashka}/bin/bb ./integration-test/run-all.clj ./clojure-lsp + + runHook postCheck ''; meta = with lib; { @@ -26,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/snoe/clojure-lsp"; license = licenses.mit; maintainers = [ maintainers.ericdallo ]; - platforms = jre.meta.platforms; + platforms = graalvm11-ce.meta.platforms; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/repository.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/repository.nix new file mode 100644 index 00000000000..122096e9657 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/clojure-lsp/repository.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, src, pname, version, leiningen }: + +stdenv.mkDerivation { + inherit src; + + name = "${pname}-${version}-repository"; + buildInputs = [ leiningen ]; + + postPatch = '' + # Hack to set maven cache in another directory since MAVEN_OPTS doesn't work + substituteInPlace project.clj \ + --replace ":main" ":local-repo \"$out\" :main" + ''; + + buildPhase = '' + runHook preBuild + + export LEIN_HOME="$(mktemp -d)" + lein with-profiles +native-image deps + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + + runHook postInstall + ''; + + dontFixup = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-aWZPsJF32ENyYNZCHf5amxVF9pb+5M73JqG/OITZlak="; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cvise/default.nix new file mode 100644 index 00000000000..357e3e98f08 --- /dev/null +++ b/infra/libkookie/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.1.0"; + + src = fetchFromGitHub { + owner = "marxin"; + repo = "cvise"; + rev = "v${version}"; + sha256 = "0ljl0r5jqj6lrddrbxjkcphcz5p4njnn2hqz07jyh30jd9sm7dmj"; + }; + + 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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cvise/unifdef.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/cvise/unifdef.patch new file mode 100644 index 00000000000..d15ca6dce0b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix index 285805ccb02..61251434578 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix index e60b40c7fd4..775ad6937dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfkickers/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6"; }; - makeFlags = [ "CC=cc prefix=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 4ad7f830066..72c8c2fab91 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -1,47 +1,95 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts +, musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs +, argp-standalone }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.180"; + version = "0.182"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq"; + sha256 = "7MQGkU7fM18Lf8CE6+bEYMTW1Rdb/dZojBx42RRriFg="; }; - patches = [ ./debug-info-from-env.patch ]; + patches = [ + ./debug-info-from-env.patch + ./musl-cdefs_h.patch + (fetchpatch { + name = "fix-aarch64_fregs.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs="; + }) + (fetchpatch { + name = "musl-asm-ptrace-h.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k="; + }) + (fetchpatch { + name = "musl-fts-obstack.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-fts-obstack.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "3lbC0UtscTIJgT7kOXnnjWrpPAVt2PYMbW+uJK6K350="; + }) + (fetchpatch { + name = "musl-macros.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8="; + }) + (fetchpatch { + name = "musl-qsort_r.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-qsort_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "FPWCkdtFT3zw8aNnz0Jz5Vmu8B/mRfNgfhbM/ej7d8M="; + }) + (fetchpatch { + name = "musl-strerror_r.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strerror_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "QF6YwWkcT12dZHKzfqFgxy/1fkIllo0AAosbV0sM5PU="; + }) + (fetchpatch { + name = "musl-strndupa.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; hardeningDisable = [ "format" ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. - nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; + nativeBuildInputs = [ m4 bison flex gettext bzip2 ] + ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ]; buildInputs = [ zlib bzip2 xz ] - ++ lib.optional stdenv.hostPlatform.isMusl argp-standalone; + ++ lib.optional stdenv.hostPlatform.isMusl [ + argp-standalone + musl-fts + musl-obstack + ]; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -fgnu89-inline" + NIX_CFLAGS_COMPILE+=" -Wno-null-dereference" ''; - configureFlags = - [ "--program-prefix=eu-" # prevent collisions with binutils - "--enable-deterministic-archives" - "--disable-debuginfod" - ]; + configureFlags = [ + "--program-prefix=eu-" # prevent collisions with binutils + "--enable-deterministic-archives" + "--disable-libdebuginfod" + "--disable-debuginfod" + ]; enableParallelBuilding = true; doCheck = false; # fails 3 out of 174 tests doInstallCheck = false; # fails 70 out of 174 tests - meta = { + meta = with lib; { homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eelco ]; + platforms = platforms.linux; + # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, + # but since this package isn't split that way, all three are listed. + license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; + maintainers = [ maintainers.eelco ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch new file mode 100644 index 00000000000..1b5bf466217 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch @@ -0,0 +1,15 @@ +# avoids a warning about including an internal header when +# compiling with musl-libc +diff -crb --new-file a/lib/fixedsizehash.h b/lib/fixedsizehash.h +*** a/lib/fixedsizehash.h 2020-06-11 11:37:46.000000000 -0400 +--- b/lib/fixedsizehash.h 2021-01-21 05:52:59.000000000 -0500 +*************** +*** 30,36 **** + #include + #include + #include +- #include + + #include + +--- 30,35 ---- diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/musl-error_h.patch new file mode 100644 index 00000000000..711928078d3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/elfutils/musl-error_h.patch @@ -0,0 +1,66 @@ +diff -crb --new-file a/lib/error.h b/lib/error.h +*** a/lib/error.h 1969-12-31 19:00:00.000000000 -0500 +--- b/lib/error.h 2021-01-21 04:38:25.000000000 -0500 +*************** +*** 0 **** +--- 1,27 ---- ++ #ifndef _ERROR_H_ ++ #define _ERROR_H_ ++ ++ #include ++ #include ++ #include ++ #include ++ #include ++ ++ static unsigned int error_message_count = 0; ++ ++ static inline void error(int status, int errnum, const char* format, ...) ++ { ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++ } ++ ++ #endif /* _ERROR_H_ */ +diff -crb --new-file a/src/error.h b/src/error.h +*** a/src/error.h 1969-12-31 19:00:00.000000000 -0500 +--- b/src/error.h 2021-01-21 04:38:29.000000000 -0500 +*************** +*** 0 **** +--- 1,27 ---- ++ #ifndef _ERROR_H_ ++ #define _ERROR_H_ ++ ++ #include ++ #include ++ #include ++ #include ++ #include ++ ++ static unsigned int error_message_count = 0; ++ ++ static inline void error(int status, int errnum, const char* format, ...) ++ { ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++ } ++ ++ #endif /* _ERROR_H_ */ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix index 6f9f5e113c0..47716b5ea9e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 2ce779be568..6f923778975 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -82,7 +82,8 @@ stdenv.mkDerivation rec { "--with-mpfr=${mpfr.dev}" "--with-expat" "--with-libexpat-prefix=${expat.dev}" "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}" - ] ++ lib.optional (!pythonSupport) "--without-python"; + ] ++ lib.optional (!pythonSupport) "--without-python" + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; postInstall = '' # Remove Info files already provided by Binutils and other packages. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix index 13437b71953..f5298d685eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix new file mode 100644 index 00000000000..5e0f54b2fee --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub +, freetype +, gtk3 +, lib +, meson +, ninja +, pkg-config +, SDL2 +, stdenv +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gpuvis"; + version = "20210220"; + + src = fetchFromGitHub { + owner = "mikesart"; + repo = pname; + rev = "216f7d810e182a89fd96ab9fad2a5c2b1e425ea9"; + sha256 = "15pj7gy0irlp849a85z68n184jksjri0xhihgh56rs15kq333mwz"; + }; + + # patch dlopen path for gtk3 + # python2 is wrongly added in the meson file, upstream PR: https://github.com/mikesart/gpuvis/pull/62 + postPatch = '' + substituteInPlace src/hook_gtk3.h \ + --replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so" + ''; + + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ]; + + buildInputs = [ SDL2 gtk3 freetype ]; + + meta = with lib; { + description = "GPU Trace Visualizer"; + homepage = "https://github.com/mikesart/gpuvis"; + license = licenses.mit; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/help2man/default.nix index 6afc4415e11..ba1fa720dd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/help2man/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 201241fb835..e5bf0708986 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index cf56e6c1a9c..c253bda36b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -1,7 +1,7 @@ -{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json +, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix new file mode 100644 index 00000000000..904256ee66a --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix index dad7d41c1f6..35e0a52865f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kdbg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://www.kdbg.org/"; description = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix index 3fa2d219fe3..9ba19c836b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix index 7f46d6f6512..754559969d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index c92d7b07798..f37815081ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix index 2999b741888..d3bca0b684c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix @@ -1,38 +1,35 @@ -{ - pkgs -, stdenv +{ stdenv , libusb-compat-0_1 , fetchFromGitHub , lib }: stdenv.mkDerivation rec { - pname = "micronucleus"; - version = "2.04"; + pname = "micronucleus"; + version = "2.04"; - sourceRoot = "source/commandline"; + sourceRoot = "source/commandline"; - src = fetchFromGitHub { - owner = "micronucleus"; - repo = "micronucleus"; - rev = version; - sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; - }; + src = fetchFromGitHub { + owner = "micronucleus"; + repo = "micronucleus"; + rev = version; + sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; + }; - buildInputs = [ libusb-compat-0_1 ]; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + buildInputs = [ libusb-compat-0_1 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib/udev - cp micronucleus $out/bin - cp 49-micronucleus.rules $out/lib/udev - ''; - - meta = with lib; { - description = "Upload tool for micronucleus"; - homepage = "https://github.com/micronucleus/micronucleus"; - license = licenses.gpl3; - maintainers = [ maintainers.cab404 ]; - }; + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib/udev + cp micronucleus $out/bin + cp 49-micronucleus.rules $out/lib/udev + ''; + meta = with lib; { + description = "Upload tool for micronucleus"; + homepage = "https://github.com/micronucleus/micronucleus"; + license = licenses.gpl3; + maintainers = [ maintainers.cab404 ]; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/msitools/default.nix index f444f86dbfb..2db336a4991 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/msitools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/msitools/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: stdenv.mkDerivation rec { pname = "msitools"; - version = "0.98"; + version = "0.99"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; + sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU="; }; - nativeBuildInputs = [ intltool pkg-config ]; + nativeBuildInputs = [ bison intltool pkg-config ]; buildInputs = [ glib libgsf libuuid gcab bzip2 ]; passthru = { @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = "https://wiki.gnome.org/msitools"; license = [ licenses.gpl2 licenses.lgpl21 ]; + maintainers = with maintainers; [ PlushBeaver ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 74309a33f22..8b603fbc5ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.4.43"; + version = "1.4.72"; src = fetchFromGitHub { owner = "NXPmicro"; repo = "mfgtools"; rev = "uuu_${version}"; - sha256 = "1i1mvr6j0mc33axf6cmmsi83apr5rgq0z0sn23qav9r0izpnnh0w"; + sha256 = "1s3wlz4yb2p8by5p66vr0z72n84mxkrmda63x9yr6pinqinsyrvv"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix index 94f92bfcf29..9537e11e112 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "openfpgaloader"; - version = "0.2.1"; + version = "0.2.5"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${version}"; - sha256 = "0j87mlghbanh6c7lrxv0x3p6zgd0wrkcs9b8jf6ifh7b3ivcfg82"; + sha256 = "sha256-Qbw+vmpxiZXTGM0JwpS5mGzcsSJNegsvmncm+cOVrVE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix index d86277993ca..b26fbf75031 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 8a5cbbcfdfa..9dfa5955f5c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/segger-ozone/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/segger-ozone/default.nix new file mode 100644 index 00000000000..5e1c6888b8e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/segger-ozone/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, fetchurl +, fontconfig +, freetype +, lib +, libICE +, libSM +, udev +, libX11 +, libXcursor +, libXext +, libXfixes +, libXrandr +, libXrender +}: + +stdenv.mkDerivation rec { + pname = "segger-ozone"; + version = "3.22a"; + + src = fetchurl { + url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${(lib.replaceChars ["."] [""] version)}_x86_64.tgz"; + sha256 = "0v1r8qvp1w2f3yip9fys004pa0smlmq69p7w77lfvghs1rmg1649"; + }; + + rpath = lib.makeLibraryPath [ + fontconfig + freetype + libICE + libSM + udev + libX11 + libXcursor + libXext + libXfixes + libXrandr + libXrender + ] + + ":${stdenv.cc.cc.lib}/lib64"; + + installPhase = '' + mkdir -p $out/bin + mv Lib lib + mv * $out + ln -s $out/Ozone $out/bin + ''; + + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Ozone" \ + --set-rpath ${rpath}:$out/lib "$out/Ozone" + + for file in $(find $out/lib -maxdepth 1 -type f -and -name \*.so\*); do + patchelf --set-rpath ${rpath}:$out/lib $file + done + ''; + + meta = with lib; { + description = "J-Link Debugger and Performance Analyzer"; + longDescription = '' + Ozone is a cross-platform debugger and performance analyzer for J-Link + and J-Trace. + + - Stand-alone graphical debugger + - Debug output of any tool chain and IDE 1 + - C/C++ source level debugging and assembly instruction debugging + - Debug information windows for any purpose: disassembly, memory, + globals and locals, (live) watches, CPU and peripheral registers + - Source editor to fix bugs immediately + - High-speed programming of the application into the target + - Direct use of J-Link built-in features (Unlimited Flash + Breakpoints, Flash Download, Real Time Terminal, Instruction Trace) + - Scriptable project files to set up everything automatically + - New project wizard to ease the basic configuration of new projects + + 1 Ozone has been tested with the output of the following compilers: + GCC, Clang, ARM, IAR. Output of other compilers may be supported but is + not guaranteed to be. + ''; + homepage = "https://www.segger.com/products/development-tools/ozone-j-link-debugger"; + license = licenses.unfree; + maintainers = [ maintainers.bmilanov ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix index fc041f2ee8d..2fd98490287 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/sloccount/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix index bc7d4b1b3dc..8b9646713e8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/stm32flash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' # Manually copy, make install copies to /usr/local/bin diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 004e1527d35..d1496bcdf45 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.10"; + version = "5.11"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/jmC6kzZrrO0ujX2J58LV3o3F10ygr4kuaVTe1a48Bw="; + sha256 = "sha256-/+NAsQwUWg+Fc0Jx6czlZFfSPyGn6lkxqzL4z055OHk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 9695c75a3c1..eb823904eed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index 47c9c15a0cc..60124ef44c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl"; + sha256 = "sha256-y6cgBYiqy+M8dfcNS6iDohqyip6xAs222MJHJFhloiI="; }; - vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l"; + vendorSha256 = "sha256-PQj3+qcmN/raDrAbufAcVT+vSumGuOY47i7ZYfvx3yk="; subPackages = [ "." ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/tie/default.nix index e75248aa867..52a740ed1c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/tie/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix index 53e2b2762d3..ebb034a92e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/unifdef/default.nix @@ -1,31 +1,24 @@ -{ fetchurl, lib, stdenv }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unifdef-2.6"; + pname = "unifdef"; + version = "2.12"; src = fetchurl { - url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz"; - sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj"; + url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz"; + sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"; }; - postUnpack = '' - substituteInPlace $sourceRoot/unifdef.c \ - --replace '#include "version.h"' "" - - substituteInPlace $sourceRoot/Makefile \ - --replace "unifdef.c: version.h" "unifdef.c:" - ''; - - preBuild = '' - unset HOME - export DESTDIR=$out - ''; + makeFlags = [ + "prefix=$(out)" + "DESTDIR=" + ]; meta = with lib; { - homepage = "http://dotat.at/prog/unifdef/"; + homepage = "https://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ orivej vrthra ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index bd362e8d1a4..eea1e78d403 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "unstable-2019-07-30"; + version = "5.9.20201206.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "920e7910146915e5cae367bc9f135ffd8b042042"; - sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; + rev = "p${version}"; + sha256 = "0w10zjyz46sjm6ypxmq550dkr84hvc4phm4vm9j53jp5s19x5q19"; }; - nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; + nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ]; buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; # to generate makefile.in @@ -25,6 +25,9 @@ stdenv.mkDerivation { # Remove source of non-determinism substituteInPlace main/options.c \ --replace "printf (\" Compiled: %s, %s\n\", __DATE__, __TIME__);" "" + + substituteInPlace Tmain/utils.sh \ + --replace /bin/echo ${coreutils}/bin/echo ''; postConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/mockgen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/mockgen/default.nix index 104988eb213..06004b9f779 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/mockgen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/mockgen/default.nix @@ -1,14 +1,14 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "mockgen"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "golang"; repo = "mock"; rev = "v${version}"; - sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; + sha256 = "sha256-YSPfe8/Ra72qk12+T78mTppvkag0Hw6O7WNyfhG4h4o="; }; - vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy"; + vendorSha256 = "sha256-cL4a7iOSeaQiG6YO0im9bXxklCL1oyKhEDmB1BtEmEw="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/neoload/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/neoload/default.nix index fb85aa80dc3..63452728b91 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/neoload/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix index 31358129821..475c08eb169 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/nrpl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/nrpl/default.nix index 72177582919..67a86ca8dec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/nrpl/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/nwjs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/nwjs/default.nix index d3490b2b9c9..1356bc46ced 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix index e48707dcb9a..07082b7f5d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 77d39029551..cf24a132210 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,5 +1,10 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +let + # ounit is only available for OCaml >= 4.04 + doCheck = lib.versionAtLeast ocaml.version "4.04"; +in + stdenv.mkDerivation { pname = "ocamlmod"; version = "0.0.9"; @@ -9,13 +14,15 @@ stdenv.mkDerivation { sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + configurePhase = "ocaml setup.ml -configure --prefix $out" + + lib.optionalString doCheck " --enable-tests"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - doCheck = true; + inherit doCheck; + checkInputs = [ ounit ]; checkPhase = "ocaml setup.ml -test"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index c03dbf75623..c14cd7ddc04 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index b12aa2e6d6d..c3da3bc2327 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 047246cd0a0..5a4b55cc7fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix index a128f2144e9..610093af19f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index b99880fe7f3..30bc089ee0f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index 622ac80306f..53dd4e9827f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -8,13 +8,13 @@ else buildDunePackage rec { pname = "utop"; - version = "2.6.0"; + version = "2.7.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "17n9igl74xcvj0mzdh2ybda29f2m48a5lj4yf8lrdqr7vg0982jd"; + sha256 = "sha256-4GisU98mfDzA8vabvCBEBPA2LMTmRyofxUfjJqY8P90="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 34d6abb7273..764041b6ad4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8="; + sha256 = "sha256-wGlxi9X8RrAtvevDfufY1t3en6QgHy5XoSh0K/M/ve4="; }; vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; @@ -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/infra/libkookie/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/out-of-tree/default.nix index 4547012e2f3..597d680cc2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/out-of-tree/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix index 16e5ac08203..a39e29983cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "packer"; - version = "1.6.6"; + version = "1.7.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,9 +11,17 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; + sha256 = "sha256-x62C44vTIysk9Lx9HZeTBf8k1+P5hfMIijvTWu3cZrA="; }; + buildFlagsArray = [ "-ldflags=-s -w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --zsh go/src/${goPackagePath}/contrib/zsh-completion/_packer + ''; + meta = with lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 662961ae46a..42c9ee872fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 78fb3b7f937..44d2a8d3c15 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/infra/libkookie/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; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix index f92e0d79426..d9ad21dea61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 81ccf5a8472..989f7bf5367 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 401bea63e0a..31301d981d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index a4538b1a932..d5878b65fa3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index b8609c0bd17..6a4795d7405 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index f0ef7079bf6..02e4977fa33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 260dc4d10c0..66c85944969 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 2c563f3fbfa..8d1aa2daf53 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 6d055ca0ae9..8d0b5aaf0e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index ff60ff80101..ded864c8976 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 27042b6ef95..f799ce410c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index c02d03d11d9..12d7f58aecb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index fda72fc99c6..679d7e4ed6a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/phantomjs2/default.nix index 594deeb1c73..3d0db49aedc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/phantomjs2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/phantomjs2/default.nix @@ -77,6 +77,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/share/doc/phantomjs cp -a bin $out diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 47c3e26fa6a..3b622c20559 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/infra/libkookie/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.4"; + inherit version; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 4626f7fec37..6af37b395e0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 9ee690815fa..2106708a28f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -46,6 +46,12 @@ self: super: } ); + anyio = super.anyio.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -82,7 +88,7 @@ self: super: ); celery = super.celery.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; }); cssselect2 = super.cssselect2.overridePythonAttrs ( @@ -244,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 ]; @@ -283,7 +298,7 @@ self: super: patchPhase = '' substituteInPlace setup.py \ --replace "/usr/include/openjpeg-2.3" \ - "${pkgs.openjpeg.dev}/include/openjpeg-2.3" + "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir} substituteInPlace setup.py \ --replace "/usr/include/jxrlib" \ "$out/include/libjxr" @@ -354,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; } ); @@ -372,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; @@ -379,8 +407,8 @@ self: super: ); jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.yajl ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; }); jupyter = super.jupyter.overridePythonAttrs ( @@ -552,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 @@ -668,6 +703,12 @@ self: super: } ); + pdal = super.pdal.overridePythonAttrs ( + old: { + PDAL_CONFIG = "${pkgs.pdal}/bin/pdal-config"; + } + ); + peewee = super.peewee.overridePythonAttrs ( old: let @@ -727,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; } ); @@ -847,6 +892,11 @@ self: super: } ); + pyfuse3 = super.pyfuse3.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ]; + }); + pygame = super.pygame.overridePythonAttrs ( old: rec { nativeBuildInputs = [ @@ -909,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 [ ]) ++ [ @@ -941,6 +1001,8 @@ self: super: old: { format = "other"; + dontWrapQtApps = true; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.qt5.qmake @@ -1060,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 ]; } ); @@ -1090,6 +1149,11 @@ self: super: ''; }); + python-jose = super.python-jose.overridePythonAttrs ( + old: { + buildInputs = [ self.pytest-runner ]; + } + ); ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { @@ -1157,6 +1221,11 @@ self: super: ''; }; + + rmfuse = super.rmfuse.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; + }); + scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { @@ -1217,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/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index 973733a6d61..b1be7a3f4e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 0868175ea45..02f6dabc86f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 4a1e8890c28..fcdb01e29c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update index 33a2823f360..915726c658f 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index bf001392e6a..0ef1d4c316a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/infra/libkookie/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 = "([=> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix index 7de3fd53489..b460200c74e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rubocop/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922"; + sha256 = "1ncd6w4sc112j86j9j12ws7flxfi8dk8nal2kyxg7phdfr703qlz"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; rubocop-ast = { dependencies = ["parser"]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index c468ad0f4e1..15ec7518e8a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.2"; + version = "0.7.3"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1rgwj3kf31n4rz0b7jw67wsgyapdycfic7plm5gm4n9rlslp5ax5"; + sha256 = "0df87kx8dfq2fvz00k6advwg2iw9djkflhrbsjw0xhac78623c56"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0jnawnkf4m7cqcq9iahnxa53l61a5riax400n96vxrqf3fa752c6"; + sha256 = "18l54jf9q5xb908bwyyil1sblxxa9mkrgr33gm0r6nxicw6kf8in"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0svmhq64aqw1vidq8jmw7w4xhhnyp04vcs9yzhjyz25c4cn9grsf"; + cargoSha256 = "0z7sjfnnmld5bijn14c7v7arh0vzqmbkjk7bf9ky67acq2r2cv2f"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index e3c16b09ef3..eeec0487c65 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-qoN9pTpmXfwaJ37MqAggiPsH4cPr+nsT6NhAUOVclSw="; + sha256 = "sha256-/TROCaguzIdXnkQ4BpVR1W14ppGODGQ0MQAjJExMGVw="; }; - cargoSha256 = "sha256-mmd9Ds37ST+OuCt506/YbdpOOJBp7WIVZBq+bQ2SR3U="; + cargoSha256 = "sha256-3uIf6vyeDeww8+dqrzOG4J/T9QbXAnKQKXRbeujeqSo="; nativeBuildInputs = [ perl pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix new file mode 100644 index 00000000000..931fb8fd984 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix new file mode 100644 index 00000000000..f7ce0283f6f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index ba126e57a14..b328f32dc26 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.8.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "01czsnhlvs78fpx1kpi75386657jmlrqpsj4474nxmgcs75igncx"; + sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU="; }; - cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr"; + cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 09650e8a386..7cb366c5502 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix index 3b28af1097e..3ebe5ef1304 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.5"; + version = "0.0.7"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-GYdWKRgdS9gCQRu1C8ht0wC1eBTtIMg585OuAfDn/+4="; + sha256 = "sha256-8HsYhWYeRhCPTxVnU8hOJKLXvza8i9KvKTLL6yLo0+c="; }; - cargoSha256 = "0381wgyb2xnsiick8invrkhcvp905rrfyikgv01w6qn9872z11s0"; + cargoSha256 = "sha256-8uA4oFExrzDMeMV5MacbtE0Awdfx+jUUkrKd7ushOHo="; passthru = { updateScript = nix-update-script { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix new file mode 100644 index 00000000000..5e12c1cae1d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index e38afac76f2..5e1cdc5e21b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qVmp2DTnQjvN5QWchiGa6huM30+o41zLmby45APfxgk="; + sha256 = "sha256-o02MQC0/sc/+qbIXJVN84a2SKxSJaUSXXtBs0h+lQes="; }; - cargoSha256 = "sha256-zuJbs25lyDRTQPJdI0QBzO3xrdH48+cVhLqIkP7nLbE="; + cargoSha256 = "sha256-tlAA2Aw5OQ9/FCyTckS559s6Zp4Nx8m34yLT9q5F3nI="; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix index 50cffe74848..1c1a4c32c62 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix new file mode 100644 index 00000000000..34440ce9305 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-whatfeatures"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "museun"; + repo = pname; + rev = "v${version}"; + sha256 = "0vki37pxngg15za9c1z61dc6sqk0j59s0qhcf9hplnym4ib5kqx1"; + }; + + cargoSha256 = "sha256-nNV7UXjKZNFmTqW4H0qsNuBW9XOP2V9nfotewtI9mYE"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A simple cargo plugin to get a list of features for a specific crate"; + homepage = "https://github.com/museun/cargo-whatfeatures"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ ivan-babrou ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix index a941d43bb9d..9432c4fd85d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index b9c2e08ba14..02b111567cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.9.0"; + version = "0.9.4"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; + hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; }; - cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; + cargoHash = "sha256-poMMEj+zrlU+v5axJbZai2kv36stEKgaciF4zd9A6Qg="; nativeBuildInputs = [ pkg-config ]; @@ -29,9 +29,17 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - description = "Build and publish crates with pyo3 bindings as python packages"; + description = "Build and publish Rust crates Python packages"; + longDescription = '' + Build and publish Rust crates with PyO3, rust-cpython, and + cffi bindings as well as Rust binaries as Python packages. + + This project is meant as a zero-configuration replacement for + setuptools-rust and Milksnake. It supports building wheels for + Python and can upload them to PyPI. + ''; homepage = "https://github.com/PyO3/maturin"; - license = licenses.mit; + license = licenses.asl20; maintainers = [ maintainers.danieldk ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index df29f9eec15..cefde14e59d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-02-08"; + rev = "2021-03-01"; version = "unstable-${rev}"; - sha256 = "sha256-Idaaw6d0lvBUyZxpHKQ94aMtgM0zb0P8QRh+3pctX4k="; - cargoSha256 = "sha256-J6Hia83biutScZt/BMO4/qXYi35/Ec9MeaHeDG8Lqmc="; + sha256 = "10x4fk1nxk548cfxrbfvz0kpa2r955d0bcnxxn8k8zmrdqxs3sph"; + cargoSha256 = "02s6qnq61vifx59hnbaalqmfvp8anfik62y6rzy3rwm1l9r85qrz"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index 10f0c6b26ad..0ce33f0f233 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -41,6 +41,8 @@ rustPlatform.buildRustPackage { runHook postInstallCheck ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "An experimental modular compiler frontend for the Rust language"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/scaff/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/scaff/default.nix deleted file mode 100644 index 2449769e07f..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/scalafix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/scalafix/default.nix index 00fda8bfc36..c27d6e8a65f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/scalafix/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix index bfe496e3cbf..0f4f1740fac 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.20"; + version = "1.0.24"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SKBSsS8WPsr5/42IMueLkfJCrOQIO/ODlhTp+xrmQ/4="; + sha256 = "sha256-dqjZQyh7SWkD2dBcB32pR3PgWPMGQYPo7AkOQURt0hs="; }; vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index c25190cab74..b029e7711a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix index 10893a9d170..c4f8653794f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix index fc1f5c3f317..1599c4213a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -1,13 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "skaffold"; - version = "1.17.2"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "GoogleContainerTools"; + repo = "skaffold"; + rev = "v${version}"; + sha256 = "080zhksznwsyi0w1ban90vgh8y1q2703h3h4fvkwg695prd9ij66"; + }; + + vendorSha256 = "1jvrk5jhjzg0dq0zg7p4hvjwda2289cmwh0ldz3269y8g3l113x8"; - goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; - buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' + buildFlagsArray = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in '' -ldflags= -s -w -X ${t}/version.version=v${version} @@ -15,24 +23,24 @@ buildGoPackage rec { -X ${t}/version.buildDate=unknown ''; - src = fetchFromGitHub { - owner = "GoogleContainerTools"; - repo = "skaffold"; - rev = "v${version}"; - sha256 = "1sn4pmikap93kpdgcalgb3nam7zp60ck6wmynsv8dnzihrr7ycm3"; - }; - nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - for shell in bash zsh; do - $out/bin/skaffold completion $shell > skaffold.$shell - installShellCompletion skaffold.$shell - done + installShellCompletion --cmd skaffold \ + --bash <($out/bin/skaffold completion bash) \ + --zsh <($out/bin/skaffold completion zsh) ''; meta = with lib; { - description = "Easy and Repeatable Kubernetes Development"; homepage = "https://skaffold.dev/"; + changelog = "https://github.com/GoogleContainerTools/skaffold/releases/tag/v${version}"; + description = "Easy and Repeatable Kubernetes Development"; + longDescription = '' + Skaffold is a command line tool that facilitates continuous development for Kubernetes applications. + You can iterate on your application source code locally then deploy to local or remote Kubernetes clusters. + Skaffold handles the workflow for building, pushing and deploying your application. + It also provides building blocks and describe customizations for a CI/CD pipeline. + ''; license = licenses.asl20; maintainers = with maintainers; [ vdemeester ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/skopeo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/skopeo/default.nix index 5b1d8b0794d..02f2e49a30c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg"; + sha256 = "sha256-7FHfqDgc91BdtbvcElZDWj2jXD2LcMPo9RLnYZe3Xw8="; }; outputs = [ "out" "man" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix index 46f097e5b60..7b06e720caa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/python.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/python.nix index 8ec9c9a2297..f9ea9646320 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sourcetrail/python.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/spicy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/spicy/default.nix new file mode 100644 index 00000000000..691a105941a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/spicy/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "spicy"; + version = "unstable-2020-02-21"; + + goPackagePath = "github.com/trhodeos/spicy"; + + src = fetchFromGitHub { + owner = "trhodeos"; + repo = "spicy"; + rev = "47409fb73e0b20b323c46cc06a3858d0a252a817"; + sha256 = "022r8klmr21vaz5qd72ndrzj7pyqpfxc3jljz7nzsa50fjf82c3a"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "A Nintendo 64 segment assembler"; + longDescription = '' + An open-source version of the Nintendo64 sdk's mild.exe. Assembles + segments into an n64-compatible rom. + ''; + homepage = "https://github.com/trhodeos/spicy"; + license = licenses.mit; + maintainers = [ maintainers._414owen]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/spicy/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/spicy/deps.nix new file mode 100644 index 00000000000..9532b01decb --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/spicy/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/alecthomas/participle"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/participle.git"; + rev = "fed0e8fbb638b11091014aa838748210dc9ff576"; + sha256 = "0yhhm42lis8ak9m6x6aai280xq0652vcq5v17pibbf74dalxyims"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus.git"; + rev = "f104497f2b2129ab888fd274891f3a278756bcde"; + sha256 = "0gr2c7s3ffdaynzn1zplp79zz16qgqpnsq2z9zg79wxksq5mz5l1"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag.git"; + rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb"; + sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii"; + }; + } + { + goPackagePath = "github.com/trhodeos/n64rom"; + fetch = { + type = "git"; + url = "https://github.com/trhodeos/n64rom.git"; + rev = "504dba7b4d4675bd3396c052d64016c5725c2f5e"; + sha256 = "01hybm8nxh1lym0wc9sxrms3wyqhhs0dm1a2nwz6xc60lkjcp8kb"; + }; + } + { + goPackagePath = "github.com/trhodeos/ecoff"; + fetch = { + type = "git"; + url = "https://github.com/trhodeos/ecoff.git"; + rev = "e54570a0fac23c0fa7f605681345611f345ce0f6"; + sha256 = "0pc0yj7hy43m00br0q0f1y5a3bc3a134imcyy2jvzim45g6g12kj"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "9a76102bfb4322425a1228caa377974426e82c84"; + sha256 = "07qn19yla2w604p3dc8h1c75xj2pxc4fajvg0mf0d4c72d5qiss4"; + }; + } +] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/sslmate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sslmate/default.nix index cdf2242bdba..ef04725e562 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sslmate/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index d63493ba7a1..f962447feb7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "1.11.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "1cnzwfqmzlzi6797l37arhhx2l6wsvs3jjgxdxwdbgq3rfz1ncr8"; + sha256 = "1fqhvmz7a4qgz3zq6qgpcjhhhm2j4wpx0385n3zcphd9h9s3a9xa"; fetchSubmodules = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix index e8f52fa8334..6d7fbef2f19 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/thrust/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/thrust/default.nix index 44dfa1a4ba1..02183282ce1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/thrust/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix index 23d7f29dff1..4f0fad54c1b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "0qfb30k6a8vi8vn65vv927wd9nynwwvc9crbmi7a55kp20hzg06r"; + sha256 = "sha256-Fk/Kuc7DwmdoyLx/YjdEHQ7S0M+ksAXl9QqeSPH2vJ8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/default.nix index 701b973ad4f..34662498f23 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 22ac7a8f2c1..c36a13bd97f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zt12LUKcsu/t2wNunIQhrNOqOABjyfL0MkSEPOQswFM="; + sha256 = "sha256-FXOwLYxUMkE+wDY30vjnSZ7zPWZWuWmIH4Uuc0CC7lU="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index 94ee6d3a1ba..9c6d3ed8cb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch new file mode 100644 index 00000000000..d61067438ee --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/default.nix index 77f884b82b6..543ed7fc3ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/default.nix @@ -1,18 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "yaml2json"; - version = "unstable-2017-05-03"; + version = "1.3"; goPackagePath = "github.com/bronze1man/yaml2json"; - goDeps = ./deps.nix; - src = fetchFromGitHub { - rev = "ee8196e587313e98831c040c26262693d48c1a0c"; owner = "bronze1man"; repo = "yaml2json"; - sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; + rev = "v${version}"; + sha256 = "0bhjzl4qibiyvn56wcsm85f3vwnlzf4gywy2gq9mrnbrl629amq1"; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/deps.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/deps.nix deleted file mode 100644 index f907520cc87..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/yaml2json/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } -] diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix index 878661e74ce..b2d0581c054 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.4.1"; + version = "4.6.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus="; + sha256 = "sha256-pP00y9auYeuz0NSA+QrnGybW5T7TfGFFw/FMPu/JXjM="; }; - vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; + vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/cog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/web/cog/default.nix index a3639e559f1..5344c1b833c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/cog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/cog/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -8,7 +7,6 @@ , wayland-protocols , libwpe , libwpe-fdo -, glib , glib-networking , webkitgtk , makeWrapper diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/cypress/default.nix b/infra/libkookie/nixpkgs/pkgs/development/web/cypress/default.nix index 92741499323..dae3243e1e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 68232088fa9..83e456e728e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which util-linux pkg-config python ] + nativeBuildInputs = [ which pkg-config python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix index 495ac311b88..abb10aa4447 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v10.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.23.3"; - sha256 = "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi"; + version = "10.24.0"; + sha256 = "1k1srdis23782hnd1ymgczs78x9gqhv77v0am7yb54gqcspp70hm"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix index 9c5975a6e49..08b8025f9bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.20.2"; - sha256 = "0g3dxip7b5j7fzkw4b82ln93fphxn1zpdizbj1ikjv3hy00dc6ln"; + version = "12.21.0"; + sha256 = "17cp3sv6smpig5xq0z3xgnqdii6k8lm4n5d1nl9vasgmwsn3fbq5"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix index ee8ea72c05e..9a40bf8654d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.5"; - sha256 = "0nv576mlmnf8pfs6yn7vsvwyg0a0xvs7m9pm4k131zjqx501v6z1"; + version = "14.16.0"; + sha256 = "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix index 2c2634959bd..050e752ed00 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.8.0"; - sha256 = "1a9h88zdzk98k618jascfrivq3v51viw60sfyxn0ci0l33vf4fp2"; + version = "15.10.0"; + sha256 = "1i7fdlkkyh5ssncbvxmiz894a12mww4cmj7y4qzm9ddbbvqxhj3p"; } diff --git a/infra/libkookie/nixpkgs/pkgs/games/airstrike/default.nix b/infra/libkookie/nixpkgs/pkgs/games/airstrike/default.nix index f45ac2f0153..12b485764a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/airstrike/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/anki/bin.nix b/infra/libkookie/nixpkgs/pkgs/games/anki/bin.nix index 5509d8a90ca..f5677b142e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/anki/bin.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/assaultcube/default.nix b/infra/libkookie/nixpkgs/pkgs/games/assaultcube/default.nix index 0206821f387..a2c00ddc149 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/assaultcube/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/assaultcube/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; targets = (optionalString server "server") + (optionalString client " client"); - makeFlags = [ "-C source/src" "CXX=c++" targets ]; + makeFlags = [ "-C source/src" "CXX=${stdenv.cc.targetPrefix}c++" targets ]; desktop = makeDesktopItem { name = "AssaultCube"; diff --git a/infra/libkookie/nixpkgs/pkgs/games/black-hole-solver/default.nix b/infra/libkookie/nixpkgs/pkgs/games/black-hole-solver/default.nix new file mode 100644 index 00000000000..e859e72d96b --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/blobwars/default.nix b/infra/libkookie/nixpkgs/pkgs/games/blobwars/default.nix new file mode 100644 index 00000000000..b99c9f2b8e3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/games/blobwars/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, pkg-config, gettext, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, zlib }: + +stdenv.mkDerivation rec { + pname = "blobwars"; + version = "2.00"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99"; + }; + + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + makeFlags = [ "PREFIX=$(out)" "RELEASE=1" ]; + + postInstall = '' + install -Dm755 $out/games/blobwars -t $out/bin + rm -r $out/games + cp -r {data,gfx,sound,music} $out/share/games/blobwars/ + # fix world readable bit + find $out/share/games/blobwars/. -type d -exec chmod 755 {} + + find $out/share/games/blobwars/. -type f -exec chmod 644 {} + + ''; + + meta = with lib; { + description = "Platform action game featuring a blob with lots of weapons"; + homepage = "https://www.parallelrealities.co.uk/games/metalBlobSolid/"; + license = with licenses; [ gpl2Plus free ]; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/games/cbonsai/default.nix b/infra/libkookie/nixpkgs/pkgs/games/cbonsai/default.nix new file mode 100644 index 00000000000..4702991c290 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/chessdb/default.nix b/infra/libkookie/nixpkgs/pkgs/games/chessdb/default.nix index 656e4ab6add..40f90e75ff8 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/chessdb/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/ckan/default.nix b/infra/libkookie/nixpkgs/pkgs/games/ckan/default.nix index 052982bf15d..26a0ba748ba 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/ckan/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/cockatrice/default.nix b/infra/libkookie/nixpkgs/pkgs/games/cockatrice/default.nix index a657913aad7..cb51489de9c 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/cockatrice/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/crawl/default.nix b/infra/libkookie/nixpkgs/pkgs/games/crawl/default.nix index 7b644aa7147..11ac23fcef3 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/crawl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/crawl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp -, tileMode ? false, enableSound ? tileMode +, tileMode ? false, enableSound ? tileMode, buildPackages # MacOS / Darwin builds , darwin ? null @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++" "FORCE_PKGCONFIG=y" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "DATADIR=${placeholder "out"}" diff --git a/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 83e181c85e6..bd8825582c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cp -r DwarfTherapist.app $out/Applications '' else null; + dontWrapQtApps = true; + meta = with lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; diff --git a/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index bd75a66b487..7db79012ec6 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix b/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix index 1efae4d2802..2a3da233b45 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/enigma/default.nix b/infra/libkookie/nixpkgs/pkgs/games/enigma/default.nix new file mode 100644 index 00000000000..131bd00e185 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/games/enigma/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg-utils, hicolor-icon-theme }: +stdenv.mkDerivation rec { + pname = "enigma"; + version = "1.30-alpha"; + + src = fetchurl { + url = "https://github.com/Enigma-Game/Enigma/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "1zyk3j43gzfr1lhc6g13j7qai5f33fv5xm5735nnznaqvaz17949"; + }; + + nativeBuildInputs = [ pkg-config gettext makeWrapper imagemagick ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng xercesc curl xdg-utils ]; + + # For some reason (might be related to the alpha status), some includes + # which are required by lib-src/enigma-core are not picked up by the + # configure script. Hence we add them manually. + CPPFLAGS = "-I${SDL2.dev}/include/SDL2 -I${SDL2_ttf}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; + + postInstall = '' + rm -r $out/include + wrapProgram $out/bin/enigma --prefix PATH : "${lib.makeBinPath [ xdg-utils ]}" + ''; + + meta = with lib; { + description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; + license = with licenses; [ gpl2 free ]; # source + bundles libs + art + platforms = platforms.unix; + broken = stdenv.targetPlatform.isDarwin; + maintainers = with maintainers; [ iblech ]; + homepage = "https://www.nongnu.org/enigma/"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/games/ezquake/default.nix b/infra/libkookie/nixpkgs/pkgs/games/ezquake/default.nix index 7089c81ee35..90ddb6d6452 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/ezquake/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/ezquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "ezQuake"; repo = pname + "-source"; rev = version; - sha256 = "1rfp816gnp7jfd27cg1la5n1q6z2wgd9qljnlmnx7v2jixql8brf"; + sha256 = "sha256-EBhKmoX11JavTG6tPfg15FY2lqOFfzSDg3058OWfcYQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/games/factorio/default.nix b/infra/libkookie/nixpkgs/pkgs/games/factorio/default.nix index 356cedd3507..879bbfa2311 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/factorio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/factorio/versions.json b/infra/libkookie/nixpkgs/pkgs/games/factorio/versions.json index a8f49d59954..21aa2f6d200 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/factorio/versions.json +++ b/infra/libkookie/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.21.tar.xz", + "name": "factorio_alpha_x64-1.1.26.tar.xz", "needsAuth": true, - "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", + "sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.26/alpha/linux64", + "version": "1.1.26" }, "stable": { - "name": "factorio_alpha_x64-1.1.21.tar.xz", + "name": "factorio_alpha_x64-1.1.25.tar.xz", "needsAuth": true, - "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", + "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/alpha/linux64", + "version": "1.1.25" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.21.tar.xz", + "name": "factorio_demo_x64-1.1.26.tar.xz", "needsAuth": false, - "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", + "sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/demo/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.26/demo/linux64", + "version": "1.1.26" }, "stable": { - "name": "factorio_demo_x64-1.1.21.tar.xz", + "name": "factorio_demo_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", + "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/demo/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/demo/linux64", + "version": "1.1.25" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.21.tar.xz", + "name": "factorio_headless_x64-1.1.26.tar.xz", "needsAuth": false, - "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", + "sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/headless/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.26/headless/linux64", + "version": "1.1.26" }, "stable": { - "name": "factorio_headless_x64-1.1.21.tar.xz", + "name": "factorio_headless_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", + "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/headless/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/headless/linux64", + "version": "1.1.25" } } } diff --git a/infra/libkookie/nixpkgs/pkgs/games/fairymax/default.nix b/infra/libkookie/nixpkgs/pkgs/games/fairymax/default.nix index 5c7cad879d1..d7433950451 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/fairymax/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/fairymax/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp ${ini} fmax.ini ''; buildPhase = '' - gcc *.c -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' + $CC *.c -Wno-return-type -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' ''; installPhase = '' mkdir -p "$out"/{bin,share/fairymax} @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/games/flightgear/default.nix b/infra/libkookie/nixpkgs/pkgs/games/flightgear/default.nix index 3e65915ec1d..62db756a483 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/flightgear/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/freeciv/default.nix b/infra/libkookie/nixpkgs/pkgs/games/freeciv/default.nix index 647a87d571b..dea159f53bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/freeciv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/freeciv/default.nix @@ -38,6 +38,8 @@ in stdenv.mkDerivation rec { ++ optional server readline ++ optional enableSqlite sqlite; + dontWrapQtApps = true; + configureFlags = [ "--enable-shared" ] ++ optional sdlClient "--enable-client=sdl" ++ optionals qtClient [ diff --git a/infra/libkookie/nixpkgs/pkgs/games/gcs/default.nix b/infra/libkookie/nixpkgs/pkgs/games/gcs/default.nix index a471b425f0c..9d8d74921e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/gcs/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/gogui/default.nix b/infra/libkookie/nixpkgs/pkgs/games/gogui/default.nix index 8eb989a8f47..fa901c14f81 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/gogui/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/gtypist/default.nix b/infra/libkookie/nixpkgs/pkgs/games/gtypist/default.nix index d0ddf43fe2a..43b95bacefc 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/gtypist/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/leela-zero/default.nix b/infra/libkookie/nixpkgs/pkgs/games/leela-zero/default.nix index 4a71fc25c0f..13b423832e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/leela-zero/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/leela-zero/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + dontWrapQtApps = true; + meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/gcp/leela-zero"; diff --git a/infra/libkookie/nixpkgs/pkgs/games/mindustry/default.nix b/infra/libkookie/nixpkgs/pkgs/games/mindustry/default.nix index 6f3cdab9ab4..df645171a7f 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/mindustry/default.nix +++ b/infra/libkookie/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 = "124.1"; + version = "125.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546"; + sha256 = "0p05ndxhl3zgwm4k9cbqclp995kvcjxxhmbkmpjvv7cphiw82hvw"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059"; + sha256 = "1injdyxwgc9dn49zvr4qggsfrsslkvh5d53z3yv28ayx48qpsgxk"; }; soloud = fetchFromGitHub { owner = "Anuken"; @@ -114,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la"; + outputHash = "0dk4w8h0kg0mgbn0ifmk29rw8aj917k3nf27qdf1lyr6wl8k7f8k"; }; in diff --git a/infra/libkookie/nixpkgs/pkgs/games/mrrescue/default.nix b/infra/libkookie/nixpkgs/pkgs/games/mrrescue/default.nix index c5b2b7d20eb..ae7519c948b 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/mrrescue/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/nethack/default.nix b/infra/libkookie/nixpkgs/pkgs/games/nethack/default.nix index d6ba771de7e..f9939f063c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/nethack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/nethack/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux sed \ - -e 's,^CC=.*$,CC=cc,' \ + -e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ -e 's,^CFLAGS=-g,CFLAGS=,' \ diff --git a/infra/libkookie/nixpkgs/pkgs/games/newtonwars/default.nix b/infra/libkookie/nixpkgs/pkgs/games/newtonwars/default.nix index 0da6d9352e0..0be3d9bf7a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/newtonwars/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/nottetris2/default.nix b/infra/libkookie/nixpkgs/pkgs/games/nottetris2/default.nix index 53e7dec0803..42e5a33cad7 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/nottetris2/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/openmw/default.nix b/infra/libkookie/nixpkgs/pkgs/games/openmw/default.nix index 7c8f4990a61..3357bf15f86 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/openmw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/openmw/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-DDESIRED_QT_VERSION:INT=5" ]; + dontWrapQtApps = true; + meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/games/openmw/tes3mp.nix b/infra/libkookie/nixpkgs/pkgs/games/openmw/tes3mp.nix index 47b383a82bd..95659e5a088 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -61,6 +61,8 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; + dontWrapQtApps = true; + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch diff --git a/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/default.nix b/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/default.nix index e3c22ae7328..5bffe2a4905 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.205.1"; + version = "2021.226.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "US8auytRXqtYGGNi+vxIzxCxpetWYeUkBRjgtJkPpMs="; + sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/deps.nix b/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/deps.nix index b670ce0c5ed..a1bbc6d0519 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -366,8 +366,8 @@ }) (fetchNuGet { name = "Microsoft.Build.Locator"; - version = "1.2.6"; - sha256 = "1rnfd7wq2bkynqj767xmq9ha38mz010fmqvvvrgb4v86gd537737"; + version = "1.4.1"; + sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; @@ -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"; @@ -556,8 +546,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.1"; - sha256 = "012klayhnnygncdi9zzq32vballb2wbknk91g2ziz5mhdhg38lr8"; + version = "5.0.2"; + sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -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"; @@ -721,13 +701,13 @@ }) (fetchNuGet { name = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + version = "3.13.1"; + sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.128.0"; - sha256 = "19c0bj9d0hjcyhaf04aapyzyd4yrzhc61k89z2il7y32841vnzg6"; + version = "2021.226.0"; + sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -736,8 +716,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.1202.0"; - sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs"; + version = "2021.211.1"; + sha256 = "0rqv5blmyzvcpk0b1r6fzr1bla62kr2fwkr1f9ahir9zafvk2wmm"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; diff --git a/infra/libkookie/nixpkgs/pkgs/games/papermc/default.nix b/infra/libkookie/nixpkgs/pkgs/games/papermc/default.nix index e32ec946b2d..f5bf9573e6b 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/papermc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let mcVersion = "1.16.5"; - buildNum = "457"; + buildNum = "488"; jar = fetchurl { - url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "1xkjaj5wgm9rmzk8mz20n9vd674fynvdgqsy96c9bfifa03lsnmc"; + url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; + sha256 = "07zgq6pfgwd9a9daqv1dab0q8cwgidsn6sszn7bpr37y457a4ka8"; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/infra/libkookie/nixpkgs/pkgs/games/portmod/default.nix b/infra/libkookie/nixpkgs/pkgs/games/portmod/default.nix index ef535991c23..108d81815fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/portmod/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/infra/libkookie/nixpkgs/pkgs/games/quakespasm/vulkan.nix index fbca6e0eb54..3565ce10ba1 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/r2mod_cli/default.nix b/infra/libkookie/nixpkgs/pkgs/games/r2mod_cli/default.nix index b81f1814ac9..a966731725d 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/r2mod_cli/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/racer/default.nix b/infra/libkookie/nixpkgs/pkgs/games/racer/default.nix index dfbe9bc45e1..16507fa219e 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/racer/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/runelite/default.nix b/infra/libkookie/nixpkgs/pkgs/games/runelite/default.nix index df8a5c3e8dc..e9e77e275dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/runelite/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/scid/default.nix b/infra/libkookie/nixpkgs/pkgs/games/scid/default.nix index f0fdef8e62e..7b1a15c0a55 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/scid/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/infra/libkookie/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index eea8d5650be..8d92c88e1be 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/sil/default.nix b/infra/libkookie/nixpkgs/pkgs/games/sil/default.nix index 3128ed5358b..5f589ede2bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/sil/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/steam/fhsenv.nix b/infra/libkookie/nixpkgs/pkgs/games/steam/fhsenv.nix index 924714d802a..6692f9bd9b2 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -134,6 +134,21 @@ in buildFHSUserEnv rec { libuuid libbsd alsaLib + + # needed by getcap for vr startup + libcap + + # dependencies for mesa drivers, needed inside pressure-vessel + mesa.drivers + vulkan-loader + expat + wayland + xlibs.libxcb + xlibs.libXdamage + xlibs.libxshmfence + xlibs.libXxf86vm + llvm_11.lib + libelf ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { inherit runtimeOnly; @@ -218,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) '' @@ -231,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 @@ -251,6 +273,8 @@ in buildFHSUserEnv rec { fi export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"} + + export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/intel_icd.x86_64.json:/usr/share/vulkan/icd.d/intel_icd.i686.json:/usr/share/vulkan/icd.d/lvp_icd.x86_64.json:/usr/share/vulkan/icd.d/lvp_icd.i686.json:/usr/share/vulkan/icd.d/nvidia_icd.json:/usr/share/vulkan/icd.d/nvidia_icd32.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json:/usr/share/vulkan/icd.d/radeon_icd.i686.json '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' diff --git a/infra/libkookie/nixpkgs/pkgs/games/stockfish/default.nix b/infra/libkookie/nixpkgs/pkgs/games/stockfish/default.nix index 71c482fe766..ef9c7fbe4d6 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/stockfish/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/stockfish/default.nix @@ -10,6 +10,7 @@ let arch = if stdenv.isDarwin then archDarwin else if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else + if stdenv.isAarch64 then "armv8" else "unknown"; version = "12"; @@ -55,7 +56,7 @@ stdenv.mkDerivation { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/infra/libkookie/nixpkgs/pkgs/games/uchess/default.nix b/infra/libkookie/nixpkgs/pkgs/games/uchess/default.nix new file mode 100644 index 00000000000..bc2524466cc --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/games/uchess/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, stockfish }: + +buildGoModule rec { + pname = "uchess"; + version = "0.2.1"; + + subPackages = [ "cmd/uchess" ]; + + src = fetchFromGitHub { + owner = "tmountain"; + repo = "uchess"; + rev = "v${version}"; + sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz"; + }; + + vendorSha256 = "0dkq240ch1z3gihn8yc5d723nnvfxirk2nhw12r1c2hj1ga088g3"; + + # package does not contain any tests as of v0.2.1 + doCheck = false; + + buildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin + ''; + + meta = with lib; { + description = "Play chess against UCI engines in your terminal."; + homepage = "https://tmountain.github.io/uchess/"; + maintainers = with maintainers; [ tmountain ]; + license = licenses.mit; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/games/vassal/default.nix b/infra/libkookie/nixpkgs/pkgs/games/vassal/default.nix index effb999e02c..2a916094af4 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/vassal/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/games/vms-empire/default.nix b/infra/libkookie/nixpkgs/pkgs/games/vms-empire/default.nix index fcfc89667af..b3e89617ef3 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/vms-empire/default.nix +++ b/infra/libkookie/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 + ]; + + postBuild = '' + xmlto man vms-empire.xml + xmlto html-nochunks vms-empire.xml + ''; - patchPhase = '' - sed -i -e 's|^install: empire\.6 uninstall|install: empire.6|' -e 's|usr/||g' Makefile + 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/infra/libkookie/nixpkgs/pkgs/games/wargus/default.nix b/infra/libkookie/nixpkgs/pkgs/games/wargus/default.nix new file mode 100644 index 00000000000..fda4f792c7b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/games/wargus/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, callPackage, fetchFromGitHub +, cmake, pkg-config, makeWrapper +, zlib, bzip2, libpng +, dialog, python3, cdparanoia +}: + +let + stratagus = callPackage ./stratagus.nix {}; +in +stdenv.mkDerivation rec { + pname = "wargus"; + inherit (stratagus) version; + + src = fetchFromGitHub { + owner = "wargus"; + repo = "wargus"; + rev = "v${version}"; + sha256 = "0dibm68jxaqzgzcyblfj2bmwyz9v5ax0njnnbvak7xjk1zlh11sx"; + }; + + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + buildInputs = [ zlib bzip2 libpng ]; + cmakeFlags = [ + "-DSTRATAGUS=${stratagus}/games/stratagus" + "-DSTRATAGUS_INCLUDE_DIR=${stratagus.src}/gameheaders" + ]; + postInstall = '' + makeWrapper $out/games/wargus $out/bin/wargus \ + --prefix PATH : ${lib.makeBinPath [ "$out" cdparanoia python3 ]} + ''; + + meta = with lib; { + description = "Importer and scripts for Warcraft II: Tides of Darkness, the expansion Beyond the Dark Portal, and Aleonas Tales"; + homepage = "https://wargus.github.io/"; + license = licenses.gpl2Only; + maintainers = [ maintainers.astro ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/games/wargus/stratagus.nix b/infra/libkookie/nixpkgs/pkgs/games/wargus/stratagus.nix new file mode 100644 index 00000000000..f029e284f33 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/games/wargus/stratagus.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config, makeWrapper +, zlib, bzip2, libpng, lua5_1, toluapp +, SDL, SDL_mixer, SDL_image, libGL +}: + +stdenv.mkDerivation rec { + pname = "stratagus"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "wargus"; + repo = "stratagus"; + rev = "v${version}"; + sha256 = "128m5n9axq007xi8a002ig7d4dyw8j060542x220ld66ibfprhcn"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + zlib bzip2 libpng + lua5_1 toluapp + SDL.dev SDL_image SDL_mixer libGL + ]; + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow" + ]; + + meta = with lib; { + description = "strategy game engine"; + homepage = "https://wargus.github.io/stratagus.html"; + license = licenses.gpl2Only; + maintainers = [ maintainers.astro ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/games/zdoom/bcc-git.nix b/infra/libkookie/nixpkgs/pkgs/games/zdoom/bcc-git.nix index 8716a82fc10..2e9f1a9c2b9 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/zdoom/bcc-git.nix +++ b/infra/libkookie/nixpkgs/pkgs/games/zdoom/bcc-git.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; - makeFlags = ["CC=cc"]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./bcc-warning-fix.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/games/zod/default.nix b/infra/libkookie/nixpkgs/pkgs/games/zod/default.nix index b07db62aa15..6c48caf8756 100644 --- a/infra/libkookie/nixpkgs/pkgs/games/zod/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index ce11f4a0551..c46bb564a1e 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "5.70"; + version = "6.00"; src = fetchzip { - url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz"; - sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is"; + url = "https://gdlp01.c-wss.com/gds/9/0100010739/01/cnijfilter2-source-6.00-1.tar.gz"; + sha256 = "1n4vq44zya0n4a7jvq3yyqy7dcvc2911cjvxmq48zqicb2xdgafr"; }; buildInputs = [ @@ -114,10 +114,21 @@ 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"; - homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; + 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 = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/misc/documentation-highlighter/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/documentation-highlighter/default.nix index 022cc4aa834..2a34e36742d 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/documentation-highlighter/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/infra/libkookie/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch new file mode 100644 index 00000000000..03eb329f4b6 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix new file mode 100644 index 00000000000..1051d469f61 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/emulators/blastem/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/blastem/default.nix index eba646e2f20..a2dc86449d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/blastem/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/emulators/cen64/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/cen64/default.nix new file mode 100644 index 00000000000..0153ed11cd2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/cen64/default.nix @@ -0,0 +1,29 @@ +{ lib, cmake, fetchFromGitHub, libGL, libiconv, libX11, openal, stdenv }: + +stdenv.mkDerivation rec { + pname = "cen64"; + version = "unstable-2020-02-20"; + + src = fetchFromGitHub { + owner = "n64dev"; + repo = "cen64"; + rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed"; + sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGL libiconv openal libX11 ]; + + installPhase = '' + mkdir -p $out/bin + mv cen64 $out/bin + ''; + + meta = with lib; { + description = "A Cycle-Accurate Nintendo 64 Emulator"; + license = licenses.bsd3; + homepage = "https://github.com/n64dev/cen64"; + maintainers = [ maintainers._414owen ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/citra/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/citra/default.nix index e1a31d208e4..ae7228c2246 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -14,6 +14,8 @@ mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 qtbase qtmultimedia boost ]; + dontWrapQtApps = true; + preConfigure = '' # Trick configure system. sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/dlx/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/dlx/default.nix index 3360d45ccc8..7ba4516a498 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/dlx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/dlx/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation { sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; - makeFlags = [ "LINK=gcc" "CFLAGS=-O2" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LINK=${stdenv.cc.targetPrefix}cc" "CFLAGS=-O2" ]; hardeningDisable = [ "format" ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index cec004e2469..8a4adfa314b 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-13178"; + version = "5.0-13603"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "a34823df61df65168aa40ef5e82e44defd4a0138"; - sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1"; + rev = "7250d6e4e091f4b5b4f2289c2c732349b69a2e8a"; + sha256 = "0l4vvxmc79x0b5p8k4km7p380wv8wsbmxjnif08rj0p3brbavc1i"; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index c0e54e48db3..62820f2c96b 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/infra/libkookie/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; { diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix index 7d0d6c6f68e..8a11b633d28 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/emulators/py65/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/py65/default.nix new file mode 100644 index 00000000000..66ba3cdf4b4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/py65/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonApplication }: + +buildPythonApplication rec { + pname = "py65"; + version = "1.1.0"; + format = "wheel"; + + src = fetchPypi { + inherit pname version format; + sha256 = "Q7rjiHJ/Ew985vut/8fVAf/wWYW5aBPSvNPm8A6g1zg="; + }; + + meta = with lib; { + homepage = "https://py65.readthedocs.io/"; + description = "Emulate 6502-based microcomputer systems in Python"; + longDescription = '' + Py65 includes a program called Py65Mon that functions as a machine + language monitor. This kind of program is sometimes also called a + debugger. Py65Mon provides a command line with many convenient commands + for interacting with the simulated 6502-based system. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix index 08ebf8ea854..40d9f07846b 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 60e595bc51b..3e7e0af4295 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -15,13 +15,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6498"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6574"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "67033ed8e05eb70860ac6af2b83deab0256c11eb"; - sha256 = "1lg0cybbrf0x3jl10jwdwcg1zyhxsqfdnwnsvdm1lah75xg15ymw"; + rev = "80ed8596c165127fb52026c697a9b6b515dabbd4"; + sha256 = "0jhrl8g9fbz3w2hzmy9jm22cvjfa0x5vh3912rz1rvnd41qb9vs8"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { export HOME=$(mktemp -d) export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 nuget sources Add -Name nixos -Source "$PWD/nixos" nuget init "$nugetDeps" "$PWD/nixos" diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/sameboy/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/sameboy/default.nix index d23129eba7e..6b209840169 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/sameboy/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/emulators/simh/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/simh/default.nix index 08068debeef..1e939538cda 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/simh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/simh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; + makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; preInstall = '' install -d ${placeholder "out"}/bin diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/stella/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/stella/default.nix index f6a3d65c4bd..ff90ae8908b 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 15e2f80aa4e..1bcd08e6f40 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/infra/libkookie/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.1"; + version = "6.3"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk="; + 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-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo="; + sha256 = "sha256-Fok0jdGBQtH84PL6LVnuCR7ZVSUIHECqPUI/2lLXs44="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/base.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/base.nix index 89c8f2cd947..a4bb3addf86 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/base.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/base.nix @@ -1,5 +1,5 @@ { pname, version, src, branchName -, stdenv, lib, fetchFromGitHub, wrapQtAppsHook +, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook , cmake, pkg-config , libpulseaudio, libjack2, alsaLib, sndio, ecasound , vulkan-loader, vulkan-headers @@ -36,15 +36,31 @@ stdenv.mkDerivation rec { ffmpeg ]; + patches = [ + (fetchpatch { # Without this, yuzu tries to read version info from .git which is not present. + url = "https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/28cbf656e3188b80eda0031d0b2713708ecd630f/inject-git-info.patch"; + sha256 = "1zxh5fwdr7jl0aagb3yfwd0995vyyk54f0f748f7c4rqvg6867fd"; + }) + ]; + cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" + # Shows errors about not being able to find .git at runtime if you do not set these + "-DGIT_BRANCH=\"\"" + "-DGIT_DESC=\"\"" ]; - # Trick the configure system. This prevents a check for submodule directories. preConfigure = '' + # Trick the configure system. This prevents a check for submodule directories. rm -f .gitmodules + + # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work. + cmakeFlagsArray+=( + "-DTITLE_BAR_FORMAT_IDLE=\"yuzu ${branchName} ${version}\"" + "-DTITLE_BAR_FORMAT_RUNNING=\"yuzu ${branchName} ${version} \| \{3\}\"" + ) ''; # Fix vulkan detection diff --git a/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/default.nix index 89a500bb313..cce501aa941 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/emulators/yuzu/default.nix @@ -4,25 +4,25 @@ let in { mainline = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-mainline"; - version = "517"; + version = "546"; branchName = branch; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "0i73yl2ycs8p9cqn25rw35cll0l6l68605f1mc1qvf4zy82jggbb"; + sha256 = "0d6cbhp877xyjac1flkyjf6g6igzmvjlk6gcph4m04i4zivb9kf2"; fetchSubmodules = true; }; }; early-access = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-ea"; - version = "1377"; + version = "1480"; branchName = branch; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "0jjddmcqbkns5iqjwqh51hpjviw5j12n49jwfq7xwrsns6vbpqkf"; + sha256 = "0flc5mckmnr9gj8f78nh9nys96inlkqk3rvpgbpl0mhcg6lmlb2g"; }; }; }.${branch} diff --git a/infra/libkookie/nixpkgs/pkgs/misc/jackaudio/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/jackaudio/default.nix index 24d2b5e135c..9dd97367441 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/lilypond/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/lilypond/default.nix index f005a59dbfa..d8db893f7d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/lilypond/findlib.patch b/infra/libkookie/nixpkgs/pkgs/misc/lilypond/findlib.patch deleted file mode 100644 index 30e130bc8ad..00000000000 --- a/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/lilypond/with-fonts.nix b/infra/libkookie/nixpkgs/pkgs/misc/lilypond/with-fonts.nix index 2f3a95a3302..47cbb59f2f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/lilypond/with-fonts.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index 11d85e59776..be605192acc 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix index f3e5ae251ae..981db782c7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/tmux-plugins/default.nix index ef20bbaf66e..333830f0143 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -129,12 +129,12 @@ in rec { dracula = mkDerivation rec { pluginName = "dracula"; - version = "unstable-2021-02-09"; + version = "unstable-2021-02-18"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; - rev = "d1678a5834679d98ffac1dd7a0eaecff7868ab8e"; - sha256 = "rdy5NFkh5Yl2YOTnuMKZQGRqVb2Pk8Bpq3nbJp2rCtE="; + rev = "8d1a7fa41b773d4f7b53dfff2d9fc5166d34f104"; + sha256 = "DG+oKbTkYO4hwoOlOqW5IuCLdVEttlvLM2en4DUHyMY="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; diff --git a/infra/libkookie/nixpkgs/pkgs/misc/uboot/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/uboot/default.nix index 20d928d944d..f8f3df665d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/uboot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/uboot/default.nix @@ -178,6 +178,27 @@ in { ''; }; + ubootNanoPCT4 = buildUBoot rec { + rkbin = fetchFromGitHub { + owner = "armbian"; + repo = "rkbin"; + rev = "3bd0321cae5ef881a6005fb470009ad5a5d1462d"; + sha256 = "09r4dzxsbs3pff4sh70qnyp30s3rc7pkc46v1m3152s7jqjasp31"; + }; + + defconfig = "nanopc-t4-rk3399_defconfig"; + + extraMeta = { + platforms = ["aarch64-linux"]; + license = lib.licenses.unfreeRedistributableFirmware; + }; + filesToInstall = ["u-boot.itb" "idbloader.img"]; + postBuild = '' + ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_800MHz_v1.24.bin idbloader.img + cat ${rkbin}/rk33/rk3399_miniloader_v1.19.bin >> idbloader.img + ''; + }; + ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -249,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/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/generated.nix index c4448194a9e..3f146382dc6 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8cb9f5ef515f73eb3cf3188cc20ff57a51d9217b"; - sha256 = "1ml2j5l91n1zwp7zxdg2cny48bbj1gw0dfa223bf5iq472c1ggk2"; + rev = "826878c41e546a93919aba08e5a134433222b3a5"; + sha256 = "00nfjxrakl6p1knz8gy0n4flm537acj66nxvnb5hq3isn8h06gbw"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,24 +89,24 @@ 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/"; }; ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-10-15"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "7abb04c115742ec9a5f90b86170f0118680cf8ec"; - sha256 = "185b4dari7y05p99756bqld4kk3d124ry4m4j7an8qm0zmpq648m"; + rev = "de933417e5d37b10d1834095fcd0a1c8c360d34a"; + sha256 = "1fwjpkzkpwy808949iqbsgi6kxyglfyzr1d5hc1911vbayn8wyjy"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-01-28"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "4be3c16b33c27fce5372bf8bc74e42126c76fe61"; - sha256 = "1y5xlisby7a41naas7r09ins3k9arn5xc5bb6w8k7am6xz3vc3r6"; + rev = "f7f017e24277266984b54a9829adf51ba13f085d"; + sha256 = "0kp8z1pwn057hm6bccp0v94mvvm2dcpdw6qlhjp1pzs8prgvp0nl"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -233,12 +233,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-01-29"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "8f437c8960abbd4b29c05a19eaad8c3e792ace05"; - sha256 = "039xln6bwxa6mbwvzdfk32b3v8p4glghb3104nydscy9zbsmpick"; + rev = "1ed59bff2a84e48e1a243a7e5d336a395f610e2a"; + sha256 = "1acz9zwb9mwyhfckpzv22dy5c4bq83jrmvvbd22z9k0hm5py2538"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-01-16"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "80860e972cdf78e0e0b8dc7f16e07142966f73cf"; - sha256 = "009gnamainla5z2q98p6mi4gifmlbx5im7d2gx2d0da62cbdrcsl"; + rev = "42d7112d78839ef9bd2b283ec0d9d82134e94b4f"; + sha256 = "0i2vx60h27sal1crl8di4rq6dp4c8zjarknjl9z09l1s798l5i62"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-12"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e3e679e077708ee8a4de6bdcdf4135ac1f1ebd9c"; - sha256 = "0i7wznlvamybbrz0qjvynkzk6alcxa327nrlw95la6qbw67vkbsl"; + rev = "a43d2124a6b994df18b26a8a783f16534bac14cf"; + sha256 = "0pqd4593wnlr7x6rb4lmj3vz4j41rrlkmbd4a18lq8ivp9q6faa0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -425,12 +425,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-01-31"; + version = "2021-02-21"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "c7537d81a796b4559e03309aeec9cb8d6d7bda21"; - sha256 = "05p8viz5q7rknzyh7zp3k2qhl14nlamik5gvqy86bfgwmhbac350"; + rev = "29eee5e5c23b3fde59192df92baf7ba775867092"; + sha256 = "0plq37r00d5sn6hci7wn8df09dca3cigvd80pq08pcngbm4h19wl"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -473,48 +473,48 @@ let 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-07"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "8c839426885e290ff5f63d87778f6325339ecf1f"; - sha256 = "03ssv8b5pq44dnj9iplpc76js5mpwg0l77wg4zal5gx0ashgm39p"; + rev = "62206b3cf8e06137919e8cbdcb52c474fe1dbd95"; + sha256 = "0y1j2qmncp0n2piiayfbfk39rj0nivjx0wfjh9wnq0s1y2ijcg91"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-12-29"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "a8b32b8b8a37d7fb87687c0187b7ad36987e2122"; - sha256 = "1x6xfizcix1hlcl2dhxbaxxl2q7lpgnfyvdg81c88rcn68qykfn0"; + rev = "3c8ca6127af51768cad8ff1074db5a9713d7fe13"; + sha256 = "17988plg3zrfnfzp4pr292qbk5zi8qgjldkhqsv5w9w38a02gxqj"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-02-09"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "9fd7f97b9696e53066a8e62f528f26b6bc1858b0"; - sha256 = "0lnkz1janblic4a15lr9fm6r62691wpgggdq8hyc5dz0m32jr0hn"; + rev = "6f5b03b5d0ea59d73f809cb2a26317be6b0e14b8"; + sha256 = "1vcqm994i8d985k2fp09s3y1db87yk6pa4mnywzg561nk00rm5vh"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-01-28"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a336a8bc251702d9526a6818ae56e86d92fafc0c"; - sha256 = "0jh5ik1w6qyp9scr9qxi47n7b8xgznknhsriwcpw2axs9ff00zz8"; + rev = "70e5a383cd1c5e39505ef016e8507e7daa4bc7dc"; + sha256 = "0mgaj8d1jl2rh56a5mgl0wwwjmgmyk4vcxh19yyvpji73gpkywxh"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -616,14 +616,26 @@ let meta.homepage = "https://github.com/rhysd/committia.vim/"; }; + compe-conjure = buildVimPluginFrom2Nix { + pname = "compe-conjure"; + version = "2021-02-02"; + src = fetchFromGitHub { + owner = "tami5"; + repo = "compe-conjure"; + rev = "809853ff8098dffcf8ba5ac89bcf07806eb8f981"; + sha256 = "0p7p4bgkh05zy0gzmq0g9nn9npykh1l17cvfzjyhcb3n1sczpjzf"; + }; + meta.homepage = "https://github.com/tami5/compe-conjure/"; + }; + compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-02-12"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "ea3e34dcbe09563c986bc60ec7d3c0db18ce9690"; - sha256 = "1gsi5ybkqxqv1q3yj2qdv5j2lhkwiabr3mrcj60ah5rb1qjvlmib"; + rev = "b1521bb52a9ddeacc2a7db56aa26d45dc91e6277"; + sha256 = "1dknyar320rpaqq8l5kwq0n3lvmgw4qpjybg4dnz69ms54xijpr7"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -690,12 +702,12 @@ 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/"; }; @@ -726,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-02-09"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "f1deefb084b28197eaf988bbebff70dd86a99e03"; - sha256 = "1461h9qlfvvcvig4zrbylm4j11xkxmbnha1nk5829xm50pjkmca2"; + rev = "7f6509ab9d405c9ba7a1f06cb9533bfe570becf5"; + sha256 = "088iy90rsxskaalqagw54w159gy0wlcq751b989bf5knz2f1d3c5"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +786,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-10-07"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "350af4840991142230103e4f4fc58581d9c07812"; - sha256 = "1ibmrz1h51iy5ffvwalfydgjvdsfjvbpz1s1zmsalpv8mlswrhij"; + rev = "73c8eeca4c89768e4c53bb7a83cc3741bdcb5c7d"; + sha256 = "0hdcq8acylp8i3gh0agxjr3v34q6c4qmdwnpx1v31y3cy0j8k7v3"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -844,6 +856,18 @@ let meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; + dashboard-nvim = buildVimPluginFrom2Nix { + pname = "dashboard-nvim"; + version = "2021-02-27"; + src = fetchFromGitHub { + owner = "glepnir"; + repo = "dashboard-nvim"; + rev = "3957e4d25c9625812d9d47ea448c68015b1092e8"; + sha256 = "15jbszl0ip5hjf9nfvs9y90shqz0ix04za1l96kfik1p47y7wjd8"; + }; + meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; + }; + defx-git = buildVimPluginFrom2Nix { pname = "defx-git"; version = "2021-01-01"; @@ -870,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/"; }; @@ -918,24 +942,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-11"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "2ea80dfe51974a21a7ec695c23fe86be3a8b10ac"; - sha256 = "0ilqw2jfrjq1h0camgqzf3h0p78gz5k4v8sgsixfbijv0syim2y0"; + rev = "4eb4327162c4ec885446b349149b5d25b7307bc7"; + sha256 = "0h4f1axd53lc5k5c6kv2zcsxhh3pjbl7hmi7y15qnvbgr8xa8s4x"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-02-09"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "907cf91cc491348bf383f3eb447c1be2a9330cb4"; - sha256 = "1xsri4chlzfr0zc93wl96fpy381maygc3dlvy58nz2yswdr0g103"; + rev = "d66c706c9788aa47399485a3ec29a2a76711a188"; + sha256 = "09bj5442xln6a98ncnq1lxkyrl8c973p9sfd02zl1a3f16sms415"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1112,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/"; }; @@ -1136,12 +1160,12 @@ let deoplete-vim-lsp = buildVimPluginFrom2Nix { pname = "deoplete-vim-lsp"; - version = "2021-02-06"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = "deoplete-vim-lsp"; - rev = "fd80985bfd9f140c8e38b303ab325ec86c05b976"; - sha256 = "1h9xprfqrfnfs50hgiah0c2y9lafhc2lldvmc7cl8xa5p9bslxj3"; + rev = "af5432f1e063fd4c3a5879aa8c2afe82c17dc1c9"; + sha256 = "1s6fw6vkpl0yiya22g13v4i14w3n1ds2zr8zdlwpkk44bf0225px"; }; meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; @@ -1160,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/"; }; @@ -1244,12 +1268,12 @@ let 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/"; }; @@ -1342,12 +1366,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2021-01-21"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "b3e7b62ef6820ccdcbdc6070f3573b658aafba43"; - sha256 = "0lf2vlsyk4ymhyscnpla417hvh6qdi8cablammnc5vsk1hmqvc3i"; + rev = "e67b1dbe5842b709687c214fea38ca00f0ffe6c6"; + sha256 = "1ljvl7p2k3bgl54srf6kvshqq16qwfa34ppj982fp2bzzal819l1"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1378,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/"; }; @@ -1511,12 +1535,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-02-09"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "e30c355aaf6d2ca9aaa3a246eb87c7ceb4c42855"; - sha256 = "09w6gvy9hg0cgrs6661g8kfyjd4waz0ajx983p5jqr6l9a96111k"; + rev = "916c00d6a53ab492a46b1f8aa3e052136e804483"; + sha256 = "18yvbxa5rc2s1qyv94d7y6jd2b10ivcv01i42w80gp2kbipp9nay"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1547,12 +1571,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-02-06"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "298c69898c11c2da574a6d2c32e195b0adc6f356"; - sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax"; + rev = "abbb157ac9d06fdfba537f97ab96e197b3bb36cb"; + sha256 = "008alqgqbrjh9sqgazqq1kk5hnpikd8afnia5lx9rv8c2am1d2fv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1571,12 +1595,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-11"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "ae0c39167c83507c6c257cd13268c98b8066cb50"; - sha256 = "1xggg0h7phjjdjpzp884z7xqniyk3ca4yjc86lyh9vhbww87xa9c"; + rev = "b79422434a419b97c5817d9ff645216952152443"; + sha256 = "0xwz4kw5mwqrh6s9vyzzx4fdl7335n9qjxzhm1c41hh1j2ikwqa9"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1595,12 +1619,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-02-10"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "317750d66a572588eef9a23fefce4aff1cbcad94"; - sha256 = "0nc52f0hkb701scvnas6my9i92ys1i9c5y9h4h42yk00ph83k2k1"; + rev = "cdf8e98ca16521138e1376279772dfcf60008ec8"; + sha256 = "0f4lw019qdsxj9rqpcjc5rr9wgabwbp1af0r2p56zx2cy9iyz4y6"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1679,24 +1703,24 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-01-17"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "c73e63203f76ab8e39b2b05369c0a8877a981435"; - sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r"; + rev = "deb4e40e4f26b0ca9db81e5463110c060f24635a"; + sha256 = "1l1bji23vgxgs23a2gpywnq9q03bd44lh159da54pdk69fngj3lk"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; - version = "2020-01-15"; + version = "2021-02-21"; src = fetchFromGitHub { owner = "sjl"; repo = "gundo.vim"; - rev = "99e6240340d9ba07b66c544daf44fa7caffbf7e7"; - sha256 = "0py35mmwnfl581isnbh33j3bjgghq17jnamdi1bg3akwyn1jyhqb"; + rev = "c5efef192b975b8e7d5fa3c6db932648d3b76323"; + sha256 = "1smavxh0nmx4la75b1fjh8cs2x8p8ahxls034254vnm05wiwvghh"; }; meta.homepage = "https://github.com/sjl/gundo.vim/"; }; @@ -1761,6 +1785,18 @@ let meta.homepage = "https://github.com/urbit/hoon.vim/"; }; + hop-nvim = buildVimPluginFrom2Nix { + pname = "hop-nvim"; + version = "2021-02-26"; + src = fetchFromGitHub { + owner = "phaazon"; + repo = "hop.nvim"; + rev = "b844a533d654271c66cea44182522a56b2d0c8c1"; + sha256 = "0v54q2dz98k9qivsmcj3l41gxc1abdfvvgkksclqjg8qcqq1pl6w"; + }; + meta.homepage = "https://github.com/phaazon/hop.nvim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config-vim"; version = "2020-03-28"; @@ -1955,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/"; @@ -2004,24 +2040,24 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-02-03"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e16cb07240903999e8c62e6d27b4aee8146d29fc"; - sha256 = "10ms35xl218kr5n02y353kg535icj0zzyrsxzzlmn99w90hbnkl7"; + rev = "6db659027d6a5ba6b11b1a3333b0bd301dd01574"; + sha256 = "0c7qcafjk0chdxg027lihrypxlr10nvk1xzs82icqis0ija3yppg"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2020-11-02"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "f338707b2aa658aef4c0d98fd9748240859cf2a9"; - sha256 = "0wm9bkykvm89f966a8wxm5vvg9kjayy5iziahnch35hrmscs5x4b"; + rev = "7f967873c8a3e566bdf10715569319a632f3de93"; + sha256 = "1db6i2w93pfgw1nkhgw9m75crbx62rh5cvw7pbjs69xmbfd2zlld"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2136,12 +2172,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2021-02-12"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "3223bccf0ee4168aae6753a5cf0c0aa32a60c586"; - sha256 = "1qka3hqm2376wz5pbr8x2c3rqycv392lv34spkqayq0d0fs4sqq0"; + rev = "73fb502c6d1470243b1f4d8afa81e289d9edd94b"; + sha256 = "1whrzpavv46r64l3b7vax4sj23kjdfjiwmhfpssb6bprhc9c4j97"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -2160,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/"; }; @@ -2184,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/"; }; @@ -2220,36 +2256,36 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-01-27"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "0c45512ffabc6997f74c26b9c87d4b3cb021ab19"; - sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl"; + rev = "2410236d448aa8f407f6a203d90282c34d48b52a"; + sha256 = "0kkg7nbnqj1v46bqq73l58m743p0p7jcbgpscjb16n9ab0n8jqns"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-02-07"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "187c492c492f8b57c1a66b82904785141b01d5ac"; - sha256 = "0i8j37i2lkrsjlya9g5i8wr3gjlfkb9g9sqzq6a0132s6rpqdhmz"; + rev = "925acdab0886fe5f0752561ea49e95b9f02e09c7"; + sha256 = "0rd3gqgz573ll11wnw1r182siamc3cxqqf3cyhqznkiq7bw2g9xh"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; - version = "2020-11-30"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "25951aca067b3a22f303f59d8eac2101d861850a"; - sha256 = "0bl7y9xpvlmisizyyykjskxmrg01s6p7nkgdfskx14dv2f8dmv8q"; + rev = "ce5d03822fda9ddbdeb2461e5b4c06c1641fe7ea"; + sha256 = "1gybxaxgbq1s1ijvrl9h9nq443cyrdnhgi1yjqxzrr64wz7nr8v0"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; @@ -2268,24 +2304,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-11"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "284b357137c3c57ff3716e07c865477788ab8e6d"; - sha256 = "1n737lqnkgvyjxnmxfg6hmbnjgdx0qyrqql0fxb85m1n06gsm2n7"; + rev = "1fabedb8d93896abda55660c8fd6c8ad7d953af0"; + sha256 = "0lib7ly88isbz1kqj172fjycw71a9rl2zhffipkkgwlcz5i5hkm9"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-10"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "8a4baa804b7b2906eb8b9c325546dceabffdfcfd"; - sha256 = "1fq5aa4yg5r1dr2g18xnywg7pyid6s9vzm71zy3anmdp4g24amgx"; + rev = "8c8a4896125e9d01063bbf906af77c9d8faf39b4"; + sha256 = "0zz2b5ph7jadfk6kw14s38w4nch4wyrvm24qyijpan67k7nz1qpy"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2352,12 +2388,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "05a9ef7981ff6438e3de5e30323474092badccb8"; - sha256 = "1nr40222fcf1zfacwn2qdzzr074kvcp0p50ii8s6na99qp00nq78"; + rev = "3fe7878d83156cc9351fa94e25b0de854bcd6f8d"; + sha256 = "1l9di7q0mlbcgs4xbqg2ias3hy5qib72zi1nwjw06snxlffz2hpq"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2580,12 +2616,12 @@ let neco-ghc = buildVimPluginFrom2Nix { pname = "neco-ghc"; - version = "2020-12-19"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "eagletmt"; repo = "neco-ghc"; - rev = "ba23875fadc5e9022acb9d746b99f6fe5155d586"; - sha256 = "08q3wlaq6a8acfcbhh3gdhzwn5rr7w18aqqww0z76hgblav11a4k"; + rev = "699897c2f4ba82c4fd2be6b93c9a2e8e548efe4e"; + sha256 = "03g2mky83a5zd54wzjhc1cv4pwkzcadskjm1c7b36k85yw35v88a"; }; meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; @@ -2628,12 +2664,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2020-08-12"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "f80bbf8f2f1717a127e5fbe885729daa862def81"; - sha256 = "0cks5fvr05k0lp2mwflqzx0mq6a3881c1304hdyci57j5bkkyvkj"; + rev = "fc2d22c23962290cc0b32f50bf18add6a4573bdf"; + sha256 = "04sxri3anr5d8zdqw11fn8nqf86wxin4lza78dp2x52kgrjawpla"; }; meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; @@ -2664,12 +2700,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-02-08"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "53f22813fb3e60a4175ee44de55732b93c2903de"; - sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj"; + rev = "61a1e55394124d66288ecd1b963ad91e6304e463"; + sha256 = "15s8glj9i72n1ckfrffbd7w0widc1vgnppir9n3qn9niwxby24xa"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2796,24 +2832,24 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-02-02"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "b83e9cdf835161b398e04e4c462103fd21801ee3"; - sha256 = "15x4qw0l9j228rrfqnwzg13j7cr0k69xd46rcsa4886lw8nmpsak"; + rev = "16ecc429ec2792ba5c972f0a920dc14223b7bd4a"; + sha256 = "03hfkfw34scbw127gmihxa6x9f02y979ig2204br508rz75qqfaw"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "3a9d533f3de86a43b69f6c47d3394c0d866fdb08"; - sha256 = "032hn7p7kgvrj0qg4gmpvl072zz4p9s5n8mrbs3k8c3lln1n9wh6"; + rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2"; + sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2892,16 +2928,28 @@ 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-01"; + src = fetchFromGitHub { + owner = "nathunsmitty"; + repo = "nvim-ale-diagnostic"; + rev = "0d1d7a7ba78e9ad0b57060ba7372c486cb341139"; + sha256 = "0pd47yxac81dxp3w3a5pf5k16pc5j9m2pqwdf5nnxwy0by94nak9"; + }; + meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/"; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -2916,12 +2964,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "bef454eecc11fb13e5bc3f29f443f495904470ef"; - sha256 = "0plhhwip0nwc0fhgx5f1i6qhfl6msxf43vhgrv2xihmb30zjf2qr"; + rev = "7a998c5716c2bb9a25276cf1ce7076f99582a45a"; + sha256 = "0hhznddyy3a8k7vlqhwm6fg8hsyy88ifg7a7rcxd6q8zffm66r1i"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2940,12 +2988,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-02-07"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "10a740b2364efc9acff78f4e7466902f153e584b"; - sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h"; + rev = "6dbb5924dfecb28127171648115f2a9d8675bf0e"; + sha256 = "1vwra4bf7q5vy2f80fc4cj78i2jnwpci2yclqwy3df5fn3ldri74"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2964,36 +3012,36 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-01-24"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "531a575d1768be4531246950e55a784739b5d0a7"; - sha256 = "03hd7bq09gz23619b19cz29hafhia5r28xm8bqnj03d2m6b2xlyh"; + 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-01"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "aa8e36bd4f34dd0157d725c74874dfa44841a5e7"; - sha256 = "1zrqd3ndlv3393xjmf1n3w6im24fyqmnpldqvph5ix9lfrrf5vzh"; + rev = "c70b96f4a385f3d6dd0e96ad59382e0834be8eab"; + sha256 = "0kr45hrqvxl81hvbqr7w4zn0yw01qwnaq0bd60v0ibr8q79zck5m"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-02-11"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "90ac936055ba8432b532392835e0fbbd82e60836"; - sha256 = "1hfda95gwdglycs00a9rwvfar9w579234zn3sz4pngi5crdamr38"; + rev = "1e06ce52015d0578cd24c5b01fcae1a2e2abbdc2"; + sha256 = "1c6crqc3yfi3h8mh55555sjrlif7j2q0j9wvajiagjfhggkhdggb"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3012,36 +3060,36 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-01-30"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a35ce80f0e618da0eceb0d5f6874608d58d3ec26"; - sha256 = "1m87v27721zdplpfk0dd8mag416dxmnqja2smwb7z29n18qh81sn"; + rev = "fa2d4af6127c646ae1f2b68b3ae2abe495cdc6a1"; + sha256 = "1f67k8c0rq9wbk9alvcc1py0rw6rrvas8wc25ngscwcnvp3ksyw8"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-02-05"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "9198402f3417b0dbf26e73cac8cb53e074c163f1"; - sha256 = "17gqdrskr744b1z26fjf01a9nvfasd4fhaa9dmmi4g4br8556cyj"; + rev = "37d427ae1635da7800f7f09f831b35df1185ac38"; + sha256 = "012hd5xpcmmvgxrk6m7m28q288v485w7nzvnayfl4s3dk4jzq8rp"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-02-12"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d3c178ac78f8930d4ca094685744f5c705b56b55"; - sha256 = "1mj761vxq3dd7m384ig6dhipg43qw1w3cpkkvq9aymnlsvfi5b1d"; + rev = "470b0cf45a7e60243e97628c21b05804088dfbf5"; + sha256 = "1qw5psrcxl154qgqf9w6sqhv8y92nwjryz3fcqc6n2jl2p4fszv0"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3060,24 +3108,24 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "d4276b9601c683ad802893fed0cfe12a8631e931"; - sha256 = "06sazbjcnv77c11b835b7n8p78vmzw9zl3lkqbfl6yarbbzniisi"; + rev = "c8be830b8b594480cac5ae2ab1af94cce1e85029"; + sha256 = "1l09xaw7xlsh1rk0amq9n22lg44wa5sn2hhmkmxyzrn3h80kg432"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-01-09"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "426fc6549aff1d5a1b84127dd80807a4f134d4ab"; - sha256 = "0yadrawg9q49fiizn4k8ng9hsp9vi2l0bw73s6ib0szg641k1w42"; + rev = "da24e049457ddd1f3e1b9305693bee70c8d1567b"; + sha256 = "0g17x5kl2ifhfl62wapb5aazv2w502r072k604q7wbc64kjg62sk"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3096,36 +3144,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-02-11"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "c59831a5d11a35594dc4e379a89d276d5ac83cdf"; - sha256 = "0wf36dlg4hq2hfvyvm1i7z83ky1x4rr7vv249sk01clsy84nylql"; + rev = "1984c125100247f79e1aaa4de335032ea6092d63"; + sha256 = "081vcbasmhki7hshfaimbv1wgim15h6vagcxc4fkjgbmpl621s49"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-12"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e5facde11bc8a2577dbfd56e2a4063320b09bc0b"; - sha256 = "1i1dn4akszkly6cjf3z9s17y1fdgsgk0fr5i50hs4mlnxy7al01i"; + rev = "d162a83d824fcb7ec44472288af2d7379b4bd8b0"; + sha256 = "0b1qqy32lcjgfkq9s570g0248qff1901l2hadkaqv5i2az3dgp96"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2020-12-31"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "a7773cc3c581fa43cf0b59693ecdc6fc4e79e748"; - sha256 = "1mxm6b00jmnci4yvd3bs9njf73bjbdwcn10l5bw9180a511aggv1"; + rev = "0dda360a8f841550ca565564c5a409746353e94e"; + sha256 = "058hfybqhcwvmhjm7k9iww2baz2fpww7nq6m9xngj3wdwfkylcfy"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3144,12 +3192,12 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-01-01"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "065b342db053810ac7a5ee9740b891cfa05c380f"; - sha256 = "07yl5iin11snw2637860r9zva9yfn7qkljkv0sjfldm73afflds7"; + rev = "b0f6d2c91b46faecee8b44f426de4b40d8ec8494"; + sha256 = "1r93lbh6yzq59nzkj8sdmdy4pjris5cjlh7w491xkahyizfja1ln"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3168,12 +3216,12 @@ let nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-02-11"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "cadf0c30659acc8c60fec8100b81ea0fd92a8a9c"; - sha256 = "06d32z6rlz153vfbydcjvm6l2qrnjw0d6a60qxjpmbmby66nvcya"; + rev = "b840a1f0fc35019998e6f09dfdd8dbb241764458"; + sha256 = "1q3a5ivlvk7ni5b9jxhymdrdssnxhisb6cq07rdwrh1kmfzv90yz"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3228,24 +3276,24 @@ let one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-01-30"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "88916fbb81530a25f9a3f8bc02e1b4c91ff7be10"; - sha256 = "0glp8z6v53sff7vff6h6cxix40zwp1m305jsd50ji1i4913m08lw"; + rev = "60970d279f5f2a82b1857601c63e6a51f9fd04de"; + sha256 = "1kmjq4kjlflhagasr3n2l47mmv739rwz9bqbzyyv5skxdkkp95lw"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; 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/"; }; @@ -3288,12 +3336,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-02-12"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "75a254198770baffe11ed748338c82f4d2d71e9d"; - sha256 = "1vvkcpfvkkf14y7zxlp43ridx075y2hf14kc285mzwdhhb1ygcdi"; + rev = "e6b4bacf355c9ef2daed4ff40887f949da9da019"; + sha256 = "1x7m2pw2klk4m4hv0h5cjxzr46ljiyxrmwq4c38zbk2x5mncy5jr"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3372,24 +3420,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-01-21"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "7e373e5706a2df71fd3a96b50d1f7b0c3e7a0b36"; - sha256 = "1vrfjv22whdmwna4xlvpsajx69fs8dkfwk0ji1jnvbyxmhki8mik"; + rev = "444eab728ecaf337629a45a733535e94a3efc04a"; + sha256 = "0r10fmk90wdc9hj3kdfkb93vvw1kdxwkl20f9zs3rfs5vs7p9i97"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-09"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "b77fc46c5f35978c03277cd7261c07a36dafc8a4"; - sha256 = "0a38ma4kn6s75s286bdl5mhqlnbzzpir29gzjq7kxqi4y4zh9spc"; + rev = "4cc823c409b1e6e2c4cc6ec02ee7ec404aaa7f94"; + sha256 = "02mw8qc9i3ncdv49qjpg0d8mqh6xfk64bpkgfbqx05aq1xs1cvi4"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3589,12 +3637,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/"; }; @@ -3661,12 +3709,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-09-18"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "96e79e397126be1a64fb53d8e3656842fe1a4532"; - sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3"; + rev = "87c745d8d506fc1eecc1d81df15d5bde1658a2fc"; + sha256 = "0v0ip731lclh9aqrmlqwnnz4skgawaq3invghh1c7lh0zdq22lzb"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3757,12 +3805,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-01-31"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "6aae3517c612a96c59b5417984889bff388210b2"; - sha256 = "13d0jzzn7gr6c0zkpa5bkfp06246hbpfb6y7mmsw2waybw3hij9s"; + rev = "1a7f12cb1f878063d675924ac97f242950805541"; + sha256 = "1nmicnq2b6n8a9zmgqqkzd9y47x2d11n75ix114qv3xyin0vqnqc"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3815,6 +3863,30 @@ let meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; + snippets-nvim = buildVimPluginFrom2Nix { + pname = "snippets-nvim"; + version = "2020-09-09"; + src = fetchFromGitHub { + owner = "norcalli"; + repo = "snippets.nvim"; + rev = "7b5fd8071d4fb6fa981a899aae56b55897c079fd"; + sha256 = "1fdsx7d5nyhhklwidgh387ijd485g2836rwd5i1r0di777mp7w80"; + }; + meta.homepage = "https://github.com/norcalli/snippets.nvim/"; + }; + + sonokai = buildVimPluginFrom2Nix { + pname = "sonokai"; + version = "2021-02-28"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "sonokai"; + rev = "86298232f4f5ab418d5d9d18a336d7ab8b167b68"; + sha256 = "060k664gm4857nfmxaj0v6sz50mb3y9v8489jnv1bhqplzqf8gmy"; + }; + meta.homepage = "https://github.com/sainnhe/sonokai/"; + }; + sourcemap-vim = buildVimPluginFrom2Nix { pname = "sourcemap-vim"; version = "2012-09-19"; @@ -3901,12 +3973,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-12-15"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "91ba14b41f6e767414d7bf2a8e82947c6bfdb978"; - sha256 = "0q01xfnjqk3vnmknb01zlkzn1jj03lqsygk863vwrdazq86g5aci"; + rev = "df823938421e66adbd6c570bacdc3ce85d6c776c"; + sha256 = "02hcdsdvbdybcpamj304jld4sh3mxp3j78idzv7ybkizvp8wjlpd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3936,6 +4008,18 @@ let meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; + stan-vim = buildVimPluginFrom2Nix { + pname = "stan-vim"; + version = "2020-08-05"; + src = fetchFromGitHub { + owner = "eigenfoo"; + repo = "stan-vim"; + rev = "9d3b6ec149f9559bd9bd021dfa827c29c5d1dc38"; + sha256 = "0qv748m1vrp1qcl41y7fj2jm8cac9b01ljq6ydq3z4syxdf7yzcc"; + }; + meta.homepage = "https://github.com/eigenfoo/stan-vim/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -4046,12 +4130,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-02-01"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "7e8aeb69709b73cdbdaf50f4d26ab45d7920b7f0"; - sha256 = "02mlr9aw4ppi4cs6r1v3d39j3l85sy7q2xm1dxg1ld6k1p5imk94"; + rev = "51ff7a05404e2f5c83799dd6c38134ed4aaca85c"; + sha256 = "0i7qzn3vlvjjd5qvf230r7aaqz84rn30zkn643fdvpni7pxfywdv"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4094,12 +4178,12 @@ let telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-02-10"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "ffa2027102f75e28dd8d8c2a97f3b9163dd80b56"; - sha256 = "1ipxqkfaqc75qzpj7vg3gr44r8fcx979pyf84wibxic3kby9qp7y"; + rev = "8b584bd88fbbeac0ce5c52af1ce7c1fecb7155b6"; + sha256 = "0a6sz6gx1qnr0ka9510mchca3b94553liw8ng386h60kh6lbc1k5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -4131,12 +4215,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-02-09"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3a7fa41857394cd2d90d00891413c12fada039c3"; - sha256 = "0bn7jvwwaxfhcqd4l3wi9bshabbrcd4aws7d564kh1js8bklwx1b"; + rev = "678494e503d3c717df8295f55a6f3c7d3309b7fa"; + sha256 = "04vazlzfx9ab016mgnw0mazg3nvfvf81b947c70vzl1jdyn5d73w"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4382,6 +4466,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"; @@ -4636,12 +4732,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-02-05"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c01977d027de854c6a85ed5c57915a7e8848f4b9"; - sha256 = "0xvv1dymvgazs57phxbxljihz92zd4aa5yjqqf4g9xvl59vxc798"; + rev = "cb1bc19064d3762e4e08103afb37a246b797d902"; + sha256 = "1mw62q54cybybbmlvw7f0yzwr41dv4rsgqvk7psazb5zwjrsqn0z"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4660,24 +4756,24 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-12-17"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b"; - sha256 = "1gwk7m8ghg5lix14bqxjyxc1wv5agkfhqinsikssydab0liw0xyf"; + rev = "d148d42d9caf331ff08b6cae683d5b210003cde7"; + sha256 = "0dd0vp72r95wqa2780rbdmj61mcj77b4hg6fpkwbb07apizrp43b"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2020-11-04"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "5007343968e21bba30d85af982689d1c1f9145e1"; - sha256 = "17c3yhnn016k03f2g3cjfwnazg2525pgwy4zqcv0vrgq2g4dil82"; + rev = "1731cd3865669ebec84e6f32a87ccf16a00690fd"; + sha256 = "0k6ch5kg8jlqa04apjdi7xr5s85ibdvg4gq4iyxh78xffw1xzafl"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -4912,12 +5008,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-12"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "2e8538beaf1cef636deab2d40edcb270044485d1"; - sha256 = "1ay90j72sknqhp1rdlgzdb5rxs98mwc5ad7q3rgqj8hpsr21x991"; + rev = "8b618fcbbee7cf30ce9d05be00706ddb558f96af"; + sha256 = "19x69jhn0j5qa1hz46piv54v2nq3g14pqbdvap2h8w9bb62a3yh6"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4948,12 +5044,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/"; }; @@ -5152,12 +5248,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/"; }; @@ -5188,12 +5284,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-02-02"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "0329d89c5114dc285939050fd5777dbcc450ddd7"; - sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny"; + rev = "4d14cb82cf7381c2f8eca284d1a757faaa73b159"; + sha256 = "1wwqchf50c19a5d5g037rjjpskn7dpsq9alhzim2x6bgffb5yamd"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5344,12 +5440,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/"; }; @@ -5416,12 +5512,12 @@ let vim-erlang-tags = buildVimPluginFrom2Nix { pname = "vim-erlang-tags"; - version = "2021-02-03"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "125d494953da1746bc16cb716019a3d855fd3536"; - sha256 = "1kaihn3bnw9pdr18vg09ya4ijjv0an6jzzva96v06lid2i66i9wi"; + rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611"; + sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; @@ -5476,12 +5572,12 @@ let vim-fetch = buildVimPluginFrom2Nix { pname = "vim-fetch"; - version = "2020-01-31"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "wsdjeg"; repo = "vim-fetch"; - rev = "dd674b50b261275a6a75cab6929b7bb7c5c4acba"; - sha256 = "1hadfzhzkq2n9k3yga55fsl6nm5mgl2vv975jnxsi4qgz9cwcsgr"; + rev = "0a6ab17e84c7f4808bf05ec380121bce40b40d21"; + sha256 = "04srlz3zaiqkv9hz6q3vdkfq02k1wj4p9mg4m8930das4nkl7a05"; }; meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; @@ -5548,12 +5644,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-12"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "bd76979d17c28db94430dbfa4007e5aef667441a"; - sha256 = "0ih17mimpjkk9w81cpmzks63rd4k5v32i5y1anykcgn9nmmbp8qm"; + rev = "c66412d238bd2e6c7b84c01a7e92b399bfbf1915"; + sha256 = "0mlvm6x754251pcd9hdwwnjfbwnvkbpywfnyp090dkvhlx19rm0w"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5596,12 +5692,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5c821eb78d4018025a1a9f54a9ef2af2a5ddd365"; - sha256 = "0vzhc9dr166pn4xpznzxfyhfibas3m0an0z74gl3vih1qlg59h9y"; + rev = "9cba97f4db4e0af4275f802c2de977f553d26ec6"; + sha256 = "182z25fv3lqhsh926p24fq1lwldbdq8bqbmivpv4ylq2c5b6xisz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5668,12 +5764,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-02-11"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "2e3cd54ed696500bb3722226f2103d4b279272c0"; - sha256 = "1cv9lapq6xb0fq5i1mfbhv5qlab868mvby60yhwzafni5b2p9l37"; + rev = "1283ec1670d1f4fce37213c5d66924088b2e730c"; + sha256 = "1h5jh38ihbyy95cm57ppb6m871010pk521ygss2drcriwnx4agd2"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5716,12 +5812,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-02-10"; + version = "2021-02-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "cb4c622c97a39652151748c4dec70a46e93a9117"; - sha256 = "0pfd6vizjrynz4azx3fkz5nwm7k08jjhvy6ypkjzhhw2ql37l7i9"; + rev = "755b498c7604e7aee4d001d2a78c2d1e079eb8d5"; + sha256 = "048xqia30alvcshvmbqlqvvslk19zvqmsdy50ww8rzz9yzhff5bw"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5762,6 +5858,18 @@ let meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; + vim-gruvbox8 = buildVimPluginFrom2Nix { + pname = "vim-gruvbox8"; + version = "2021-02-06"; + src = fetchFromGitHub { + owner = "lifepillar"; + repo = "vim-gruvbox8"; + rev = "a03834cdaa686ef2758f670924fc048148dfd297"; + sha256 = "1yh5p8s17kd1z4jqk6gd6vmap7f5jwqwhfbq2yi2xi3lb6xpvjc3"; + }; + meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; + }; + vim-gui-position = buildVimPluginFrom2Nix { pname = "vim-gui-position"; version = "2019-06-06"; @@ -5824,12 +5932,12 @@ let vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2020-09-07"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "94fbd199c8a947ede62f98509f91d637d7967454"; - sha256 = "0n2dmgfajji8nxxirb9q9jmqnzc1mjqnic5igs84pxmbc6r57zqq"; + rev = "047a8643ce346d819ffbd1686fe3ac1a54e42a1e"; + sha256 = "1brwjgxxh8f1q2859lqgdn9jk8h3iip989yirii350kwqvv1wjk6"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -5848,12 +5956,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/"; @@ -5981,12 +6089,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/"; }; @@ -6138,12 +6246,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-10-10"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "548767343ff221a4efd0c055a43c022d23fcafc5"; - sha256 = "0scmpjav4zapglybdqilimqb3n805k8gqc46qvkiihprq9j9za4d"; + rev = "82b10427e9f3af270b3d3e252f2bcfafc61b221e"; + sha256 = "1sxdk2infw12lf1lkw05zz1aqk1pirjfph9phma89q4hc1i5hndk"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -6330,12 +6438,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-06-30"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "ac6444afb5fd11e3f7750f696a0c6b8b0b6ec116"; - sha256 = "182fvmfnpcqda0cm878lk79iprxsd7nb9r97jmr7lx5agdcvzaqb"; + rev = "0206f5f5a8721cc8c5c84ebb8ab2886e9afcd0ac"; + sha256 = "1zin6pk581cnkivm2kgks0wrvpxjcl1y3x46wpkzdqg1hhif2129"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -6354,24 +6462,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-02"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "21a29936ed74b2212e1904cca6c22bff4e27b637"; - sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c"; + rev = "ca2b527dc5f8cc4e6fbccda735e179ff19e388a1"; + sha256 = "02qpmhd4hzvdg743r9j8fjrzr2mdbvhypyvkb3ph9sdrzc4kwpvd"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6451,12 +6559,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-01-29"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "52b3ec1ee8d0f78c69bae6cc32f3c2d1a023a8c8"; - sha256 = "1hn3w4hzx444cz5z7g2lkpzr90r9ngjpy5jirgs3c947njc24kr7"; + rev = "69208b080114be6d038fcdca4a70adb24b6539be"; + sha256 = "12m46f4h5ia16gyj6yv7al813qmwxbsj5ddfmdz03mxa373fwwlm"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6511,12 +6619,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-12-02"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "7f42bcd0e05921c7a5d7333c96bae8b21fa76064"; - sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; + rev = "65fa0678d8426ae2cc7a4c42a8f0d72bde2a7bbe"; + sha256 = "0r118mxm34kr8yk66x9ddg2yh44gn00iaxljfbhg43nhp8jyzjbn"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -6691,12 +6799,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-01-10"; + version = "2021-02-19"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "f51b69f46d5eb0ebbdfcd39b5aa36bfd9454eafd"; - sha256 = "0fs5pn2hhi0mnjz0xpjl0sh4032s4n4afzjrnhygw9l9a5m51dm4"; + rev = "ba6a32d0d079b3670cc3c02257dccea4808fdfa1"; + sha256 = "0h4k9p5r7xwwwbi28p013dqhpl75k8458xiisl5ncswyw4wva75v"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -6823,12 +6931,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/"; }; @@ -6847,12 +6955,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2020-10-24"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "2521e2e9b99a3550e1a20f24e09fa46679cbbbc7"; - sha256 = "02023bnvc9m98m45krld1b7gy13z335jv88fx4ybz019wc0mv35g"; + rev = "36509e99779746866f34dadc8df64449aaca9c27"; + sha256 = "1ir7nymhz613w5bfmk927w892lpz92b71by0j2jfnb7flh9ad6f4"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -6967,12 +7075,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/"; }; @@ -7135,12 +7243,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-12-07"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "83ba638104f6a56def3354c6c9b1df04d12f1d3d"; - sha256 = "1qpxdam0qn7lyvgzyip30bs6k99c0qnpd5qgkkps6mcyzd1rqlqv"; + rev = "c7f5ec42af992a090be35301847548064e8fc806"; + sha256 = "0vqjxcnw9cklnqyc1c39wnwirk4hhmsnyqgq4rl7ph084xqnnmrr"; }; meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; @@ -7159,12 +7267,12 @@ let vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; - version = "2020-01-26"; + version = "2021-02-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-ragtag"; - rev = "6f1af76cd669c4fb07f0c4e20fdee3077620e3d8"; - sha256 = "1q5klbnwsg26zxhs3knhamk3srg7dmq46n83sa5rw2kmikb2idg2"; + rev = "b8966c4f6503a8baaec39e17bd0bf38b2aadc9b2"; + sha256 = "0q4blsgnl4l2bkhgjry6xnszhsswdand52gc6gdjffwlzwa9jczy"; }; meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; @@ -7207,12 +7315,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/"; }; @@ -7447,12 +7555,12 @@ let vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2020-12-14"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "aea240223698b4bb424d29805fe6750bb30872cb"; - sha256 = "15yxd4zxs738h51g10hx8xcki7r2hkb83prydk6g7sznsy3k70ia"; + rev = "196d05f7152fb95c4613476368ebae9dd842d470"; + sha256 = "0lk9clnvrkjbxgszg52zdl28d313vk2fiyh86aa6xx5pr0nr9iw3"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -7483,12 +7591,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/"; }; @@ -7519,12 +7627,12 @@ let vim-sourcetrail = buildVimPluginFrom2Nix { pname = "vim-sourcetrail"; - version = "2020-12-21"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "vim-sourcetrail"; - rev = "b603ee7cf5c751918efc40014b9cfb40bf19ec32"; - sha256 = "1yssa2yll5q61mffwxiq8swpzq80xxypyzr7svn8acwrakn0dx5r"; + rev = "c9c621a7ab81c52a661457ccf33a64fd7c56fd9d"; + sha256 = "192f69yz1hh2k0b2kcvfvv1jirjcvnbxvjkagmlkkqcg8w32nmlg"; }; meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; @@ -7565,6 +7673,18 @@ let meta.homepage = "https://github.com/mhinz/vim-startify/"; }; + vim-startuptime = buildVimPluginFrom2Nix { + pname = "vim-startuptime"; + version = "2021-02-23"; + src = fetchFromGitHub { + owner = "dstein64"; + repo = "vim-startuptime"; + rev = "af70d17a863c9a33def9cafbb3911195a571c686"; + sha256 = "078xq6bwkbwsjajyq3c9bn8b3r0da6j70vp1ba934a6jjdv6vrj4"; + }; + meta.homepage = "https://github.com/dstein64/vim-startuptime/"; + }; + vim-stylish-haskell = buildVimPluginFrom2Nix { pname = "vim-stylish-haskell"; version = "2019-11-28"; @@ -7700,12 +7820,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-01-28"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "77d0b89fe5648d0881e8506d1949a9412201772b"; - sha256 = "14ny5gap1bij5fdwnxgwjpmjnw0xpydnjvvsf6525hbipxp258fr"; + rev = "5a1cfbbd2b34a64852760497945dd3a5c5df349a"; + sha256 = "164i8kzqyald74ibqimn6871ma02wwnx82d4rz9g21x2qgwyy6gr"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7820,12 +7940,12 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2020-10-05"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; - sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; + rev = "9cb40a1e0c8cfad2e2180e5225d3880109cb9fc4"; + sha256 = "0prh8zphcacn9w19s82v58km7jsdgxg0gbrq5d3sf1p82p13r5z5"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; @@ -7866,6 +7986,18 @@ let meta.homepage = "https://github.com/cespare/vim-toml/"; }; + vim-tpipeline = buildVimPluginFrom2Nix { + pname = "vim-tpipeline"; + version = "2021-02-19"; + src = fetchFromGitHub { + owner = "vimpostor"; + repo = "vim-tpipeline"; + rev = "753c64f356da0e1bed43ce0b9e8923b1e9fc0670"; + sha256 = "06j03r6hqb72ahmdpwxxys9nw86b8c63zsxhrlngzqa5z02z6k9c"; + }; + meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; + }; + vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; version = "2020-11-18"; @@ -7964,12 +8096,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-02-12"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "88f934f572efdbc73c7b4b23a9b96f710524a94d"; - sha256 = "0pk0vqns7269gi9jd8bdcg1qxlgdm55w9mf3nsrzc9z3d3j3vpw0"; + rev = "4c99296b8f29d8936de8c33d98f0acdafcdbd388"; + sha256 = "1w936x8zz0f6v77bhixd48q09naqglq3ar4y26kpr9vscfmsbc00"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7988,12 +8120,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/"; }; @@ -8252,12 +8384,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-02-10"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "e99ac0d65867f4d97e7b891ac21cd341de1ff53f"; - sha256 = "1jxl33svlymcwc3dsalabpy7px91rgfpalpb2bhxkqd4vgxwcjql"; + rev = "5bd83d3e37403d8cc7ad3378a58d58f06a53d318"; + sha256 = "114bpbb82w9q79c7qq51c2w00qyagbj0l8jasr0giwhfxcxys1nb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8265,26 +8397,26 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-02-11"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "1319bca15f1e25cf8f0ca64818719c860d2d83ac"; - sha256 = "043x5x4pxhni2isjxh6x4klldyanhpks3pljc246ybiz9q372bsi"; + rev = "eb6b84315f7d8d698d8839f9685283e6ec9adbbd"; + sha256 = "1hgpx95hpwdvldhv9k1a7p9acd5ppp8z2fl9brq3fs8h5ci272x0"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2017-10-24"; + version = "2021-02-23"; src = fetchFromGitHub { - owner = "ostera"; + owner = "preservim"; repo = "vimux"; - rev = "37f41195e6369ac602a08ec61364906600b771f1"; - sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; + rev = "5b1791673c1a089a78be16187f7532f95e50580b"; + sha256 = "17m7hh02q9myfpa8z1scnakcl25fasnns1gxgfpx544rky5pd3mc"; }; - meta.homepage = "https://github.com/ostera/vimux/"; + meta.homepage = "https://github.com/preservim/vimux/"; }; vimwiki = buildVimPluginFrom2Nix { @@ -8313,12 +8445,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-02-12"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "05d1fb2e333caa2bf2717d4e8ff5ae8c2a1f971d"; - sha256 = "0zyq4fgi6i4gdn25ykpxsy7bpyzysny5qkg40r3493yqnp3rvnfw"; + rev = "9c97b935cb941a9fddcbbdc0eaf3e5e190f4847e"; + sha256 = "10jsqi5jipvaa8dbckrjacqz32iy0i9mx1a4m3jk3gainx9a9xmq"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8433,12 +8565,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2021-01-21"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "6104b30b32732e367266f06ecf6e817df32ac1b9"; - sha256 = "0r8asbc387mmdiignr862gz4xd590c6rhp3ff78v7z7rn94dnamd"; + rev = "11112853180a933574f431cf78cd5a462ee3f473"; + sha256 = "0bnq02dbsqwsizhlldb2pj92gjybr5aaa7a5m786xvb7ljvd82vi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -8495,24 +8627,24 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-02-08"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "e3646fc3124e33da4909e30caaad1167523e0c53"; - sha256 = "0a200497js325343prx638rkzg6544lxrrr3ij5g0i6dvazzwg21"; + rev = "58e31c89350d50e16f52911e60bb3b66160255b5"; + sha256 = "1yyv9grk2wdp308wc3g227iq4rrflv443z8hxi66wknjffjs51wr"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-01-19"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d"; - sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh"; + rev = "fcafb4b64ffe6d308f5e312ddd1672e69e09fb1c"; + sha256 = "0bsz046sbf5g6lkgcjyllc8knbiqdcglpkf1wbzn7zi7whdhjxdx"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 9b1aa6cd051..6ae6a42fac2 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -7,9 +7,7 @@ , ruby , which , fetchFromGitHub -, fetchgit , fetchurl -, fetchzip , fetchpatch , llvmPackages , rustPlatform @@ -731,7 +729,7 @@ self: super: { libiconv ]; - cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; + cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi"; }; in '' @@ -790,6 +788,8 @@ self: super: { } // ( let nodePackageNames = [ + "coc-clangd" + "coc-cmake" "coc-css" "coc-diagnostic" "coc-emmet" @@ -807,6 +807,7 @@ self: super: { "coc-metals" "coc-pairs" "coc-prettier" + "coc-pyright" "coc-python" "coc-r-lsp" "coc-rls" @@ -816,6 +817,7 @@ self: super: { "coc-solargraph" "coc-stylelint" "coc-tabnine" + "coc-texlab" "coc-tslint" "coc-tslint-plugin" "coc-tsserver" diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/update.py b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/update.py index b9bab293a79..f5d7434fe27 100755 --- a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -503,9 +503,9 @@ def parse_args(): def commit(repo: git.Repo, message: str, files: List[Path]) -> None: - files_staged = repo.index.add([str(f.resolve()) for f in files]) + repo.index.add([str(f.resolve()) for f in files]) - if files_staged: + if repo.index.diff("HEAD"): print(f'committing to nixpkgs "{message}"') repo.index.commit(message) else: diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 416dc7fc722..5869e8a6be2 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/infra/libkookie/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -93,6 +93,7 @@ dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dstein64/nvim-scrollview@main +dstein64/vim-startuptime dylanaraps/wal.vim eagletmt/ghcmod-vim eagletmt/neco-ghc @@ -100,10 +101,12 @@ easymotion/vim-easymotion editorconfig/editorconfig-vim edwinb/idris2-vim ehamberg/vim-cute-python +eigenfoo/stan-vim 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 @@ -134,6 +137,7 @@ GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell gioele/vim-autoswap +glepnir/dashboard-nvim glepnir/galaxyline.nvim@main glepnir/lspsaga.nvim@main glepnir/oceanic-material @@ -286,6 +290,7 @@ lepture/vim-jinja lervag/vimtex lewis6991/gitsigns.nvim@main lfilho/cosco.vim +lifepillar/vim-gruvbox8 lifepillar/vim-mucomplete lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer @@ -369,6 +374,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 @@ -407,6 +413,7 @@ nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script norcalli/nvim-terminal.lua +norcalli/snippets.nvim npxbr/glow.nvim ntpeters/vim-better-whitespace numirias/semshi @@ -433,7 +440,6 @@ Olical/aniseed Olical/conjure onsails/lspkind-nvim OrangeT/vim-csharp -ostera/vimux osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-over @@ -447,6 +453,7 @@ pearofducks/ansible-vim peitalin/vim-jsx-typescript peterbjorgensen/sved peterhoeg/vim-qml +phaazon/hop.nvim phanviet/vim-monokai-pro plasticboy/vim-markdown ponko2/deoplete-fish @@ -459,6 +466,7 @@ prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree preservim/tagbar +preservim/vimux psliwka/vim-smoothie ptzz/lf.vim puremourning/vimspector @@ -503,6 +511,7 @@ rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +sainnhe/sonokai sakhnik/nvim-gdb saltstack/salt-vim samoshkin/vim-mergetool @@ -550,6 +559,7 @@ svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls takac/vim-hardtime +tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim tbodt/deoplete-tabnine @@ -675,6 +685,7 @@ vim-utils/vim-husk Vimjas/vim-python-pep8-indent vimlab/split-term.vim vimoutliner/vimoutliner +vimpostor/vim-tpipeline vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 8c32ac2f5d1..67a612a4bec 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/infra/libkookie/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"; @@ -276,6 +292,18 @@ let }; }; + formulahendry.code-runner = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "code-runner"; + publisher = "formulahendry"; + version = "0.11.2"; + sha256 = "0qwcxr6m1xwhqmdl4pccjgpikpq1hgi2hgrva5abn8ixa2510hcy"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + freebroccolo.reasonml = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog"; @@ -337,8 +365,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.196"; - sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz"; + version = "0.0.198"; + sha256 = "0riy2k8dbsnpk8vkv814fr8zh87y425s24nklcx4b7mfrszv7xbn"; }; meta = with lib; { license = licenses.mit; @@ -357,6 +385,8 @@ let }; }; + hashicorp.terraform = callPackage ./terraform {}; + hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { name = "beautify"; @@ -494,6 +524,8 @@ let }; }; + ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; + ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-kubernetes-tools"; @@ -593,6 +625,18 @@ let }; }; + rubbersheep.gi = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gi"; + publisher = "rubbersheep"; + version = "0.2.11"; + sha256 = "0j9k6wm959sziky7fh55awspzidxrrxsdbpz1d79s5lr5r19rs6j"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ryu1kn.partial-diff = buildVscodeMarketplaceExtension { mktplcRef = { name = "partial-diff"; @@ -689,6 +733,18 @@ let }; }; + tomoki1207.pdf = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pdf"; + publisher = "tomoki1207"; + version = "1.1.0"; + sha256 = "0pcs4iy77v4f04f8m9w2rpdzfq7sqbspr7f2sm1fv7bm515qgsvb"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tyriar.sort-lines = buildVscodeMarketplaceExtension { mktplcRef = { name = "sort-lines"; @@ -701,6 +757,18 @@ let }; }; + usernamehw.errorlens = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "errorlens"; + publisher = "usernamehw"; + version = "3.2.4"; + sha256 = "0caxmf6v0s5kgp6cp3j1kk7slhspjv5kzhn4sq3miyl5jkrn95kx"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { @@ -745,6 +813,18 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; WakaTime.vscode-wakatime = callPackage ./wakatime {}; + + wholroyd.jinja = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jinja"; + publisher = "wholroyd"; + version = "0.0.8"; + sha256 = "1ln9gly5bb7nvbziilnay4q448h9npdh7sd9xy277122h0qawkci"; + }; + meta = { + license = lib.licenses.mit; + }; + }; }; aliases = self: super: { diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix new file mode 100644 index 00000000000..a7b0e17ecbf --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json new file mode 100644 index 00000000000..91ee056efc1 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs new file mode 100755 index 00000000000..ecd7efba05d --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh new file mode 100755 index 00000000000..ad494a37908 --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index aba4ba44097..bdaee22a480 100644 --- a/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -3,14 +3,14 @@ "version": "0.4.0-dev", "dependencies": { "node-fetch": "^2.6.1", - "vscode-languageclient": "7.0.0", + "vscode-languageclient": "^7.1.0-next.4", "@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-node-resolve": "^11.0.0", "@types/glob": "^7.1.3", "@types/mocha": "^8.0.4", "@types/node": "~12.12.6", "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.52.0", + "@types/vscode": "^1.53.0", "@typescript-eslint/eslint-plugin": "^4.9.0", "@typescript-eslint/parser": "^4.9.0", "eslint": "^7.15.0", @@ -20,7 +20,7 @@ "tslib": "^2.0.3", "typescript": "^4.1.2", "typescript-formatter": "^7.2.2", - "vsce": "^1.81.1", - "vscode-test": "^1.4.1" + "vsce": "^1.85.0", + "vscode-test": "^1.5.1" } } diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix new file mode 100644 index 00000000000..39dd6f90b80 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, vscode-utils, terraform-ls }: +vscode-utils.buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "terraform"; + publisher = "hashicorp"; + version = "2.7.0"; + }; + + vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; + sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp"; + }; + + patches = [ ./fix-terraform-ls.patch ]; + + postPatch = '' + substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls + ''; + + meta = with lib; { + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch new file mode 100644 index 00000000000..3d5cc51fe2a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -0,0 +1,26 @@ +diff --git a/out/extension.js b/out/extension.js +index 375048c..fa5eff0 100644 +--- a/out/extension.js ++++ b/out/extension.js +@@ -209,20 +209,7 @@ function pathToBinary() { + if (!_pathToBinaryPromise) { + let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); + if (!command) { // Skip install/upgrade if user has set custom binary path +- const installDir = `${extensionPath}/lsp`; +- const installer = new languageServerInstaller_1.LanguageServerInstaller(); +- try { +- yield installer.install(installDir); +- } +- catch (err) { +- vscode.window.showErrorMessage(err); +- reporter.sendTelemetryException(err); +- throw err; +- } +- finally { +- yield installer.cleanupZips(installDir); +- } +- command = `${installDir}/terraform-ls`; ++ command = 'TERRAFORM-LS-PATH'; + } + _pathToBinaryPromise = Promise.resolve(command); + } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 609cd579f9f..476a77c59d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -6,6 +6,34 @@ appleDerivation { cp include/* $out/include/CommonCrypto ''; + appleHeaders = '' + CommonCrypto/CommonBaseXX.h + CommonCrypto/CommonBigNum.h + CommonCrypto/CommonCMACSPI.h + CommonCrypto/CommonCRC.h + CommonCrypto/CommonCrypto.h + CommonCrypto/CommonCryptoError.h + CommonCrypto/CommonCryptoPriv.h + CommonCrypto/CommonCryptor.h + CommonCrypto/CommonCryptorSPI.h + CommonCrypto/CommonDH.h + CommonCrypto/CommonDigest.h + CommonCrypto/CommonDigestSPI.h + CommonCrypto/CommonECCryptor.h + CommonCrypto/CommonHMAC.h + CommonCrypto/CommonHMacSPI.h + CommonCrypto/CommonKeyDerivation.h + CommonCrypto/CommonKeyDerivationSPI.h + CommonCrypto/CommonNumerics.h + CommonCrypto/CommonRSACryptor.h + CommonCrypto/CommonRandom.h + CommonCrypto/CommonRandomSPI.h + CommonCrypto/CommonSymmetricKeywrap.h + CommonCrypto/aes.h + CommonCrypto/lionCompat.h + CommonCrypto/module.modulemap + ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch deleted file mode 100644 index fd9df812940..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp -index ecc94c9..936452f 100644 ---- a/icuSources/i18n/ucoleitr.cpp -+++ b/icuSources/i18n/ucoleitr.cpp -@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems, - int32_t *ixHigh, - UErrorCode *status) - { -- return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); -+ return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); - } - - -@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems, - int32_t *ixHigh, - UErrorCode *status) - { -- return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); -+ return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); - } - - U_NAMESPACE_BEGIN diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 761ff3ea925..032b1447463 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,23 +1,56 @@ -{ appleDerivation }: +{ appleDerivation, python3 }: appleDerivation { - patches = [ ./clang-5.patch ]; + nativeBuildInputs = [ python3 ]; postPatch = '' substituteInPlace makefile \ - --replace /usr/bin/ "" \ - --replace '$(ISYSROOT)' "" \ - --replace 'shell xcodebuild -version -sdk' 'shell true' \ - --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \ - --replace '-install_name $(libdir)' "-install_name $out/lib/" \ - --replace /usr/local/bin/ /bin/ \ - --replace /usr/lib/ /lib/ \ + --replace "/usr/bin/" "" \ + --replace "xcrun --sdk macosx --find" "echo -n" \ + --replace "xcrun --sdk macosx.internal --show-sdk-path" "echo -n /dev/null" \ + --replace "-install_name " "-install_name $out" + + substituteInPlace icuSources/config/mh-darwin \ + --replace "-install_name " "-install_name $out/" + + # drop using impure /var/db/timezone/icutz + substituteInPlace makefile \ + --replace '-DU_TIMEZONE_FILES_DIR=\"\\\"$(TZDATA_LOOKUP_DIR)\\\"\" -DU_TIMEZONE_PACKAGE=\"\\\"$(TZDATA_PACKAGE)\\\"\"' "" + + # FIXME: This will cause `ld: warning: OS version (12.0) too small, changing to 13.0.0`, APPLE should fix it. + substituteInPlace makefile \ + --replace "ZIPPERING_LDFLAGS=-Wl,-iosmac_version_min,12.0" "ZIPPERING_LDFLAGS=" + + # skip test for missing encodingSamples data + substituteInPlace icuSources/test/cintltst/ucsdetst.c \ + --replace "&TestMailFilterCSS" "NULL" + + patchShebangs icuSources ''; - makeFlags = [ "DSTROOT=$(out)" ]; + # APPLE is using makefile to save its default configuration and call ./configure, so we hack makeFlags + # instead of configuring ourself, trying to stay abreast of APPLE. + dontConfigure = true; + makeFlags = [ + "DSTROOT=$(out)" + + # remove /usr prefix on include and lib + "PRIVATE_HDR_PREFIX=" + "libdir=/lib/" + + "DATA_INSTALL_DIR=/share/icu/" + "DATA_LOOKUP_DIR=$(DSTROOT)$(DATA_INSTALL_DIR)" + + # hack to use our lower macos version + "MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_MIN_REQUIRED" + "OSX_HOST_VERSION_MIN_STRING=$(MACOSX_DEPLOYMENT_TARGET)" + ]; + + doCheck = true; + checkTarget = "check"; postInstall = '' - mv $out/usr/local/include $out/include + # we don't need all those in usr/local rm -rf $out/usr ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 6ebb470145d..3554a2e15b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -29,4 +29,6 @@ appleDerivation { cp ${Libc_old}/include/libkern/OSAtomic.h $out/include/libkern cp ${Libc_old}/include/libkern/OSCacheControl.h $out/include/libkern ''; + + appleHeaders = builtins.readFile ./headers.txt; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt new file mode 100644 index 00000000000..ea62e31dc78 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt @@ -0,0 +1,138 @@ +CrashReporterClient.h +NSSystemDirectories.h +_locale.h +_types.h +_types/_intmax_t.h +_types/_nl_item.h +_types/_uint16_t.h +_types/_uint32_t.h +_types/_uint64_t.h +_types/_uint8_t.h +_types/_uintmax_t.h +_types/_wctrans_t.h +_types/_wctype_t.h +_wctype.h +_xlocale.h +aio.h +alloca.h +ar.h +arpa/ftp.h +arpa/inet.h +arpa/nameser_compat.h +arpa/telnet.h +arpa/tftp.h +asl.h +assert.h +bitstring.h +cpio.h +crt_externs.h +ctype.h +db.h +dirent.h +disktab.h +err.h +errno.h +execinfo.h +fcntl.h +fmtmsg.h +fnmatch.h +fsproperties.h +fstab.h +fts.h +ftw.h +get_compat.h +getopt.h +glob.h +inttypes.h +iso646.h +langinfo.h +libc.h +libc_private.h +libgen.h +libkern/OSAtomic.h +libkern/OSCacheControl.h +libproc.h +limits.h +locale.h +malloc/malloc.h +memory.h +monetary.h +monitor.h +mpool.h +msgcat.h +ndbm.h +nl_types.h +nlist.h +os/assumes.h +os/debug_private.h +paths.h +poll.h +printf.h +protocols/routed.h +protocols/rwhod.h +protocols/talkd.h +protocols/timed.h +pthread.h +pthread_impl.h +pthread_spis.h +pthread_workqueue.h +ranlib.h +readpassphrase.h +regex.h +runetype.h +sched.h +search.h +secure/_common.h +secure/_stdio.h +secure/_string.h +semaphore.h +setjmp.h +sgtty.h +signal.h +spawn.h +stab.h +standards.h +stddef.h +stdint.h +stdio.h +stdlib.h +strhash.h +string.h +stringlist.h +strings.h +struct.h +sys/acl.h +sys/rbtree.h +sys/statvfs.h +sysexits.h +syslog.h +tar.h +termios.h +time.h +timeconv.h +ttyent.h +tzfile.h +ucontext.h +ulimit.h +unistd.h +util.h +utime.h +utmpx.h +utmpx_thread.h +vis.h +wchar.h +wctype.h +wordexp.h +xlocale.h +xlocale/__wctype.h +xlocale/_ctype.h +xlocale/_inttypes.h +xlocale/_langinfo.h +xlocale/_monetary.h +xlocale/_regex.h +xlocale/_stdio.h +xlocale/_stdlib.h +xlocale/_string.h +xlocale/_time.h +xlocale/_wchar.h +xlocale/_wctype.h diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index add51a61d3d..5481ae74d38 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -11,4 +11,40 @@ appleDerivation { export DSTROOT=$out sh xcodescripts/install_files.sh ''; + + appleHeaders = '' + aliasdb.h + bootparams.h + configuration_profile.h + grp.h + ifaddrs.h + ils.h + kvbuf.h + libinfo.h + libinfo_muser.h + membership.h + membershipPriv.h + netdb.h + netdb_async.h + ntsid.h + printerdb.h + pwd.h + rpc/auth.h + rpc/auth_unix.h + rpc/clnt.h + rpc/pmap_clnt.h + rpc/pmap_prot.h + rpc/pmap_rmt.h + rpc/rpc.h + rpc/rpc_msg.h + rpc/svc.h + rpc/svc_auth.h + rpc/types.h + rpc/xdr.h + rpcsvc/yp_prot.h + rpcsvc/ypclnt.h + si_data.h + si_module.h + thread_data.h + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index ad3f5dea975..2c98dd35e39 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -115,6 +115,8 @@ appleDerivation { ln -s libresolv.9.dylib $out/lib/libresolv.dylib ''; + appleHeaders = builtins.readFile ./headers.txt; + meta = with lib; { description = "The Mac OS libc/libSystem (tapi library with pure headers)"; maintainers = with maintainers; [ copumpkin gridaphobe ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt new file mode 100644 index 00000000000..09b0ab41045 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt @@ -0,0 +1,1727 @@ +AssertMacros.h +Availability.h +AvailabilityInternal.h +AvailabilityMacros.h +Block.h +Block_private.h +CommonCrypto/CommonBaseXX.h +CommonCrypto/CommonBigNum.h +CommonCrypto/CommonCMACSPI.h +CommonCrypto/CommonCRC.h +CommonCrypto/CommonCrypto.h +CommonCrypto/CommonCryptoError.h +CommonCrypto/CommonCryptoPriv.h +CommonCrypto/CommonCryptor.h +CommonCrypto/CommonCryptorSPI.h +CommonCrypto/CommonDH.h +CommonCrypto/CommonDigest.h +CommonCrypto/CommonDigestSPI.h +CommonCrypto/CommonECCryptor.h +CommonCrypto/CommonHMAC.h +CommonCrypto/CommonHMacSPI.h +CommonCrypto/CommonKeyDerivation.h +CommonCrypto/CommonKeyDerivationSPI.h +CommonCrypto/CommonNumerics.h +CommonCrypto/CommonRSACryptor.h +CommonCrypto/CommonRandom.h +CommonCrypto/CommonRandomSPI.h +CommonCrypto/CommonSymmetricKeywrap.h +CommonCrypto/aes.h +CommonCrypto/lionCompat.h +ConditionalMacros.h +CrashReporterClient.h +ExtentManager.h +MacTypes.h +NSSystemDirectories.h +TargetConditionals.h +_errno.h +_libkernel_init.h +_locale.h +_simple.h +_types.h +_types/_intmax_t.h +_types/_nl_item.h +_types/_uint16_t.h +_types/_uint32_t.h +_types/_uint64_t.h +_types/_uint8_t.h +_types/_uintmax_t.h +_types/_wctrans_t.h +_types/_wctype_t.h +_wctype.h +_xlocale.h +aio.h +aliasdb.h +alloca.h +ar.h +architecture/alignment.h +architecture/byte_order.h +architecture/i386/alignment.h +architecture/i386/asm_help.h +architecture/i386/byte_order.h +architecture/i386/cpu.h +architecture/i386/desc.h +architecture/i386/fpu.h +architecture/i386/frame.h +architecture/i386/io.h +architecture/i386/pio.h +architecture/i386/reg_help.h +architecture/i386/sel.h +architecture/i386/table.h +architecture/i386/tss.h +arpa/ftp.h +arpa/inet.h +arpa/nameser_compat.h +arpa/telnet.h +arpa/tftp.h +asl.h +assert.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bitstring.h +bootparams.h +bootstrap.h +bootstrap_priv.h +bsd/bsm/audit.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/spl.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebugevents.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/wait.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +checkint.h +complex.h +configuration_profile.h +copyfile.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_debug.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/cccmac.h +corecrypto/ccder.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/ccmd5.h +corecrypto/ccmode.h +corecrypto/ccmode_factory.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccpbkdf2.h +corecrypto/ccrc4.h +corecrypto/ccrng.h +corecrypto/ccrng_system.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corpses/task_corpse.h +cpio.h +crt_externs.h +ctype.h +curses.h +cursesapp.h +cursesf.h +cursesm.h +cursesp.h +cursesw.h +cursslk.h +db.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +dirent.h +disktab.h +dispatch/base.h +dispatch/benchmark.h +dispatch/block.h +dispatch/data.h +dispatch/data_private.h +dispatch/dispatch.h +dispatch/group.h +dispatch/introspection.h +dispatch/introspection_private.h +dispatch/io.h +dispatch/io_private.h +dispatch/layout_private.h +dispatch/mach_private.h +dispatch/object.h +dispatch/once.h +dispatch/private.h +dispatch/queue.h +dispatch/queue_private.h +dispatch/semaphore.h +dispatch/source.h +dispatch/source_private.h +dispatch/time.h +dlfcn.h +dns.h +dns_sd.h +dns_util.h +err.h +errno.h +eti.h +etip.h +execinfo.h +fcntl.h +fenv.h +fmtmsg.h +fnmatch.h +form.h +fsproperties.h +fstab.h +fts.h +ftw.h +get_compat.h +gethostuuid.h +gethostuuid_private.h +getopt.h +glob.h +grp.h +hfs/BTreeScanner.h +hfs/BTreesInternal.h +hfs/BTreesPrivate.h +hfs/CatalogPrivate.h +hfs/FileMgrInternal.h +hfs/HFSUnicodeWrappers.h +hfs/UCStringCompareData.h +hfs/hfs.h +hfs/hfs_alloc_trace.h +hfs/hfs_attrlist.h +hfs/hfs_btreeio.h +hfs/hfs_catalog.h +hfs/hfs_cnode.h +hfs/hfs_cprotect.h +hfs/hfs_dbg.h +hfs/hfs_endian.h +hfs/hfs_extents.h +hfs/hfs_format.h +hfs/hfs_fsctl.h +hfs/hfs_hotfiles.h +hfs/hfs_iokit.h +hfs/hfs_journal.h +hfs/hfs_kdebug.h +hfs/hfs_key_roll.h +hfs/hfs_macos_defs.h +hfs/hfs_mount.h +hfs/hfs_quota.h +hfs/hfs_unistr.h +hfs/kext-config.h +hfs/rangelist.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +ifaddrs.h +ils.h +inttypes.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +iso646.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +kvbuf.h +langinfo.h +launch.h +launch_internal.h +launch_priv.h +libc.h +libc_private.h +libgen.h +libinfo.h +libinfo_muser.h +libkern/OSAtomic.h +libkern/OSAtomicDeprecated.h +libkern/OSAtomicQueue.h +libkern/OSByteOrder.h +libkern/OSCacheControl.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSSpinLockDeprecated.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/base.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/object_private.h +libkern/os/overflow.h +libkern/os/trace.h +libproc.h +libutil.h +limits.h +locale.h +mach-o/arch.h +mach-o/arm/reloc.h +mach-o/arm64/reloc.h +mach-o/dyld-interposing.h +mach-o/dyld.h +mach-o/dyld_gdb.h +mach-o/dyld_images.h +mach-o/dyld_priv.h +mach-o/dyld_process_info.h +mach-o/fat.h +mach-o/getsect.h +mach-o/hppa/reloc.h +mach-o/hppa/swap.h +mach-o/i386/swap.h +mach-o/i860/reloc.h +mach-o/i860/swap.h +mach-o/ldsyms.h +mach-o/loader.h +mach-o/m68k/swap.h +mach-o/m88k/reloc.h +mach-o/m88k/swap.h +mach-o/nlist.h +mach-o/ppc/reloc.h +mach-o/ppc/swap.h +mach-o/ranlib.h +mach-o/reloc.h +mach-o/sparc/reloc.h +mach-o/sparc/swap.h +mach-o/stab.h +mach-o/swap.h +mach-o/x86_64/reloc.h +mach/audit_triggers.defs +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +malloc/malloc.h +math.h +membership.h +membershipPriv.h +memory.h +menu.h +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +mntopts.h +monetary.h +monitor.h +mpool.h +msgcat.h +nameser.h +nc_tparm.h +ncurses_dll.h +ndbm.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netdb.h +netdb_async.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +nl_types.h +nlist.h +notify.h +notify_keys.h +ntsid.h +objc-shared-cache.h +os/activity.h +os/alloc_once_impl.h +os/assumes.h +os/availability.h +os/base.h +os/base_private.h +os/debug_private.h +os/internal/atomic.h +os/internal/crashlog.h +os/internal/internal_shared.h +os/lock.h +os/lock_private.h +os/log.h +os/object.h +os/object_private.h +os/once_private.h +os/overflow.h +os/semaphore_private.h +os/trace.h +os/tsd.h +os/voucher_activity_private.h +os/voucher_private.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/call_entry.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/page_decrypt.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/timer_call.h +osfmk/kern/waitq.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperf_timer.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/boolean.h +osfmk/mach/branch_predicates.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_routines.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/prng/random.h +osfmk/string.h +osfmk/vm/WKdm_new.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +panel.h +paths.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +platform/compat.h +platform/introspection_private.h +platform/string.h +poll.h +printerdb.h +printf.h +protocols/routed.h +protocols/rwhod.h +protocols/talkd.h +protocols/timed.h +pthread.h +pthread/introspection.h +pthread/pthread.h +pthread/pthread_impl.h +pthread/pthread_spis.h +pthread/qos.h +pthread/sched.h +pthread/spawn.h +pthread_impl.h +pthread_spis.h +pthread_workqueue.h +pwd.h +ranlib.h +readpassphrase.h +reboot2.h +regex.h +removefile.h +resolv.h +rpc/auth.h +rpc/auth_unix.h +rpc/clnt.h +rpc/pmap_clnt.h +rpc/pmap_prot.h +rpc/pmap_rmt.h +rpc/rpc.h +rpc/rpc_msg.h +rpc/svc.h +rpc/svc_auth.h +rpc/types.h +rpc/xdr.h +rpcsvc/yp_prot.h +rpcsvc/ypclnt.h +runetype.h +sched.h +search.h +secure/_common.h +secure/_stdio.h +secure/_string.h +security/audit/audit_ioctl.h +security/mac.h +security/mac_policy.h +security/security/_label.h +security/security/mac.h +security/security/mac_alloc.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +semaphore.h +servers/bootstrap.h +servers/bootstrap_defs.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +setjmp.h +sgtty.h +si_data.h +si_module.h +signal.h +spawn.h +stab.h +standards.h +stdarg.h +stddef.h +stdint.h +stdio.h +stdlib.h +strhash.h +string.h +stringlist.h +strings.h +struct.h +sys/_endian.h +sys/_posix_availability.h +sys/_pthread/_pthread_attr_t.h +sys/_pthread/_pthread_cond_t.h +sys/_pthread/_pthread_condattr_t.h +sys/_pthread/_pthread_key_t.h +sys/_pthread/_pthread_mutex_t.h +sys/_pthread/_pthread_mutexattr_t.h +sys/_pthread/_pthread_once_t.h +sys/_pthread/_pthread_rwlock_t.h +sys/_pthread/_pthread_rwlockattr_t.h +sys/_pthread/_pthread_t.h +sys/_pthread/_pthread_types.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_pthread_attr_t.h +sys/_types/_pthread_cond_t.h +sys/_types/_pthread_condattr_t.h +sys/_types/_pthread_key_t.h +sys/_types/_pthread_mutex_t.h +sys/_types/_pthread_mutexattr_t.h +sys/_types/_pthread_once_t.h +sys/_types/_pthread_rwlock_t.h +sys/_types/_pthread_rwlockattr_t.h +sys/_types/_pthread_t.h +sys/_types/_pthread_types.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/acl.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/qos.h +sys/qos_private.h +sys/queue.h +sys/quota.h +sys/random.h +sys/rbtree.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/statvfs.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vstat.h +sys/wait.h +sys/xattr.h +sysexits.h +syslog.h +tar.h +term.h +term_entry.h +termcap.h +termios.h +thread_data.h +tic.h +time.h +timeconv.h +ttyent.h +tzfile.h +tzlink.h +tzlink_internal.h +ucontext.h +ulimit.h +unctrl.h +unistd.h +util.h +utime.h +utmpx.h +utmpx_thread.h +uuid/uuid.h +vfs/vfs_support.h +vis.h +voucher/ipc_pthread_priority_types.h +vproc.h +vproc_internal.h +vproc_priv.h +wchar.h +wctype.h +wipefs.h +wordexp.h +xlocale.h +xlocale/__wctype.h +xlocale/_ctype.h +xlocale/_inttypes.h +xlocale/_langinfo.h +xlocale/_monetary.h +xlocale/_regex.h +xlocale/_stdio.h +xlocale/_stdlib.h +xlocale/_string.h +xlocale/_time.h +xlocale/_wchar.h +xlocale/_wctype.h diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 5a3b1710216..74327bc4c42 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -13,6 +13,24 @@ appleDerivation { DSTROOT = "$(out)"; + appleHeaders = '' + architecture/alignment.h + architecture/byte_order.h + architecture/i386/alignment.h + architecture/i386/asm_help.h + architecture/i386/byte_order.h + architecture/i386/cpu.h + architecture/i386/desc.h + architecture/i386/fpu.h + architecture/i386/frame.h + architecture/i386/io.h + architecture/i386/pio.h + architecture/i386/reg_help.h + architecture/i386/sel.h + architecture/i386/table.h + architecture/i386/tss.h + ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 27a7f7b3e7c..002709ce2df 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -5,25 +5,14 @@ appleDerivation { buildPhase = '' cd migcom.tproj + + # redundant file, don't know why apple not removing it. + rm handler.c + yacc -d parser.y flex --header-file=lexxer.yy.h -o lexxer.yy.c lexxer.l - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o error.o error.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o global.o global.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o handler.o header.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o header.o header.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o mig.o mig.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o routine.o routine.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o server.o server.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o statement.o statement.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o string.o string.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o type.o type.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o user.o user.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o utils.o utils.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o lexxer.yy.o lexxer.yy.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o y.tab.o y.tab.c - - cc -dead_strip -o migcom error.o global.o header.o mig.o routine.o server.o statement.o string.o type.o user.o utils.o lexxer.yy.o y.tab.o + cc -std=gnu99 -Os -dead_strip -DMIG_VERSION=\"$pname-$version\" -I. -o migcom *.c ''; installPhase = '' @@ -42,8 +31,4 @@ appleDerivation { --replace '/bin/rmdir' "rmdir" \ --replace 'C=''${MIGCC}' "C=cc" ''; - - meta = { - platforms = lib.platforms.darwin; - }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix index 12176fd526c..23434931542 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, fetchzip, pkgs }: let + macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; + developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; + # This attrset can in theory be computed automatically, but for that to work nicely we need # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap # a stdenv out of something like this. With some care we can probably get rid of this, but for @@ -57,6 +60,9 @@ let libplatform = "125"; mDNSResponder = "625.41.2"; + # IOKit contains a set of packages with different versions, so we don't have a general version + IOKit = ""; + libutil = "43"; libunwind = "35.3"; Librpcsvc = "26"; @@ -135,35 +141,65 @@ let }; }; - fetchApple = version: sha256: name: let + fetchApple' = pname: version: sha256: let # When cross-compiling, fetchurl depends on libiconv, resulting # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling - fetch = if name == "libiconv" + fetch = if pname == "libiconv" then stdenv.fetchurlBoot else fetchurl; in fetch { - url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; + url = "http://www.opensource.apple.com/tarballs/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; - appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({ - inherit version; - name = "${name}-${version}"; + fetchApple = sdkName: sha256: pname: let + version = versions.${sdkName}.${pname}; + in fetchApple' pname version sha256; + + appleDerivation' = pname: version: sdkName: sha256: attrs: stdenv.mkDerivation ({ + inherit pname version; + + src = if attrs ? srcs then null else (fetchApple' pname version sha256); + enableParallelBuilding = true; - meta = { - platforms = lib.platforms.darwin; - }; - } // (if attrs ? srcs then {} else { - src = fetchApple version sha256 name; - }) // attrs); - applePackage = namePath: version: sha256: - let - name = builtins.elemAt (lib.splitString "/" namePath) 0; - appleDerivation = appleDerivation_ name version sha256; - callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; }); - in callPackage (./. + "/${namePath}"); + # In rare cases, APPLE may drop some headers quietly on new release. + doInstallCheck = attrs ? appleHeaders; + passAsFile = [ "appleHeaders" ]; + installCheckPhase = '' + cd $out/include + + result=$(diff -u "$appleHeadersPath" <(find * -type f | sort) --label "Listed in appleHeaders" --label "Found in \$out/include" || true) + + if [ -z "$result" ]; then + echo "Apple header list is matched." + else + echo >&2 "\ + Apple header list is inconsistent, please ensure no header file is unexpectedly dropped. + $result + " + exit 1 + fi + ''; + + } // attrs // { + meta = (with lib; { + platforms = platforms.darwin; + license = licenses.apsl20; + }) // (attrs.meta or {}); + }); + + applePackage' = namePath: version: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + appleDerivation = appleDerivation' pname version sdkName sha256; + callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation; }); + in callPackage (./. + "/${namePath}"); + + applePackage = namePath: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + version = versions.${sdkName}.${pname}; + in applePackage' namePath version sdkName sha256; IOKitSpecs = { IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq"; @@ -192,10 +228,10 @@ let # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; - packages = { + # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. + stubPackages = { inherit (adv_cmds-boot) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; - bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "0sgsqjcxbdm2g2zfpc50mzmk4b4ldyw7xvvkwiayhpczg1fga4ff" {}; @@ -207,7 +243,6 @@ let dtrace = applePackage "dtrace" "osx-10.12.6" "0hpd6348av463yqf70n3xkygwmf1i5zza8kps4zys52sviqz3a0l" {}; dyld = applePackage "dyld" "osx-10.12.6" "0q4jmk78b5ajn33blh4agyq6v2a63lpb3fln78az0dy12bnp1qqk" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; - ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; @@ -254,6 +289,8 @@ let # TODO(matthewbauer): # To be removed, once I figure out how to build a newer Security version. - Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; + Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; }; + + packages = developerToolsPackages_11_3_1 // macosPackages_11_0_1 // stubPackages; in packages diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix new file mode 100644 index 00000000000..f57d224615f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix @@ -0,0 +1,8 @@ +# Generated using: ./generate-sdk-packages.sh developer-tools 11.3.1 + +{ applePackage' }: + +{ +bootstrap_cmds = applePackage' "bootstrap_cmds" "116" "developer-tools-11.3.1" "148xpqkf5xzpslqxch5l8h6vsz7sys8sdzk4ghbg9mkcivp8qa03" {}; +developer_cmds = applePackage' "developer_cmds" "66" "developer-tools-11.3.1" "0q08m4cxxwph7gxqravmx13l418p1i050bd46zwksn9j9zpw9mlr" {}; +} diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh new file mode 100755 index 00000000000..d7c3fc89c52 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +# usage: +# generate-sdk-packages.sh macos 11.0.1 + +cd $(dirname "$0") + +sdkName="$1-$2" +outfile="$sdkName.nix" + +>$outfile echo "# Generated using: ./$(basename "$0") $1 $2 + +{ applePackage' }: + +{" + +parse_line() { + readarray -t -d$'\t' package <<<$2 + local pname=${package[0]} version=${package[1]} + + if [ -d $pname ]; then + sha256=$(nix-prefetch-url "https://opensource.apple.com/tarballs/$pname/$pname-$version.tar.gz") + >>$outfile echo "$pname = applePackage' \"$pname\" \"$version\" \"$sdkName\" \"$sha256\" {};" + fi +} +readarray -s1 -c1 -C parse_line < <(curl -sS "https://opensource.apple.com/text/${sdkName//./}.txt") + +>>$outfile echo '}' diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix index 58f6fb8d7ab..58bac765a95 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, lib, headersOnly ? false }: +{ appleDerivation, lib, headersOnly ? true }: appleDerivation { installPhase = lib.optionalString headersOnly '' @@ -6,6 +6,39 @@ appleDerivation { cp core/*.h $out/include/hfs ''; + appleHeaders = '' + hfs/BTreeScanner.h + hfs/BTreesInternal.h + hfs/BTreesPrivate.h + hfs/CatalogPrivate.h + hfs/FileMgrInternal.h + hfs/HFSUnicodeWrappers.h + hfs/UCStringCompareData.h + hfs/hfs.h + hfs/hfs_alloc_trace.h + hfs/hfs_attrlist.h + hfs/hfs_btreeio.h + hfs/hfs_catalog.h + hfs/hfs_cnode.h + hfs/hfs_cprotect.h + hfs/hfs_dbg.h + hfs/hfs_endian.h + hfs/hfs_extents.h + hfs/hfs_format.h + hfs/hfs_fsctl.h + hfs/hfs_hotfiles.h + hfs/hfs_iokit.h + hfs/hfs_journal.h + hfs/hfs_kdebug.h + hfs/hfs_key_roll.h + hfs/hfs_macos_defs.h + hfs/hfs_mount.h + hfs/hfs_quota.h + hfs/hfs_unistr.h + hfs/kext-config.h + hfs/rangelist.h + ''; + meta = { # Seems nobody wants its binary, so we didn't implement building. broken = !headersOnly; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index eed7982e9d8..c882b83d0a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -9,4 +9,18 @@ appleDerivation { cp liblaunch/bootstrap.h $out/include/servers cp liblaunch/bootstrap.h $out/include/servers/bootstrap_defs.h ''; + + appleHeaders = '' + bootstrap.h + bootstrap_priv.h + launch.h + launch_internal.h + launch_priv.h + reboot2.h + servers/bootstrap.h + servers/bootstrap_defs.h + vproc.h + vproc_internal.h + vproc_priv.h + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index ac33a24a8b4..d42a288208c 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -5,4 +5,9 @@ appleDerivation { mkdir -p $out/include cp *.h $out/include/ ''; + + appleHeaders = '' + Block.h + Block_private.h + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index e7aa47bdb6b..3b9d4a34cc6 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -22,4 +22,33 @@ appleDerivation { typedef void* dispatch_block_t; #endif' ''; + + appleHeaders = '' + dispatch/base.h + dispatch/benchmark.h + dispatch/block.h + dispatch/data.h + dispatch/data_private.h + dispatch/dispatch.h + dispatch/group.h + dispatch/introspection.h + dispatch/introspection_private.h + dispatch/io.h + dispatch/io_private.h + dispatch/layout_private.h + dispatch/mach_private.h + dispatch/object.h + dispatch/once.h + dispatch/private.h + dispatch/queue.h + dispatch/queue_private.h + dispatch/semaphore.h + dispatch/source.h + dispatch/source_private.h + dispatch/time.h + os/object.h + os/object_private.h + os/voucher_activity_private.h + os/voucher_private.h + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 4fd0ab8a7fb..9acbcb212e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -5,4 +5,28 @@ appleDerivation { mkdir $out cp -r include $out/include ''; + + appleHeaders = '' + _simple.h + libkern/OSAtomic.h + libkern/OSAtomicDeprecated.h + libkern/OSAtomicQueue.h + libkern/OSCacheControl.h + libkern/OSSpinLockDeprecated.h + os/alloc_once_impl.h + os/base.h + os/base_private.h + os/internal/atomic.h + os/internal/crashlog.h + os/internal/internal_shared.h + os/lock.h + os/lock_private.h + os/once_private.h + os/semaphore_private.h + platform/compat.h + platform/introspection_private.h + platform/string.h + setjmp.h + ucontext.h + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index d9a9beaccfc..20eccd82059 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -15,6 +15,40 @@ appleDerivation { cp -r sys/_pthread/*.h $out/include/sys/_types/ ''; + appleHeaders = '' + pthread/introspection.h + pthread/pthread.h + pthread/pthread_impl.h + pthread/pthread_spis.h + pthread/qos.h + pthread/sched.h + pthread/spawn.h + sys/_pthread/_pthread_attr_t.h + sys/_pthread/_pthread_cond_t.h + sys/_pthread/_pthread_condattr_t.h + sys/_pthread/_pthread_key_t.h + sys/_pthread/_pthread_mutex_t.h + sys/_pthread/_pthread_mutexattr_t.h + sys/_pthread/_pthread_once_t.h + sys/_pthread/_pthread_rwlock_t.h + sys/_pthread/_pthread_rwlockattr_t.h + sys/_pthread/_pthread_t.h + sys/_pthread/_pthread_types.h + sys/_types/_pthread_attr_t.h + sys/_types/_pthread_cond_t.h + sys/_types/_pthread_condattr_t.h + sys/_types/_pthread_key_t.h + sys/_types/_pthread_mutex_t.h + sys/_types/_pthread_mutexattr_t.h + sys/_types/_pthread_once_t.h + sys/_types/_pthread_rwlock_t.h + sys/_types/_pthread_rwlockattr_t.h + sys/_types/_pthread_t.h + sys/_types/_pthread_types.h + sys/qos.h + sys/qos_private.h + ''; + meta = { platforms = lib.platforms.darwin; }; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index 2b196e46ef4..ea9ca75e7e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -27,6 +27,14 @@ appleDerivation { install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib ''; + # FIXME: headers are different against headersOnly. And all the headers are NOT in macos, do we really want them? + # appleHeaders = '' + # libutil.h + # mntopts.h + # tzlink.h + # wipefs.h + # ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix new file mode 100644 index 00000000000..517f53e9435 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -0,0 +1,46 @@ +# Generated using: ./generate-sdk-packages.sh macos 11.0.1 + +{ applePackage' }: + +{ +adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0x8c25rh6fnzndbc26vcb65vcxilvqyfvm2klfyci1wr4bh3ixgk" {}; +architecture = applePackage' "architecture" "279" "macos-11.0.1" "1cgp33ywa30max6cyp69kvii299hx2vgwvmy3ms8n4gaq2mkpaky" {}; +basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; +bootstrap_cmds = applePackage' "bootstrap_cmds" "121" "macos-11.0.1" "09bwclws6adxb1ky9q35f4ikddk4mbalmgds0cmqaf7j23qxl3fv" {}; +CommonCrypto = applePackage' "CommonCrypto" "60178.40.2" "macos-11.0.1" "0r3b1mlfmbdzpwn6pbsbfaga3k63gpwcwbhkbi4r09aq82skl02v" {}; +configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "173i55wfzli9pg2x2rw437hs68h6l4ngss5jfgf18g26zjkjzv5v" {}; +copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "0qyp15qj3fdb7yx033n57l7s61d70mv17f43yiwcbhx09mmlrp07" {}; +Csu = applePackage' "Csu" "88" "macos-11.0.1" "029lgcyj0i16036h2lcx6fd6r1yf1bkj5dnvz905rh6ncl8skgdr" {}; +diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "1bqwkwkwd556rba5000ap77xrhaf4xnmy83mszd7a0yvl2xlma7j" {}; +dtrace = applePackage' "dtrace" "370.40.1" "macos-11.0.1" "1941yczmn94ng5zlnhf0i5mjw2f4g7znisgvhkhn5f86gxmd98wl" {}; +dyld = applePackage' "dyld" "832.7.1" "macos-11.0.1" "1s77ca6jg20z91qlph59da8j61m97y23vrw48xs4rywdzh4915n0" {}; +eap8021x = applePackage' "eap8021x" "304.40.1" "macos-11.0.1" "1ph3kcpf527s0jqsi60j2sgg3m8h128spf292d8kyc08siz9mf9c" {}; +file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "04789vn1wghclfr3ma3ncg716xdsxfj66hrcxi5h3h1ryag2ycfz" {}; +hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "1rhkmn2yj5p4wmi4aajy5hj2h0gxk63s8j4qz4ziy4g4bjpdgwmy" {}; +ICU = applePackage' "ICU" "66108" "macos-11.0.1" "1d76cyyqpwkzjlxfajm4nsglxmfrcafbnjwnjxc3j5w3nw67pqhx" {}; +Libc = applePackage' "Libc" "1439.40.11" "macos-11.0.1" "0d5xlnks4lc9391wg31c9126vflb40lc5ffkgxmf2kpyglac1280" {}; +libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "089i2bl4agpnfplrg23xbzma1674g0w05988nxdps6ghxl4kz66f" {}; +libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "0z7r42zfb8y48f0nrw0qw7fanfvimycimgnrg3jig101kjvjar98" {}; +libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0hqbsqggjrr0sv6h70lcr3gabgk9inyc8aq1b30wibgjm6crjwpp" {}; +Libinfo = applePackage' "Libinfo" "542.40.3" "macos-11.0.1" "0y5x6wxd3mwn6my1jdp8qrak3y7x7sgjdmwyw9cvvbn3kg9v6z1p" {}; +Libnotify = applePackage' "Libnotify" "279.40.4" "macos-11.0.1" "0aswflxki877izp6sacv35sydn6a3639cflv3zhs3i7vkfbsvbf5" {}; +libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1mhi8n66864y98dr3n0pkqad3aqim800kn9bxzp6h5jf2jni3aql" {}; +libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "18rb4dqjdf3krzi4hdj5i310gy49ipf01klbkp9g51i02a55gphq" {}; +libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "1ysvg6d28xyaky9sn7giglnsflhjsbj17h3h3i6knlzxnzznpkql" {}; +Librpcsvc = applePackage' "Librpcsvc" "26" "macos-11.0.1" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; +Libsystem = applePackage' "Libsystem" "1292.50.1" "macos-11.0.1" "0w16zaigq18jfsnw15pfyz2mkfqdkn0cc16q617kmgw2khld8j7j" {}; +libunwind = applePackage' "libunwind" "200.10" "macos-11.0.1" "1pmymcqpfk7lfxh6zqch429vfpvmd2m1dlg898170pkx5zhxisl2" {}; +libutil = applePackage' "libutil" "58.40.2" "macos-11.0.1" "1hhgashfj9g4vjv02070c5pn818a5n0bh5l81l2pflmvb2rrqs3f" {}; +mDNSResponder = applePackage' "mDNSResponder" "1310.40.42" "macos-11.0.1" "0d0b9wwah9rg7rwrr29dxd6iy0y4rlmss3wcz2wcqmnd2qb9x8my" {}; +network_cmds = applePackage' "network_cmds" "606.40.2" "macos-11.0.1" "1dlslk67npvmxx5m50385kmn3ysxih2iv220hhzkin11f8abdjv7" {}; +objc4 = applePackage' "objc4" "818.2" "macos-11.0.1" "177gmh9m9ajy6mvcd2sf7gqydgljy44n3iih0yqsn1b13j784azx" {}; +PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1n5yn6sc8w67g8iism6ilkyl33j46gcnlqcaq6k16zkngx6lprba" {}; +ppp = applePackage' "ppp" "877.40.2" "macos-11.0.1" "1z506z8ndvb1lfr4pypfy2bnig6qimhmq3yhjvqwfnliv91965iq" {}; +removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "1fhp47awi15f02385r25qgw1ag5z0kr1v3kvgqm3r8i8yysfqvwp" {}; +Security = applePackage' "Security" "59754.41.1" "macos-11.0.1" "00kqgg7k80ba70ar2c02f0q9yrdgqcb56nb9z5g0bxwkvi40ryph" {}; +shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "1mvp1fp34kkm4mi85fdn3i0l0gig4c0w09zg2mvkpxcf68cq2f69" {}; +system_cmds = applePackage' "system_cmds" "880.40.5" "macos-11.0.1" "1kys4vwfz4559sspdsfhmxc238nd8qgylqypza3zdzaqhfh7lx2x" {}; +text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "0cpnfpllwpx20hbxzg5i5488gcjyi9adnbac1sd5hpv3bq6z1hs5" {}; +top = applePackage' "top" "129" "macos-11.0.1" "1nyz5mvq7js3zhsi3dwxl5fslg6m7nhlgc6p2hr889xgyl5prw8f" {}; +xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "14wqkqp3lcxgpm1sjnsysybrc4ppzkghwv3mb5nr5v8ml37prkib" {}; +} diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 2b45fbdb45e..0b2c1c9c7dc 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -5,4 +5,9 @@ appleDerivation { mkdir -p $out/include/ cp removefile.h checkint.h $out/include/ ''; + + appleHeaders = '' + checkint.h + removefile.h + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index da2d0c5dc7b..9892814468e 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -127,6 +127,8 @@ appleDerivation ({ mkdir $out/Library/PrivateFrameworks mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; + + appleHeaders = builtins.readFile ./headers.txt; } // lib.optionalAttrs headersOnly { HOST_CODESIGN = "echo"; HOST_CODESIGN_ALLOCATE = "echo"; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt new file mode 100644 index 00000000000..93c0dbb18bf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt @@ -0,0 +1,1318 @@ +AssertMacros.h +_errno.h +_libkernel_init.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bsd/bsm/audit.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/spl.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebugevents.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/wait.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_debug.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/cccmac.h +corecrypto/ccder.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/ccmd5.h +corecrypto/ccmode.h +corecrypto/ccmode_factory.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccpbkdf2.h +corecrypto/ccrc4.h +corecrypto/ccrng.h +corecrypto/ccrng_system.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corpses/task_corpse.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +gethostuuid.h +gethostuuid_private.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +libkern/OSByteOrder.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/base.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/object_private.h +libkern/os/overflow.h +libkern/os/trace.h +mach/audit_triggers.defs +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +os/overflow.h +os/tsd.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/call_entry.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/page_decrypt.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/timer_call.h +osfmk/kern/waitq.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperf_timer.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/boolean.h +osfmk/mach/branch_predicates.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_routines.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/prng/random.h +osfmk/string.h +osfmk/vm/WKdm_new.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +security/audit/audit_ioctl.h +security/mac.h +security/mac_policy.h +security/security/_label.h +security/security/mac.h +security/security/mac_alloc.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +sys/_endian.h +sys/_posix_availability.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/queue.h +sys/quota.h +sys/random.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vstat.h +sys/wait.h +sys/xattr.h +uuid/uuid.h +vfs/vfs_support.h +voucher/ipc_pthread_priority_types.h diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 9f0ee4db118..560be0c31ab 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ ninja python3 ]; buildInputs = [ curl libxml2 objc4 ICU ]; - sourceRoot = "source/CoreFoundation"; + postPatch = '' + cd CoreFoundation - patchPhase = '' cp ${sysdir-free-system-directories} Base.subproj/CFSystemDirectories.c # In order, since I can't comment individual lines: @@ -39,6 +39,7 @@ stdenv.mkDerivation { # Fix sandbox impurities. substituteInPlace ../lib/script.py \ --replace '/bin/cp' cp + patchShebangs --build ../configure # Includes xpc for some initialization routine that they don't define anyway, so no harm here substituteInPlace PlugIn.subproj/CFBundlePriv.h \ diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix index 9e745077514..026ef5b0f46 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; qmakeFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix index 602d4278183..09dbdbc9b6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio - # https://github.com/NixOS/nixpkgs/issues/96548 - ++ lib.optional (libjack2 != null && (stdenv.buildPlatform == stdenv.hostPlatform)) libjack2; + ++ lib.optional (libjack2 != null) libjack2; meta = with lib; { description = "Various plugins for ALSA"; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix index da365fb7d99..dd747bbbf6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq"; }; - nativeBuildInputs = [ gettext ]; - buildInputs = [ makeWrapper alsaLib ncurses libsamplerate fftw ]; + nativeBuildInputs = [ gettext makeWrapper ]; + buildInputs = [ alsaLib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/default.nix index 7d72b0eec56..84bc6086d12 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = lib.optional stdenv.hostPlatform.isMusl [ + patches = [ ./patches/weak-symbols.patch ] + ++ lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; @@ -55,6 +56,13 @@ stdenv.mkDerivation rec { prePatch = '' sed -i 's,#include ,#include \n#include ,' audisp/audispd.c + '' + # According to https://stackoverflow.com/questions/13089166 + # --whole-archive linker flag is required to be sure that linker + # correctly chooses strong version of symbol regardless of order of + # object files at command line. + + lib.optionalString stdenv.targetPlatform.isStatic '' + export LDFLAGS=-Wl,--whole-archive ''; meta = { description = "Audit Library"; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/patches/weak-symbols.patch b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/patches/weak-symbols.patch new file mode 100644 index 00000000000..301ea9a5476 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/audit/patches/weak-symbols.patch @@ -0,0 +1,147 @@ +Executables in src/ directory are built from source files in src/ +and are linked to libauparse, with both src/auditd-config.c and +auparse/auditd-config.c defining "free_config" function. + +It is known (although obscure) behaviour of shared libraries that +symbol defined in binary itself overrides symbol in shared library; +with static linkage it expectedly results in multiple definition +error. + +This set of fixes explicitly marks libauparse versions of +conflicting functions as weak to have behaviour coherent with +dynamic linkage version -- definitions in src/ overriding definition +in auparse/. + +Still, this architecture is very strange and confusing. + +diff -r -U5 audit-2.8.5-orig/auparse/auditd-config.c audit-2.8.5/auparse/auditd-config.c +--- audit-2.8.5-orig/auparse/auditd-config.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/auparse/auditd-config.c 2021-01-13 11:36:12.716226498 +0000 +@@ -68,10 +68,11 @@ + }; + + /* + * Set everything to its default value + */ ++#pragma weak clear_config + void clear_config(struct daemon_conf *config) + { + config->local_events = 1; + config->qos = QOS_NON_BLOCKING; + config->sender_uid = 0; +@@ -322,10 +323,11 @@ + if (config->log_file == NULL) + return 1; + return 0; + } + ++#pragma weak free_config + void free_config(struct daemon_conf *config) + { + free((void*)config->log_file); + } + +diff -r -U5 audit-2.8.5-orig/auparse/interpret.c audit-2.8.5/auparse/interpret.c +--- audit-2.8.5-orig/auparse/interpret.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/auparse/interpret.c 2021-01-13 11:39:42.107217224 +0000 +@@ -545,10 +545,11 @@ + else + snprintf(buf, size, "unknown(%d)", uid); + return buf; + } + ++#pragma weak aulookup_destroy_uid_list + void aulookup_destroy_uid_list(void) + { + if (uid_cache_created == 0) + return; + +@@ -2810,10 +2811,11 @@ + + /* + * This is the main entry point for the auparse library. Call chain is: + * auparse_interpret_field -> nvlist_interp_cur_val -> interpret + */ ++#pragma weak interpret + const char *interpret(const rnode *r, auparse_esc_t escape_mode) + { + const nvlist *nv = &r->nv; + int type; + idata id; +diff -r -U5 audit-2.8.5-orig/auparse/nvlist.c audit-2.8.5/auparse/nvlist.c +--- audit-2.8.5-orig/auparse/nvlist.c 2019-02-04 14:26:52.000000000 +0000 ++++ audit-2.8.5/auparse/nvlist.c 2021-01-13 11:37:37.190222757 +0000 +@@ -27,10 +27,11 @@ + #include "nvlist.h" + #include "interpret.h" + #include "auparse-idata.h" + + ++#pragma weak nvlist_create + void nvlist_create(nvlist *l) + { + l->head = NULL; + l->cur = NULL; + l->cnt = 0; +@@ -47,17 +48,19 @@ + while (node->next) + node = node->next; + l->cur = node; + } + ++#pragma weak nvlist_next + nvnode *nvlist_next(nvlist *l) + { + if (l->cur) + l->cur = l->cur->next; + return l->cur; + } + ++#pragma weak nvlist_append + void nvlist_append(nvlist *l, nvnode *node) + { + nvnode* newnode = malloc(sizeof(nvnode)); + + newnode->name = node->name; +@@ -141,10 +144,11 @@ + if (l->cur->interp_val) + return l->cur->interp_val; + return interpret(r, escape_mode); + } + ++#pragma weak nvlist_clear + void nvlist_clear(nvlist* l) + { + nvnode* nextnode; + register nvnode* current; + +diff -r -U5 audit-2.8.5-orig/auparse/strsplit.c audit-2.8.5/auparse/strsplit.c +--- audit-2.8.5-orig/auparse/strsplit.c 2019-03-01 21:15:30.000000000 +0000 ++++ audit-2.8.5/auparse/strsplit.c 2021-01-13 11:38:04.306221556 +0000 +@@ -54,10 +54,11 @@ + return NULL; + return s; + } + } + ++#pragma weak audit_strsplit + char *audit_strsplit(char *s) + { + static char *str = NULL; + char *ptr; + +diff -r -U5 audit-2.8.5-orig/lib/strsplit.c audit-2.8.5/lib/strsplit.c +--- audit-2.8.5-orig/lib/strsplit.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/lib/strsplit.c 2021-01-13 11:38:29.444220443 +0000 +@@ -23,10 +23,11 @@ + + #include + #include "libaudit.h" + #include "private.h" + ++#pragma weak audit_strsplit_r + char *audit_strsplit_r(char *s, char **savedpp) + { + char *ptr; + + if (s) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/btfs/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/btfs/default.nix index dc0b13ef59b..70864b311d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/btfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "btfs"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "johang"; repo = pname; rev = "v${version}"; - sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5"; + sha256 = "sha256-fkS0U/MqFRQNi+n7NE4e1cnNICvfST2IQ9FMoJUyj6w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index a4a7adeb8b7..6c034e1c2af 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -118,9 +118,11 @@ stdenv.mkDerivation rec { logger() { '$out'/bin/logger "$@"; }\ ' ${debianDispatcherScript} > ${outDispatchPath} chmod 555 ${outDispatchPath} - PATH=$out/bin patchShebangs ${outDispatchPath} + HOST_PATH=$out/bin patchShebangs --host ${outDispatchPath} ''; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/criu/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/criu/default.nix index f48ed260c76..af772645824 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/criu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config -, which, python3, makeWrapper, docbook_xml_dtd_45 }: +, which, python3, makeWrapper, docbook_xml_dtd_45, perl }: stdenv.mkDerivation rec { pname = "criu"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; postPatch = '' - substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" - substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" + substituteInPlace ./Documentation/Makefile \ + --replace "2>/dev/null" "" \ + --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index ab183936895..e71da643bb4 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -70,6 +70,6 @@ in stdenv.mkDerivation rec { homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar magenbluten orivej ]; + maintainers = with maintainers; [ magenbluten orivej ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ena/default.nix index dc17f7f1696..62f95ef5322 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ena/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.4.1"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-ho6yKCgYo3p50leQUCmzNO/3wqzSzs27Eash3AWBaiE="; + sha256 = "0f3i878g11yfw6n68p3qf125jsnggy706jhc8sc0z1xgap6qgh09"; }; hardeningDisable = [ "pic" ]; @@ -19,23 +19,28 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; configurePhase = '' + runHook preConfigure cd kernel/linux/ena substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion} + runHook postConfigure ''; installPhase = '' + runHook preInstall strip -S ena.ko dest=$out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $dest cp ena.ko $dest/ xz $dest/ena.ko + runHook postInstall ''; meta = with lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; homepage = "https://github.com/amzn/amzn-drivers"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; + broken = kernel.kernelOlder "4.5"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 453d3ab9a47..bfa7783b6b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -74,6 +74,9 @@ let # only redfish for x86_64 haveRedfish = stdenv.isx86_64; + # only use msr if x86 (requires cpuid) + haveMSR = isx86; + # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental @@ -88,6 +91,12 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; + # A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654 + # released with 1.5.6. + # Fix for the regression: https://github.com/fwupd/fwupd/pull/2902 + # Maintainer says a new release is to be expected in a few days: + # https://twitter.com/hughsient/status/1362476792297185289 + # In the mean time, please do not release 1.5.6 and go strait to 1.5.7 version = "1.5.5"; # libfwupd goes to lib @@ -196,6 +205,8 @@ let "-Dplugin_redfish=false" ] ++ lib.optionals haveFlashrom [ "-Dplugin_flashrom=true" + ] ++ lib.optionals (!haveMSR) [ + "-Dplugin_msr=false" ]; # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF @@ -277,7 +288,6 @@ let passthru = { filesInstalledToEtc = [ "fwupd/daemon.conf" - "fwupd/redfish.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" @@ -294,6 +304,8 @@ let "pki/fwupd-metadata/LVFS-CA.pem" ] ++ lib.optionals haveDell [ "fwupd/remotes.d/dell-esrt.conf" + ] ++ lib.optionals haveRedfish [ + "fwupd/redfish.conf" ]; # DisabledPlugins key in fwupd/daemon.conf diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/gradm/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/gradm/default.nix index cdfc91a6837..7d2660ad26e 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/gradm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/gradm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gradm"; - version = "3.1-201903191516"; + version = "3.1-202012071814"; src = fetchurl { url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz"; - sha256 = "1wszqwaswcf08s9zbvnqzmmfdykyfcy16w8xjia20ypr7wwbd86k"; + sha256 = "sha256-ghl9P2IYsSHcJsVxJbFwfFS1CTZ2xLxdvyhdk/1OZG4="; }; nativeBuildInputs = [ bison flex ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index 6cee603664d..bd52f37e62f 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.335"; + version = "0.344"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "0f8ikwfrs6xd5sywypd9rq9cln8a0rf3vj6nm0adwzn1p8mgmrb2"; + sha256 = "0rsnm94r814shr86jk6f2323i1n4p58inkgkx7362yz9k4a8ir7a"; }; preConfigure = "patchShebangs ./configure"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "101lppd1805drwd038b4njr5czzjnqqxf3xlf6v3l22wfwr2cn3l"; + outputHash = "011lyldzskfb4sfn4i7qyyq3i4gaf1v9yfbc82889cabka0n4nfz"; meta = { homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index 6e64013464a..213ae45f48f 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.10"; + version = "7.11"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY="; + sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iptables/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iptables/default.nix index 82157ffa079..797e7a5b130 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iptables/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iptables/default.nix @@ -6,12 +6,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.8.6"; + version = "1.8.7"; pname = "iptables"; src = fetchurl { url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50"; + sha256 = "1w6qx3sxzkv80shk21f63rq41c84irpx68k62m2cv629n1mwj2f1"; }; nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix index 0079aa79a22..56942d6d420 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: -with lib; - let - version = "20200821"; + version = "20210202"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -18,18 +16,10 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "s${version}"; - sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; + rev = version; + sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3"; }; - patches = [ - # Proposed upstream patch to reduce dependency on systemd: https://github.com/iputils/iputils/pull/297 - (fetchpatch { - url = "https://github.com/iputils/iputils/commit/13d6aefd57fd471ecad06e19073dcc44608dff5e.patch"; - sha256 = "1n62zxmzp7hgz9qapbbpqv3fxqvc3qyd2a73jhp357x6by84kj49"; - }) - ]; - mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -39,13 +29,13 @@ in stdenv.mkDerivation rec { "-DINSTALL_SYSTEMD_UNITS=true" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] - ++ optional (!stdenv.hostPlatform.isMusl) libidn2; + ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; - meta = { + meta = with lib; { description = "A set of small useful utilities for Linux networking"; inherit (src.meta) homepage; changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index 7a81d9434e3..a2a63e2bcab 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.10.9"; in + linuxHeaders = let version = "5.11"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; + sha256 = "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index b8bb91b3b72..0d93dd485a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -174,6 +174,8 @@ let (whenAtLeast "4.17" yes) ]; NF_TABLES_NETDEV = mkMerge [ (whenOlder "4.17" module) (whenAtLeast "4.17" yes) ]; + NFT_REJECT_NETDEV = whenAtLeast "5.11" module; + # IP: Netfilter Configuration NF_TABLES_IPV4 = mkMerge [ (whenOlder "4.17" module) (whenAtLeast "4.17" yes) ]; @@ -252,6 +254,15 @@ let DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; # Allow device firmware updates DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; + # amdgpu display core (DC) support + DRM_AMD_DC_DCN1_0 = whenBetween "4.15" "5.6" yes; + DRM_AMD_DC_PRE_VEGA = whenBetween "4.15" "4.18" yes; + DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes; + DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes; + DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes; + DRM_AMD_DC_DCN = whenAtLeast "5.11" yes; + DRM_AMD_DC_HDCP = whenAtLeast "5.5" yes; + DRM_AMD_DC_SI = whenAtLeast "5.10" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = whenAtLeast "4.16" yes; @@ -358,6 +369,7 @@ let F2FS_FS = module; F2FS_FS_SECURITY = option yes; F2FS_FS_ENCRYPTION = option yes; + F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; NFSD_PNFS = whenBetween "4.0" "4.6" yes; @@ -404,6 +416,8 @@ let NLS_ISO8859_1 = module; # VFAT default for the iocharset= mount option DEVTMPFS = yes; + + UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems }; security = { @@ -634,7 +648,12 @@ let XZ_DEC_TEST = option no; }; - criu = optionalAttrs (features.criu or false) ({ + criu = if (versionAtLeast version "4.19") then { + # Unconditionally enabled, because it is required for CRIU and + # it provides the kcmp() system call that Mesa depends on. + CHECKPOINT_RESTORE = yes; + } else optionalAttrs (features.criu or false) ({ + # For older kernels, CHECKPOINT_RESTORE is hidden behind EXPERT. EXPERT = yes; CHECKPOINT_RESTORE = yes; } // optionalAttrs (features.criu_revert_expert or true) { diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index aed631bee1b..ef32e465835 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.221-hardened1.patch", - "sha256": "167pazgz6xa0xmvkqdk0a9z1gp9ria0mm2wmq6g41wzhcy20zrfz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.221-hardened1/linux-hardened-4.14.221-hardened1.patch" + "name": "linux-hardened-4.14.222-hardened1.patch", + "sha256": "1p692sn0d6cwmilgpi8chs99m0c36pd2rphrljz7b8ywc394jxsb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.222-hardened1/linux-hardened-4.14.222-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.175-hardened1.patch", - "sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch" + "name": "linux-hardened-4.19.177-hardened1.patch", + "sha256": "1l9qic5ggak9qa04bhxrwsrdi6ih9a8dvnzv0l2dfrp7f5z4zmj9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.177-hardened1/linux-hardened-4.19.177-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.15-hardened1.patch", - "sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch" + "name": "linux-hardened-5.10.18-hardened1.patch", + "sha256": "19z1dlwqfwaxi72yr6yh9dzqqrk1v3za3i6qz95xyz5afwn8vp33", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.18-hardened1/linux-hardened-5.10.18-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.97-hardened1.patch", - "sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch" + "name": "linux-hardened-5.4.100-hardened1.patch", + "sha256": "0wr6lgb1xkj11y08y0v58ipkwifs56vy4bd3h70i52b7vhqwsb19", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.100-hardened1/linux-hardened-5.4.100-hardened1.patch" } } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 787bc5accca..3716ee9eb6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.221"; + version = "4.14.222"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1sf7sagy88p20310klbxdacyalg3q6zg870c709nz17lbw3m88nf"; + sha256 = "0i67va37ca3avalgh2ab797c6w2v0h41y1mh4fql73lz7nq84h3k"; }; } // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 390724b8a86..e4b81530e95 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.175"; + version = "4.19.177"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc"; + sha256 = "0z9m081jg84mzp639ifx3321bpysfs3rpcrsx9mwdsh19rwv63mc"; }; } // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index eba19be1c20..f066bf3ad18 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.257"; + version = "4.4.258"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy"; + sha256 = "0rb6sww4yd2m4a4v12klx29nyxb66f55ziv8xcihgf2iw4d62h8c"; }; } // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index f53d39b20b5..bdd84a83f2f 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.257"; + version = "4.9.258"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kynyqk62hkfmamhvfp98i9kyr395chnwghslcbq5pl1zkzq1rwm"; + sha256 = "1kf8wlcf8gkpnglx1ggn1c3xfz4yx9995yb919mvin7nd7hghy6l"; }; } // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0d37a8b435b..0ee5cad28ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.15"; + version = "5.10.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq"; + sha256 = "04dnkg5j73f6cd8ws1prrrjx37srz7rm66bj6slmnfzp3cmyxh9v"; }; } // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix new file mode 100644 index 00000000000..6c595d75c8f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.11.2"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; + }; +} // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 2e11688910d..31e84a37d59 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.97"; + version = "5.4.100"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i"; + sha256 = "02i47fmx2jbnjr3sd1bvldf9vc712528phpnybsbq8h8lqd6hpbr"; }; } // (args.argsOverride or {})) diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index e466b76867c..b437bb49888 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.10.10"; - suffix = "lqx2"; + version = "5.11.1"; + suffix = "lqx1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1cjgx9qjfkiaalqkcdmibsrq2frwd621rwcg6w05ms4w9lnwi3af"; + sha256 = "00cji0dkfsjz6agwvcqpy7771hqbzcxk8awpbhlhpwa5j161r7l4"; }; extraMeta = { diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 85cc0d16eac..4fb6c3e916d 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.12-rt26"; # updated by ./update-rt.sh + version = "5.10.17-rt32"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; + sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "06sb7cj24v4kh7zghndpxv95pkihahc7653lxdw4wj9jhi58bs2k"; + sha256 = "1mffl1pvi7ijc3xws32bk8grs27ka2bd9bwl6h99vjn3dnkmkrfr"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix similarity index 75% rename from infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix rename to infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix index 7c77454040d..e56d2319a96 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix @@ -6,22 +6,26 @@ , ... } @ args: let - version = "5.6.19-rt12"; # updated by ./update-rt.sh + version = "5.11.2-rt9"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. + modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version + else lib.replaceStrings ["-"] [".0-"] version; + src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; + sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; + sha256 = "0707rjai04x12llvs004800pkb0axf0d1sssahf3xhgrbalg94y1"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 25e3172b0f3..6fbfa23e739 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.84-rt47"; # updated by ./update-rt.sh + version = "5.4.93-rt51"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189"; + sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0nccxf9l9ycvb782f48zrbl59vi674qq7yjyaks97440pgyd1jg0"; + sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index b30ee996649..e54a05c6e8e 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.10"; + version = "5.11.1"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0jsi2q8k1w5zs5l6z1brm2mxpl9arv6n6linc8yj6xc75nydw6w4"; + sha256 = "10xpb6r1ccqy2lsndf16dksi40z1cgm3wqjp3yjwzhad8zdjlm5d"; }; extraMeta = { diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh index 4cbd45524a8..8cac5929252 100755 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh @@ -36,7 +36,8 @@ file-version() { latest-rt-version() { branch="$1" # e.g. 5.4 curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | - sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }' + sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' | + tail -n 1 } update-if-needed() { diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libaio/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libaio/default.nix index 8cbc8466a91..046bba5dda0 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libaio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libaio/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - ]; + ] ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0"; hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 246f02805f0..24e90118756 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.46"; + version = "2.47"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1d6q447wf0iagiyzhfdqcj4cv0dmzc49i0czwikrcv7s2cad3lsf"; + sha256 = "0jx0vjlfg1nzdjdrkrnbdkrqjx4l80vi9isf2qav7s4zbzs5s5mg"; }; patches = lib.optional isStatic ./no-shared-lib.patch; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix index f6b76066863..87b7d33c5d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; preBuild = " - makeFlagsArray=(prefix=$out E=echo RANLIB=ranlib INSTALL='install -c') + makeFlagsArray=(prefix=$out E=echo RANLIB=${stdenv.cc.targetPrefix}ranlib INSTALL='install -c') "; # Work around a broken Makefile. diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix index ab148af72f2..bcc86b72de0 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI="; }; - nativeBuildInputs = [ pkg-config help2man autoreconfHook ]; - buildInputs = [ fuse makeWrapper ]; + nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; + buildInputs = [ fuse ]; preConfigure = lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix index de2c1afb065..b20632be334 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "173"; + version = "175"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1ili11kqacn6jkjpk11vhycgygdl92mymgb1sx22lcwq2x0d248m"; + sha256 = "sha256-Xzbck/nRdTR9H5o2XVFlFdNLz2ve65KEcefKAKe0eW8="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index d6d04f12f88..3ac8e6dcd4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20201118"; + version = "20210216"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "1xs3f2rbfqnpz9qs7a1kl363qdyb8fybmmyd37v573clqf7l4lgg"; + sha256 = "17wrfp7h7xbvncgm1fp103zkyz9n1f820jy6yca1aq208264hjkv"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl-fts/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl-fts/default.nix new file mode 100644 index 00000000000..cdb1cca47c6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl-fts/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "musl-fts"; + version = "1.2.7"; + + src = fetchFromGitHub { + owner = "void-linux"; + repo = "musl-fts"; + rev = "v${version}"; + sha256 = "Azw5qrz6OKDcpYydE6jXzVxSM5A8oYWAztrHr+O/DOE="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/void-linux/musl-fts"; + description = "An implementation of fts(3) for musl-libc"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.pjjw ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl-obstack/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl-obstack/default.nix new file mode 100644 index 00000000000..f7682d37efd --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl-obstack/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "musl-obstack"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "void-linux"; + repo = "musl-obstack"; + rev = "v${version}"; + sha256 = "v0RTnrqAmJfOeGsJFc04lqFR8QZhYiLyvy8oRYiuC80="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/void-linux/musl-obstack"; + description = + "An extraction of the obstack functions and macros from GNU libiberty for use with musl-libc"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.pjjw ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl/default.nix index 63d8114ac77..3310692b31d 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/musl/default.nix @@ -16,6 +16,11 @@ let sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; + stack_chk_fail_local_c = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/musl/__stack_chk_fail_local.c?h=3.10-stable"; + sha256 = "1nhkzzy9pklgjcq2yg89d3l18jif331srd3z3vhy5qwxl1spv6i9"; + }; + # iconv tool, implemented by musl author. # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f # We use copy from Alpine which fixes error messages, see: @@ -87,6 +92,16 @@ stdenv.mkDerivation rec { NIX_DONT_SET_RPATH = true; + preBuild = '' + ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + "# the -x c flag is required since the file extension confuses gcc + # that detect the file as a linker script. + $CC -x c -c ${stack_chk_fail_local_c} -o __stack_chk_fail_local.o + $AR r libssp_nonshared.a __stack_chk_fail_local.o" + else "" + } + ''; + postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? @@ -96,6 +111,13 @@ stdenv.mkDerivation rec { $STRIP -S $out/lib/libc.a mkdir -p $out/bin + + ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + "install -D libssp_nonshared.a $out/lib/libssp_nonshared.a + $STRIP -S $out/lib/libssp_nonshared.a" + else "" + } + # Create 'ldd' symlink, builtin ln -rs $out/lib/libc.so $out/bin/ldd diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index 115c12ec5e4..bb5e3f51964 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with lib; stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1c1c2475nifncv0ng8z77h2dpanlsx0bhqm15k00jb3a6a68lszy"; + sha256 = "1r4g22grhd4s1918wws9vggb8821sv4kkj8197ygxr6sar301z30"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/numad/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/numad/default.nix index cab5fe15e66..21d5a871f4e 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/numad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/numad/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://fedoraproject.org/wiki/Features/numad"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index b848a868274..5e8bb550cf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config +, libuuid +}: stdenv.mkDerivation rec { pname = "nvme-cli"; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libuuid ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvmet-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvmet-cli/default.nix new file mode 100644 index 00000000000..4196efeae67 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/nvmet-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchurl }: + +python3Packages.buildPythonApplication rec { + pname = "nvmet-cli"; + version = "0.7"; + + src = fetchurl { + url = "ftp://ftp.infradead.org/pub/nvmetcli/nvmetcli-${version}.tar.gz"; + sha256 = "051y1b9w46azy35118154c353v3mhjkdzh6h59brdgn5054hayj2"; + }; + + buildInputs = with python3Packages; [ nose2 ]; + + propagatedBuildInputs = with python3Packages; [ configshell ]; + + # This package requires the `nvmet` kernel module to be loaded for tests. + doCheck = false; + + meta = with lib; { + description = "NVMe target CLI"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ hoverbear ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index f90c7966190..25410553486 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ util-linux openssl libcap_ng pythonEnv perl procps which ]; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix index ddb5eff9723..f379633e198 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix @@ -19,9 +19,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkg-config ]; - buildInputs = [ makeWrapper util-linux openssl libcap_ng python2 - perl procps which ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config makeWrapper ]; + buildInputs = [ util-linux openssl libcap_ng python2 perl procps which ]; preConfigure = "./boot.sh"; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam/default.nix index a697bb17a43..fb993699494 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext , nixosTests +, withLibxcrypt ? false, libxcrypt }: stdenv.mkDerivation rec { @@ -17,7 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; - buildInputs = [ cracklib db4 ]; + buildInputs = [ cracklib db4 ] + ++ lib.optional withLibxcrypt libxcrypt; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix index 6ffc6050055..ffb397334c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pam_gnupg"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; rev = "v${version}"; - sha256 = "1d8046clv7r3bl77dbpza4f1zlkjffvdczbb5bci3prz7dyfrwsz"; + sha256 = "sha256-NDl6MsvIDAXkaLqXt7Wa0T7aulT31P5Z/d/Vb+ILya0="; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pipework/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pipework/default.nix index 14d1eb85998..e58b97654af 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pipework/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/pipework/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "ae42f1b5fef82b3bc23fe93c95c345e7af65fef3"; sha256 = "0c342m0bpq6ranr7dsxk9qi5mg3j5aw9wv85ql8gprdb2pz59qy8"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix index c167b202c8d..8cb2a00987e 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/plymouth/default.nix @@ -1,64 +1,111 @@ -{ stdenv, fetchurl, autoreconfHook, pkg-config, libxslt, docbook_xsl -, gtk3, udev, systemd, lib +{ lib +, stdenv +, fetchpatch +, fetchFromGitLab +, pkg-config +, autoreconfHook +, libxslt +, docbook-xsl-nons +, gettext +, gtk3 +, systemd +, pango +, cairo +, libdrm }: stdenv.mkDerivation rec { - pname = "plymouth"; - version = "0.9.4"; + pname = "plymouth-unstable"; + version = "2020-12-07"; - src = fetchurl { - url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz"; - sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "plymouth"; + repo = "plymouth"; + rev = "c4ced2a2d70edea7fbb95274aa1d01d95928df1b"; + sha256 = "7CPuKMA0fTt8DBsaA4Td74kHT/O7PW8N3awP04nUnOI="; }; nativeBuildInputs = [ - autoreconfHook pkg-config libxslt docbook_xsl + autoreconfHook + docbook-xsl-nons + gettext + libxslt + pkg-config ]; buildInputs = [ - gtk3 udev systemd + cairo + gtk3 + libdrm + pango + systemd + ]; + + patches = [ + # KillMode=none is deprecated + # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 + (fetchpatch { + url = "https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/b406b0895a95949db2adfedaeda451f36f2b51c3.patch"; + sha256 = "/UBImNuFO0G/oxlttjGIXon8YXMXlc9XU8uVuR9QuxY="; + }) ]; postPatch = '' sed -i \ - -e "s#\$(\$PKG_CONFIG --variable=systemdsystemunitdir systemd)#$out/etc/systemd/system#g" \ -e "s#plymouthplugindir=.*#plymouthplugindir=/etc/plymouth/plugins/#" \ -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \ -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \ + -e "s#plymouthconfdir=.*#plymouthconfdir=/etc/plymouth/#" \ configure.ac ''; + configurePlatforms = [ "host" ]; + configureFlags = [ - "--sysconfdir=/etc" - "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system" + "--enable-documentation" + "--enable-drm" + "--enable-gtk" + "--enable-pango" + "--enable-systemd-integration" + "--enable-tracing" "--localstatedir=/var" - "--with-logo=/etc/plymouth/logo.png" + "--sysconfdir=/etc" "--with-background-color=0x000000" - "--with-background-start-color-stop=0x000000" "--with-background-end-color-stop=0x000000" + "--with-background-start-color-stop=0x000000" + "--with-logo=/etc/plymouth/logo.png" "--with-release-file=/etc/os-release" - "--without-system-root-install" + "--with-runtimedir=/run" + "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system" "--without-rhgb-compat-link" - "--enable-tracing" - "--enable-systemd-integration" - "--enable-pango" - "--enable-gdm-transition" - "--enable-gtk" + "--without-system-root-install" "ac_cv_path_SYSTEMD_ASK_PASSWORD_AGENT=${lib.getBin systemd}/bin/systemd-tty-ask-password-agent" ]; - configurePlatforms = [ "host" ]; - installFlags = [ - "plymouthd_defaultsdir=$(out)/share/plymouth" - "plymouthd_confdir=$(out)/etc/plymouth" + "localstatedir=\${TMPDIR}" + "plymouthd_confdir=${placeholder "out"}/etc/plymouth" + "plymouthd_defaultsdir=${placeholder "out"}/share/plymouth" + "sysconfdir=${placeholder "out"}/etc" ]; + postInstall = '' + # Makes a symlink to /usr/share/pixmaps/system-logo-white.png + # We'll handle it in the nixos module. + rm $out/share/plymouth/themes/spinfinity/header-image.png + ''; + meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/Plymouth"; - description = "A graphical boot animation"; - license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + homepage = "https://www.freedesktop.org/wiki/Software/Plymouth/"; + description = "Boot splash and boot logger"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu teams.gnome.members ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix index 12a92c36c69..f80b7425cd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.24"; + version = "0.02.25"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j"; + sha256 = "sha256-C6MCOXnElDI69QkLKd2X2SLved8cRCN0Q6BhUvvqsTY="; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix index 1b2415dd805..0f69cb13fcd 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/syslinux/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation { touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; - nativeBuildInputs = [ nasm perl python3 ]; - buildInputs = [ libuuid makeWrapper ]; + nativeBuildInputs = [ nasm perl python3 makeWrapper ]; + buildInputs = [ libuuid ]; enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' hardeningDisable = [ "pic" "stackprotector" "fortify" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 476ebe06e70..3e40385c3bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,24 +1,23 @@ -From 6ede8baac88aba769030f5bc5f5b2070098c7428 Mon Sep 17 00:00:00 2001 +From 95e4533f1eeb6e0d509f9129d0133f0b849cc3c5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra 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/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 421fc5986af..7e3c6d1fe51 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/infra/libkookie/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 - - # 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; } - - # 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; } - - # 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) + '' + ( + 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; } + + # 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; } + + # 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; } + ]; + + 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/infra/libkookie/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix index 5e0125da00a..73b2f589511 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index 36223562578..e6b7de29fd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20210124"; + version = "1.0.20210219"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-ZiHnKDYziiNvNV1/HjEluC83600RYCvgbUuPiRATRYE="; + sha256 = "sha256-ZYZBnfX8DP0IV3VEBSzg7wnFCnlCzOT6Ql3kFZ0klfQ="; }; hardeningDisable = [ "pic" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index ee8b26c384d..d9767cbdd93 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 202dc9091fd..c8ff738cd6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils -, perl, buildPackages, nixosTests +, perl, nixosTests , configFile ? "all" # Userspace dependencies @@ -9,7 +9,7 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, enableMail ? false -, sysstat, sudo, pkg-config +, sysstat, pkg-config # Kernel dependencies , kernel ? null @@ -28,7 +28,7 @@ let , extraPatches ? [] , rev ? "zfs-${version}" , isUnstable ? false - , incompatibleKernelVersion ? null }: + , kernelCompatible ? null }: stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; @@ -183,7 +183,7 @@ let platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; broken = if - buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion + buildKernel && (kernelCompatible != null) && !kernelCompatible then builtins.trace '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} @@ -196,22 +196,24 @@ in { # ./nixos/modules/tasks/filesystems/zfs.nix needs # to be adapted zfsStable = common { - # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.20"; + # check the release notes for compatible kernels + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to the latest release. - version = "2.0.2"; + version = "2.0.3"; - sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; + sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; }; zfsUnstable = common { - # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.19"; + # check the release notes for compatible kernels + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.2"; + version = "2.0.3"; - sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; + sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; + + isUnstable = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/ankisyncd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/ankisyncd/default.nix index e1098670123..598483575cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/ankisyncd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/ankisyncd/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ankisyncd"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { - owner = "tsudoko"; + owner = "ankicommunity"; repo = "anki-sync-server"; rev = version; - sha256 = "6a140afa94fdb1725fed716918875e3d2ad0092cb955136e381c9d826cc4927c"; + sha256 = "196xhd6vzp1ncr3ahz0bv0gp1ap2s37j8v48dwmvaywzayakqdab"; }; format = "other"; @@ -60,8 +60,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Self-hosted Anki sync server"; maintainers = with maintainers; [ matt-snider ]; - homepage = "https://github.com/tsudoko/anki-sync-server"; - license = licenses.agpl3; + homepage = "https://github.com/ankicommunity/anki-sync-server"; + license = licenses.agpl3Only; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/apache-kafka/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/apache-kafka/default.nix index 826e952376c..4bd50653d52 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/apache-kafka/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/confluent-platform/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/confluent-platform/default.nix index e1cf4909932..4a5846d0116 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/confluent-platform/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/consul/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/consul/default.nix index 9dc723417d6..fb4372a1d89 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/consul/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.9.2"; + version = "1.9.3"; 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 = "sha256-/PjtLZtMSq/+S1mWe0oJ+dRCmCq0mlgvreL2awm0PcE="; }; 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 = "sha256-eIW3xQgy2doirGwKGE6OFGgXtKs8LYx3sfsnIu8n5Hg="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix index 3d78f4b4cdf..73a83250667 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.11"; + version = "9.16.12"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ARH2TdfY9RXPoSnhgczpb/ggcNGyfxGiH2hWEQ0GmcE="; + sha256 = "sha256-mRSvkxH9NJyrRBCXiY2U+yjQv9m/btBP4fl/BCZE2n8="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix index cdfc78d6222..188c3f77cb6 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 8954c9fcd89..a945198af6d 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/etcd/3.4.nix b/infra/libkookie/nixpkgs/pkgs/servers/etcd/3.4.nix index dc9fc0898df..f533b4537ad 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/exhibitor/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/exhibitor/default.nix index 0b92aca74c7..5636f51a169 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/exhibitor/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/default.nix index 10d517179c2..78addfc4aa2 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch b/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch new file mode 100644 index 00000000000..93959def44f --- /dev/null +++ b/infra/libkookie/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/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch b/infra/libkookie/nixpkgs/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch new file mode 100644 index 00000000000..9ebe0c6c0fb --- /dev/null +++ b/infra/libkookie/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 ++#include + #include + #include + +diff --git a/FDBLibTLS/FDBLibTLSVerify.cpp b/FDBLibTLS/FDBLibTLSVerify.cpp +index 594389916..1c8b9b50d 100644 +--- a/FDBLibTLS/FDBLibTLSVerify.cpp ++++ b/FDBLibTLS/FDBLibTLSVerify.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + static int hexValue(char c) { + static char const digits[] = "0123456789ABCDEF"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/gemini/agate/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/gemini/agate/default.nix index be3012740f5..a5028159b04 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/gemini/agate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; + sha256 = "sha256-EhIBkAPy+sZ629yxJ8GCVhEQx7gQypMFYquGpQJkke0="; }; - cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + cargoSha256 = "sha256-nRrFC/6CgXZR78aJQVw2y2sKUmRpz8Rofo0N4vgeekg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/agate --help + $out/bin/agate --version 2>&1 | grep "agate ${version}" + runHook postInstallCheck + ''; + meta = with lib; { - homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; - changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + homepage = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; + changelog = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; description = "Very simple server for the Gemini hypertext protocol"; longDescription = '' Agate is a server for the Gemini network protocol, built with the Rust @@ -25,7 +33,7 @@ rustPlatform.buildRustPackage rec { static files. It uses async I/O, and should be quite efficient even when running on low-end hardware and serving many concurrent requests. ''; - license = licenses.asl20; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ jk ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/gerbera/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/gerbera/default.nix index 7736ed1a014..c7e560f9e61 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/gerbera/default.nix @@ -20,13 +20,13 @@ let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "0vkgbw2ibvfr0zffnmmws7389msyqsiw8anfad6awvkda3z3rxjm"; + sha256 = "sha256-unBToiLSpTtnung77z65iuUqiQHwfMVgmFZMUtKU7fQ="; }; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/servers/gonic/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/gonic/default.nix index e541027af70..fbefca063a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/gonic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/gonic/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "gonic"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; - rev = "6c69bd3be6279f743c83596c4f0fc12798fdb26a"; - sha256 = "1igb2lbkc1nfxp49id3yxql9sbdqr467661jcgnchcnbayj4d664"; + rev = "7d420f61a90739cd82a81c2740274c538405d950"; + sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib ]; + buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/gpsd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/gpsd/default.nix index b7d50719305..62b711af67a 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/gpsd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/gpsd/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "gpsd"; - version = "3.21"; + version = "3.22"; src = fetchurl { - url = "https://download-mirror.savannah.gnu.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "14gyqrbrq6jz4y6x59rdpv9d4c3pbn0vh1blq3iwrc6kz0x4ql35"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + sha256 = "18rplv1cd76ndb2wc91jarjmfm2nk508pykv1hir79bqbwmdygvq"; }; nativeBuildInputs = [ @@ -46,15 +46,12 @@ stdenv.mkDerivation rec { ./sconstruct-env-fixes.patch ]; - postPatch = '' - sed -i -e '17i#include ' serial.c - ''; - # - leapfetch=no disables going online at build time to fetch leap-seconds # info. See /build.txt for more info. preBuild = '' patchShebangs . - sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct + sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript + export TAR=noop sconsFlags+=" udevdir=$out/lib/udev" sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" @@ -104,7 +101,8 @@ stdenv.mkDerivation rec { diagnostic monitoring and profiling of receivers and feeding location-aware applications GPS/AIS logs for diagnostic purposes. ''; - homepage = "http://catb.org/gpsd/"; + homepage = "https://gpsd.gitlab.io/gpsd/index.html"; + changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor rasendubi ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/infra/libkookie/nixpkgs/pkgs/servers/gpsd/sconstruct-env-fixes.patch index e90bd04b634..d11ad1299f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/gpsd/sconstruct-env-fixes.patch +++ b/infra/libkookie/nixpkgs/pkgs/servers/gpsd/sconstruct-env-fixes.patch @@ -1,6 +1,7 @@ ---- SConstruct.orig 2020-12-03 12:39:40.759793977 -0600 -+++ gpsd-3.21/SConstruct 2020-12-03 12:44:30.858761753 -0600 -@@ -516,9 +516,11 @@ +diff -Naur gpsd-3.22.orig/SConscript gpsd-3.22/SConscript +--- gpsd-3.22.orig/SConscript 2021-01-09 05:35:30.000000000 +0300 ++++ gpsd-3.22/SConscript 2021-02-25 21:06:47.921044438 +0300 +@@ -518,9 +518,11 @@ 'CWRAPPERS_CONFIG_DIR', # pkgsrc # Variables used in testing 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. diff --git a/infra/libkookie/nixpkgs/pkgs/servers/h2/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/h2/default.nix index be28578bcb0..d05232193d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/h2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/h2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = let diff --git a/infra/libkookie/nixpkgs/pkgs/servers/hbase/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/hbase/default.nix index 09600082633..32d2c09de97 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/hbase/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/hbase/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0kz72wqsii09v9hxkw10mzyvjhji5sx3l6aijjalgbybavpcxglb"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out cp -R * $out diff --git a/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc19..042246db04b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -23,11 +23,11 @@ "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; - "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond + "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage "amazon_polly" = ps: with ps; [ boto3 ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; - "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient + "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam @@ -41,7 +41,7 @@ "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib - "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic + "aqualogic" = ps: with ps; [ aqualogic ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj "arduino" = ps: with ps; [ ]; # missing inputs: PyMata @@ -52,18 +52,18 @@ "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox - "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt + "asuswrt" = ps: with ps; [ aioasuswrt ]; "atag" = ps: with ps; [ ]; # missing inputs: pyatag "aten_pe" = ps: with ps; [ atenpdu ]; "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august - "aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa + "aurora" = ps: with ps; [ auroranoaa ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; "avion" = ps: with ps; [ avion ]; - "awair" = ps: with ps; [ ]; # missing inputs: python_awair + "awair" = ps: with ps; [ python-awair ]; "aws" = ps: with ps; [ aiobotocore ]; "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops @@ -110,7 +110,7 @@ "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; - "channels" = ps: with ps; [ ]; # missing inputs: pychannels + "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; @@ -145,7 +145,7 @@ "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; - "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin + "daikin" = ps: with ps; [ pydaikin ]; "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair "darksky" = ps: with ps; [ python-forecastio ]; "datadog" = ps: with ps; [ datadog ]; @@ -209,7 +209,7 @@ "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox "efergy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia - "eight_sleep" = ps: with ps; [ ]; # missing inputs: pyeight + "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ ]; # missing inputs: elgato "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib @@ -264,8 +264,8 @@ "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; - "flume" = ps: with ps; [ ]; # missing inputs: pyflume - "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou + "flume" = ps: with ps; [ pyflume ]; + "flunearyou" = ps: with ps; [ pyflunearyou ]; "flux" = ps: with ps; [ ]; "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; @@ -338,7 +338,7 @@ "hassio" = ps: with ps; [ aiohttp-cors pillow ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; - "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC + "hdmi_cec" = ps: with ps; [ pycec ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 "heos" = ps: with ps; [ ]; # missing inputs: pyheos "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy @@ -480,7 +480,7 @@ "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "media_source" = ps: with ps; [ aiohttp-cors ]; - "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom + "mediaroom" = ps: with ps; [ pymediaroom ]; "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate "meraki" = ps: with ps; [ aiohttp-cors ]; @@ -496,10 +496,10 @@ "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora - "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros + "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ]; "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; @@ -518,12 +518,12 @@ "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams + "msteams" = ps: with ps; [ pymsteams ]; "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 @@ -565,7 +565,7 @@ "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 - "nws" = ps: with ps; [ ]; # missing inputs: pynws + "nws" = ps: with ps; [ pynws ]; "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics @@ -631,13 +631,13 @@ "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall - "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 + "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; - "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer + "proxmoxve" = ps: with ps; [ proxmoxer ]; "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; @@ -658,7 +658,7 @@ "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; - "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm + "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle @@ -679,9 +679,9 @@ "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "risco" = ps: with ps; [ ]; # missing inputs: pyrisco + "risco" = ps: with ps; [ pyrisco ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp @@ -723,7 +723,7 @@ "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track - "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiqpy + "sharkiq" = ps: with ps; [ sharkiqpy ]; "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ aioshelly ]; "shiftr" = ps: with ps; [ paho-mqtt ]; @@ -731,7 +731,7 @@ "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -740,18 +740,18 @@ "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] - "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy + "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ pysma ]; - "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee + "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg - "sms" = ps: with ps; [ ]; # missing inputs: python-gammu + "sms" = ps: with ps; [ python-gammu ]; "smtp" = ps: with ps; [ ]; "snapcast" = ps: with ps; [ snapcast ]; "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -763,7 +763,7 @@ "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ solax ]; "soma" = ps: with ps; [ pysoma ]; - "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy + "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal @@ -796,12 +796,12 @@ "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; "supla" = ps: with ps; [ ]; # missing inputs: asyncpysupla - "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy + "surepetcare" = ps: with ps; [ surepy ]; "swiss_hydrological_data" = ps: with ps; [ swisshydrodata ]; "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; - "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot + "switchbot" = ps: with ps; [ pyswitchbot ]; "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru @@ -815,9 +815,9 @@ "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api + "tahoma" = ps: with ps; [ tahoma-api ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility - "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig + "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ]; "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli @@ -825,7 +825,7 @@ "ted5000" = ps: with ps; [ xmltodict ]; "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; - "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive + "tellduslive" = ps: with ps; [ tellduslive ]; "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb @@ -858,21 +858,21 @@ "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] - "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket - "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket + "trafikverket_train" = ps: with ps; [ pytrafikverket ]; + "trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ]; "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy "trend" = ps: with ps; [ numpy ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; - "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha - "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu + "tuya" = ps: with ps; [ tuyaha ]; + "twentemilieu" = ps: with ps; [ twentemilieu ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client - "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client - "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI + "twinkly" = ps: with ps; [ twinkly-client ]; + "twitch" = ps: with ps; [ python-twitch-client ]; + "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; @@ -894,24 +894,24 @@ "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus + "velbus" = ps: with ps; [ python-velbus ]; "velux" = ps: with ps; [ pyvlx ]; - "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch + "venstar" = ps: with ps; [ venstarcolortouch ]; "vera" = ps: with ps; [ pyvera ]; "verisure" = ps: with ps; [ jsonpath vsure ]; "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; - "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare + "vicare" = ps: with ps; [ pyvicare ]; "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek - "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio + "vizio" = ps: with ps; [ pyvizio ]; "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; - "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio + "volumio" = ps: with ps; [ pyvolumio ]; "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 @@ -924,11 +924,11 @@ "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv + "webostv" = ps: with ps; [ aiopylgtv ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ python-whois ]; - "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi + "wiffi" = ps: with ps; [ wiffi ]; "wilight" = ps: with ps; [ pywilight ]; "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy @@ -948,12 +948,12 @@ "xeoma" = ps: with ps; [ pyxeoma ]; "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; - "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv + "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client - "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient + "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps diff --git a/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/default.nix index fae857fda5d..8931bf65b5c 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -9,8 +9,7 @@ # Override Python packages using # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } # Applied after defaultOverrides -, packageOverrides ? self: super: { -} +, packageOverrides ? self: super: {} # Skip pip install of required packages on startup , skipPip ? true }: @@ -24,6 +23,11 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # Pinned due to bug in ring-doorbell 0.7.0 + # https://github.com/tchellomello/python-ring-doorbell/issues/240 + (mkOverride "ring-doorbell" "0.6.2" + "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -86,7 +90,9 @@ in with py.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace "attrs==19.3.0" "attrs>=19.3.0" \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ + --replace "awesomeversion==21.2.2" "awesomeversion>=21.2.2" \ --replace "cryptography==3.2" "cryptography" \ + --replace "httpx==0.16.1" "httpx>=0.16.1" \ --replace "pip>=8.0.3,<20.3" "pip" \ --replace "pytz>=2020.5" "pytz>=2020.4" \ --replace "pyyaml==5.4.1" "pyyaml" \ diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/darkhttpd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/darkhttpd/default.nix index 49097fe2bfa..56bf5cd5b74 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/darkhttpd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/darkhttpd/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.12"; + version = "1.13"; - src = fetchurl { - url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2"; - sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; + src = fetchFromGitHub { + owner = "emikulic"; + repo = pname; + rev = "v${version}"; + sha256 = "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk"; }; enableParallelBuilding = true; installPhase = '' + runHook preInstall install -Dm555 -t $out/bin darkhttpd - install -Dm444 -t $out/share/doc/${pname} README + install -Dm444 -t $out/share/doc/${pname} README.md head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix index d95740b6d15..1a43f259282 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.36.v20210114"; + version = "9.4.37.v20210219"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - sha256 = "1bsqxzjcdgdg2qdgc64pvrimkn9j2di2s3prlgdpbwi566744q54"; + sha256 = "sha256-Jyg0cQBnwYtcVJnr2uWwE/9yC3wq+CLTTGKtv3BsZs8="; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix index cadc1064ac0..aad46be30b2 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.6"; - sha256 = "1d9kzks8x1226prjbpdin4dz93fjnv304zlqybfqachx5fh9a4di"; + version = "1.19.7"; + sha256 = "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s"; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix index a5d5e37487a..8170ae79c32 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix @@ -7,7 +7,6 @@ , withPerl530 ? false, perl530 , withPerl532 ? true, perl532 , withPerldevel ? false, perldevel -, withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 , withRuby_2_7 ? false, ruby_2_7 , withSSL ? true, openssl ? null @@ -51,7 +50,6 @@ in stdenv.mkDerivation rec { ++ optional withPerl530 perl530 ++ optional withPerl532 perl532 ++ optional withPerldevel perldevel - ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 ++ optional withRuby_2_7 ruby_2_7 ++ optional withSSL openssl; @@ -77,7 +75,6 @@ in stdenv.mkDerivation rec { ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} - ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/imgproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/imgproxy/default.nix index 5197b1d3dff..cf83b2946ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "0p6vy5b6dhv23qnn6sk99hn0j5wiwqpaprsg5jgm2wxb0w2bfz0w"; + sha256 = "sha256-HUWDwUt/yHgwzqtQKsQ3DrBAfL8PBqGhFLMwS7ix5qE="; rev = "v${version}"; }; - vendorSha256 = "0jrp778cjr8k8sbal0yn1zy7s9sj534q9i90qv4c29fxd9xw7qgp"; + vendorSha256 = "sha256-A03Qdwxv/uUKI4Lfmatqwu1RDH9vKU63Y+x25AdfZXs="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/irc/atheme/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/irc/atheme/default.nix index a95a2ad27c3..eb6f9345b2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/irc/atheme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/irc/atheme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "atheme"; - version = "7.2.10-r2"; + version = "7.2.11"; src = fetchgit { url = "https://github.com/atheme/atheme.git"; rev = "v${version}"; - sha256 = "1yasfvbmixj4zzfv449hlcp0ms5c250lrshdy6x6l643nbnix4y9"; + sha256 = "15fs48cgzxblh2g4abl5v647ndfx9hg8cih2x67v3y7s9wz68wk2"; leaveDotGit = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/irc/solanum/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/irc/solanum/default.nix index 0ae030ba59d..1d39526ed1e 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/irc/solanum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/irc/solanum/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; + enableParallelBuilding = true; + meta = with lib; { description = "An IRCd for unified networks"; homepage = "https://github.com/solanum-ircd/solanum"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/jackett/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/jackett/default.nix index 11e213f0136..b33ab7b505e 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/jackett/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.15"; + version = "0.17.606"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1pp5pnnmy8m0jvpxrldshcx71dl5g16dqvnnzaqhvs4cjhpgq8fw"; + sha256 = "sha256-SWZMS5O1hp9RsFlivfegqoiCLLd9PZthxbrn6IL+FzI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; platforms = platforms.all; }; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/jetbrains/youtrack.nix b/infra/libkookie/nixpkgs/pkgs/servers/jetbrains/youtrack.nix index 5aab96d1bc0..c3680d76b96 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/jetbrains/youtrack.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/jetbrains/youtrack.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/jicofo/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/jicofo/default.nix index f706438d6c1..49e40713a0a 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/jicofo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/jicofo/default.nix @@ -1,11 +1,11 @@ -{ pkgs, lib, stdenv, fetchurl, dpkg, jre_headless, nixosTests }: +{ lib, stdenv, fetchurl, dpkg, jre_headless, nixosTests }: let pname = "jicofo"; - version = "1.0-612"; + version = "1.0-690"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "0xv3p2h8g1jwcmxljdpz08d6dsz543mznp0nwgb6vr93faz8kc81"; + sha256 = "1w5nz2p6scd7w0ac93vhxlk5i8in5160c0icwl27m4x4km9xf6al"; }; in stdenv.mkDerivation { @@ -16,6 +16,7 @@ stdenv.mkDerivation { unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; installPhase = '' + runHook preInstall substituteInPlace usr/share/jicofo/jicofo.sh \ --replace "exec java" "exec ${jre_headless}/bin/java" @@ -24,6 +25,7 @@ stdenv.mkDerivation { mv etc $out/ cp ${./logging.properties-journal} $out/etc/jitsi/jicofo/logging.properties-journal ln -s $out/share/jicofo/jicofo.sh $out/bin/jicofo + runHook postInstall ''; passthru.tests = { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix index d9dd84c7cfb..35cd6906012 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-273-g072dd44b"; + version = "2.1-416-g2f43d1b4"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "12l84wjn5iqnsg0816icgbx8jfcgyfnqclgyx303w4ncbvymlkv9"; + sha256 = "0s9wmbba1nlpxaawzmaqg92882y5sfs2ws64w5sqvpi7n77hy54m"; }; in stdenv.mkDerivation { @@ -15,9 +15,10 @@ stdenv.mkDerivation { unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall substituteInPlace usr/share/jitsi-videobridge/jvb.sh \ --replace "exec java" "exec ${jre_headless}/bin/java" @@ -30,6 +31,7 @@ stdenv.mkDerivation { # work around https://github.com/jitsi/jitsi-videobridge/issues/1547 wrapProgram $out/bin/jitsi-videobridge \ --set VIDEOBRIDGE_GC_TYPE G1GC + runHook postInstall ''; passthru.tests = { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix index 468904b3f0d..3726facd583 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.2"; + version = "12.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "006k6ac00iz61s6hi3wzj6w71mhhv7n00vh82ak4yhwr97jffqbz"; + sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/livepeer/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/livepeer/default.nix index a016c8e7f09..ad67cdf4348 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/livepeer/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.13"; + version = "0.5.14"; runVend = true; - vendorSha256 = "sha256-wAjGgYDyBWqE8KCQ6TQ+LGDDZqF+5XY+NzU74RwPuRE="; + vendorSha256 = "sha256-StkgU11VLEKg89kn3zPcdC8HBw9MmJrfDPGk1SUQO64="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "sha256-b4O8Hc8A8TN5KFcQ7KYvFPVFgposDgPw06WowrXzpAs="; + sha256 = "sha256-GxgpGI1ymhbYhzCP2Bs5wJ5kq5rHHkClXcAsYlaQ/AM="; }; # livepeer_cli has a vendoring problem diff --git a/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch b/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch deleted file mode 100644 index 0980ec9a5df..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/build.gradle 2019-09-01 16:17:17.815513296 +0200 -+++ b/build.gradle 2019-09-01 16:21:14.688832785 +0200 -@@ -73,7 +73,7 @@ - - buildscript { - repositories { -- jcenter() -+REPLACE - } - - dependencies { -@@ -83,7 +83,7 @@ - } - - repositories { -- jcenter() -+REPLACE - } - - dependencies { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/default.nix index 055136c2071..5947d18eb9e 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/ma1sd/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle_5, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: let name = "ma1sd-${version}"; - version = "2.1.1"; - rev = "a112a5e57cb38ad282939d2dcb9c1476e038af39"; + version = "2.4.0"; + rev = version; src = fetchFromGitHub { inherit rev; owner = "ma1uta"; repo = "ma1sd"; - sha256 = "1qibn6m6mvxwnbiypxlgkaqg6in358vkf0q47410rv1dx1gjcnv5"; + hash = "sha256-8UnhrGa8KKmMAAkzUXztMkxgYOX8MU1ioXuEStGi4Vc="; }; deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle_5 perl git ]; + nativeBuildInputs = [ gradle perl git ]; buildPhase = '' export MA1SD_BUILD_VERSION=${rev} @@ -35,34 +35,36 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1w9cxq0rlzyh7bzqr3v3vn2cjhpn7hhc5lk9qzwj7sdj4jn2qxq6"; + outputHash = "0x2wmmhjgnb6p72d3kvnv2vg52l0c4151rs4jrazs9rvxjfc88dr"; }; in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle perl makeWrapper ]; buildInputs = [ jre ]; - patches = [ ./0001-gradle.patch ]; - buildPhase = '' + runHook preBuild export MA1SD_BUILD_VERSION=${rev} export GRADLE_USER_HOME=$(mktemp -d) - sed -ie "s#REPLACE#mavenLocal(); maven { url '${deps}' }#g" build.gradle + sed -ie "s#jcenter()#mavenLocal(); maven { url '${deps}' }#g" build.gradle gradle --offline --no-daemon build -x test + runHook postBuild ''; installPhase = '' + runHook preInstall install -D build/libs/source.jar $out/lib/ma1sd.jar makeWrapper ${jre}/bin/java $out/bin/ma1sd --add-flags "-jar $out/lib/ma1sd.jar" + runHook postInstall ''; meta = with lib; { description = "a federated matrix identity server; fork of mxisd"; homepage = "https://github.com/ma1uta/ma1sd"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; }; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/mail/mailhog/default.nix index 674fdbabb4e..0032c4a630e 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mail/mailhog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mail/mailhog/default.nix @@ -13,6 +13,8 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { description = "Web and API based SMTP testing"; homepage = "https://github.com/mailhog/MailHog"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index 9330de3a8f3..fc9f6217d93 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "postorius"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"; + sha256 = "sha256-L2ApUGQNvR0UVvodVM+wMzjYLZkegI4fT4yUiU/cibU="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; @@ -17,10 +17,10 @@ buildPythonPackage rec { # Tries to connect to database. doCheck = false; - meta = { - homepage = "https://www.gnu.org/software/mailman/"; + meta = with lib; { + homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ globin peti ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ globin peti ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/wrapped.nix b/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/wrapped.nix index 2a620763d87..c244af10e78 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/wrapped.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mail/mailman/wrapped.nix @@ -8,7 +8,7 @@ in runCommand "${mailman.name}-wrapped" { inherit (mailman) meta; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = mailman.passthru // { unwrapped = mailman; }; } '' mkdir -p "$out/bin" diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index ff96f0e7c82..71bcc3fc687 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -9,7 +9,8 @@ perlPackages.buildPerlPackage rec { sha256 = "0ga5mi2nv2v91kakk9xakkg71rnxnddlzv76ca13vfyd4jgcfasf"; }; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable Socket6 diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mastodon/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/mastodon/default.nix index 8508fbe8f78..1abedead87d 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mastodon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mastodon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv -, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7 +, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7, writeShellScript # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { fi chmod -R u+w node_modules rake webpacker:compile + rails assets:precompile ''; installPhase = '' @@ -96,10 +97,18 @@ stdenv.mkDerivation rec { ln -s /var/log/mastodon log ln -s /tmp tmp ''; + propagatedBuildInputs = [ imagemagick ffmpeg file mastodon-gems.wrappedRuby ]; - installPhase = '' + + installPhase = let + run-streaming = writeShellScript "run-streaming.sh" '' + # NixOS helper script to consistently use the same NodeJS version the package was built with. + ${nodejs-slim}/bin/node ./streaming + ''; + in '' mkdir -p $out cp -r * $out/ + ln -s ${run-streaming} $out/run-streaming.sh ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix index f9d26da6297..29f2bad76ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.26.0"; + version = "1.28.0"; src = fetchPypi { inherit pname version; - sha256 = "1jppwqxamj3a65fw2a87brz4iqgijaa4lja51wlxh2xdkqj0sn6l"; + sha256 = "sha256-KWEpgizOdil7dXIxug7xT3dEYEHi/IEPX/6aT7qW6C8="; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/infra/libkookie/nixpkgs/pkgs/servers/mattermost/matterircd.nix index 3abb728bec1..fd950cb6355 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "0rnkzxf953nd67w33ghmrfjfg099cd21nldm31q8pk7fs1mgjnld"; + sha256 = "sha256-0HeqKnFOrXcoXKEkWxNfoRv77As86aLUAgH/+ZUymAs="; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/metabase/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/metabase/default.nix index 48b5a7195b5..d64279bf7e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/metabase/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.8"; + version = "0.38.0"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30="; + sha256 = "170fj2cc7drh6c1dgl60f9n79vfrsw2v57lmds677naxnq254jhp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/miniflux/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/miniflux/default.nix index 08af694560b..42b071427ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.27"; + version = "2.0.28"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "0sl1hxdybafzpa1bi22b8r4fxdzwynr012ga5jvwcn2rcxbdbd8z"; + sha256 = "sha256-XvQhLqGP1TliSrIm55dP04yGoOMnHmcI2gH00SYVLVY="; }; - vendorSha256 = "183whf29zq771rq0z4008gwaps1iipb0m9kp6xyizbnzafwm3zwm"; + vendorSha256 = "sha256-NKpMLjro06gWN2Xu5M+xM4hVNvlOZ12F3Jv+bL5E0I8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/minio/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/minio/default.nix index 492e0236d19..4fa8620503b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/minio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-02-11T08-23-43Z"; + version = "2021-02-24T18-44-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Y2iyi+bdBCLV/MWPPsrrJFEayuQVGsvrs63kOuFljJ8="; + sha256 = "sha256-htrIRZXpr3V7GoeldeULndSfJNMmLKPVOimg3l+UisA="; }; - vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; + vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix index 0034c253c77..02841c6acb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -24,7 +24,8 @@ perlPackages.buildPerlPackage rec { ''; buildTools = []; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ CGI DataStructureUtil FileCopyRecursive diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 1d5715176ca..7ad518308df 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-kWl6wkyN/ytnct2MseZ5FQgOL2WeGJDFPPGJxkdcDX8="; + sha256 = "sha256-wm+WoOvYVa29lMMnXatlQ4gcCLsz+uQZ7D/hUxNjIPc="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 99f83e1bfbd..370006a591e 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -26,6 +26,10 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) loki; }; + buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in '' + -ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown + ''; + doCheck = true; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/longview/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/longview/default.nix index 96048005cb1..5d05dfd1ebb 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/longview/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/longview/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { --replace /etc/linode /run/longview ''; - buildInputs = [ perl makeWrapper glibc ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl glibc ] ++ (with perlPackages; [ LWP LWPProtocolHttps diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 5168f2e7e9d..64ee8752f1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/munin/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://munin-monitoring.org/"; license = licenses.gpl2; - maintainers = [ maintainers.domenkozar maintainers.bjornfor ]; + maintainers = [ maintainers.bjornfor ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix index 4b2e76f7043..c4b9f06fdde 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "flow-exporter"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 0c5aa7d8a43..e6505857bf5 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation { sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f"; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = "installPhase"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b1c3bc6999f..d21ddcf5647 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: let baseVersion = "0.3.1"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/seyren/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/seyren/default.nix index 1d26afad3d8..4dd90cacb8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/seyren/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/seyren/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p "$out"/bin diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 55b0ab14af7..3a01acbb372 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "telegraf"; - version = "1.17.2"; + version = "1.17.3"; excludedPackages = "test"; @@ -12,14 +12,14 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw="; + sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI="; }; - vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc="; + vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0="; - buildFlagsArray = [ ''-ldflags= - -w -s -X main.version=${version} - '' ]; + preBuild = '' + buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") + ''; passthru.tests = { inherit (nixosTests) telegraf; }; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix index 121b31e46eb..a871bf87db2 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin $out/public diff --git a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix index e84c422ea64..9395c3c61c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/infra/libkookie/nixpkgs/pkgs/servers/mpd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/mpd/default.nix index b34f6207491..3e1f8100004 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/mpd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/mpd/default.nix @@ -114,13 +114,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.4"; + version = "0.22.6"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-CVi+fcmFMJMv7X4okALlVsxqsuUsirHgQT61IHdrBNE="; + sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8="; }; buildInputs = [ @@ -149,8 +149,6 @@ let doCheck = true; - enableParallelBuilding = true; - mesonAutoFeatures = "disabled"; outputs = [ "out" "doc" ] @@ -173,7 +171,7 @@ let meta = with lib; { description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ]; platforms = platforms.unix; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index e6a9f95a1b9..5726786e5b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.19.0"; + version = "0.20.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "1wa2xby7v45f9idnhbkglknipm24wqx7mxmkyqz3amq17j4xfy7c"; + sha256 = "sha256-vhUj3CVBM5jbwEtnzdgQD3eLguiHQguK01O69JZIUUk="; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nextcloud/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/nextcloud/default.nix index a40dd71fafd..8205f4f860a 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -31,24 +31,19 @@ let }; }; in { - nextcloud17 = throw '' - Nextcloud v17 has been removed from `nixpkgs` as the support for it will be dropped - by upstream within the lifetime of NixOS 20.09[1]. Please upgrade to Nextcloud v18 by + nextcloud18 = throw '' + Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by declaring - services.nextcloud.package = pkgs.nextcloud18; + services.nextcloud.package = pkgs.nextcloud19; in your NixOS config. [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - nextcloud18 = generic { - version = "18.0.10"; - sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6"; - eol = true; - }; - + # FIXME(@Ma27) remove on 21.05 nextcloud19 = generic { version = "19.0.6"; sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; @@ -61,4 +56,9 @@ in { version = "20.0.7"; sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; }; + + nextcloud21 = generic { + version = "21.0.0"; + sha256 = "sha256-zq2u72doWhGvxbI7Coa6PHvQp7E41dHswFJiODZV8fA="; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix index 4511fbcd040..63d89a29d13 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.1.nix @@ -4,4 +4,8 @@ callPackage ./generic.nix (args // { version = "2.1.22"; sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3"; generation = "2_1"; + extraMeta.knownVulnerabilities = [ + # Fixed in 3.* but 2.* hasn't been released since + "CVE-2020-17516" + ]; }) diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix index 5cec13e4cd1..dc04c374b3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/2.2.nix @@ -4,4 +4,8 @@ callPackage ./generic.nix (args // { version = "2.2.14"; sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; generation = "2_2"; + extraMeta.knownVulnerabilities = [ + # Fixed in 3.* but 2.* hasn't been released since + "CVE-2020-17516" + ]; }) diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix index 72af03af1d8..7788e3ff381 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.23"; - sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; + version = "3.0.24"; + sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; generation = "3_0"; }) diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix index 15e11145d59..bcdfc8793db 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.9"; - sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c"; + version = "3.11.10"; + sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; generation = "3_11"; }) diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix index 4d9f09637e9..ca2001817a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix @@ -3,6 +3,7 @@ # generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11 , generation , version, sha256 +, extraMeta ? {} , ... }: @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper coreutils ]; installPhase = '' + runHook preInstall + mkdir $out mv * $out @@ -85,6 +88,8 @@ stdenv.mkDerivation rec { done wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin + + runHook postInstall ''; passthru = { @@ -104,5 +109,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.roberth ]; - }; + } // extraMeta; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/neo4j/default.nix index 684cdbe287c..d9c9ddf8752 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/neo4j/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/neo4j/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zjb6cgk2lpzx6pq1cs5fh65in6b5ccpl1cgfiglgpjc948mnhzv"; }; - buildInputs = [ makeWrapper jre8 which gawk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre8 which gawk ]; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/redis/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/redis/default.nix index 9eac9e2f256..e35aac3be1b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, lua, pkg-config, systemd, jemalloc, nixosTests +{ lib, stdenv, fetchurl, lua, pkg-config, systemd, nixosTests , tlsSupport ? true, openssl }: stdenv.mkDerivation rec { - version = "6.0.10"; pname = "redis"; + version = "6.2.0"; src = fetchurl { - url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"; + url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; + sha256 = "1jnv6acjlljvrlxmz0mqarsx1fl5vwss24l8zy5dcawnbp129mk7"; }; # Cross-compiling fixes @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-std=c11" ]; + doCheck = false; # needs tcl passthru.tests.redis = nixosTests.redis; @@ -44,7 +46,8 @@ stdenv.mkDerivation rec { homepage = "https://redis.io"; description = "An open source, advanced key-value store"; license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ berdario globin ]; + platforms = platforms.all; + changelog = "https://github.com/redis/redis/raw/${version}/00-RELEASENOTES"; + maintainers = with maintainers; [ berdario globin marsam ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix index 558fdad9841..4c5be92e765 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; - buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] + buildInputs = [ protobuf boost zlib curl openssl icu ] ++ lib.optional (!stdenv.isDarwin) jemalloc ++ lib.optional stdenv.isDarwin libtool; - nativeBuildInputs = [ which m4 python2Packages.python ]; + nativeBuildInputs = [ which m4 python2Packages.python makeWrapper ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/oauth2_proxy/default.nix index 8e57e253435..7c2bcbe4740 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/oauth2_proxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/oauth2_proxy/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-yH60mfuYRv31I0DOEtWxqGCzKOwDYsQh4yjvYO3vq3I="; + sha256 = "sha256-PvoCR+JYaQeHlnO6H75LcY7Lszi1nNNe6SCd3sJJ6R4="; rev = "v${version}"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/infra/libkookie/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 97e20238a7c..1bb6ee32396 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -19,22 +19,36 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; patches = [ + # LINUX 5.8: Replace kernel_setsockopt with new funcs (fetchpatch { url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch"; sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab"; }) + # LINUX 5.8: do not set name field in backing_dev_info (fetchpatch { url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch"; sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x"; }) + # LINUX 5.8: use lru_cache_add (fetchpatch { url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch"; sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1"; }) + # LINUX 5.9: Remove HAVE_UNLOCKED_IOCTL/COMPAT_IOCTL (fetchpatch { url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch"; sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl"; }) + # Linux: Refactor test for 32bit compat + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/4ad1057ab8fd206c9fa8d5e3bdde4f1a8417afdb.patch"; + sha256 = "0v2537wkav78yi8lv6fkd1n6rf2g17igf44rpa3kd0kkidxv5lqr"; + }) + # Linux 5.11: Test 32bit compat with in_compat_syscall + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/ee53dd3bc087a05e22fc4111297a51ddb30013f0.patch"; + sha256 = "0dfab3zk0dmf6iksna5n09lf5dn4f8w43q4irl2yf5dgqm35shkr"; + }) ]; hardeningDisable = [ "pic" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/pleroma-otp/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/pleroma-otp/default.nix index 4905acd0757..10fd2627743 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/pleroma-otp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/pleroma-otp/default.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation { pname = "pleroma-otp"; - version = "2.2.2"; + version = "2.3.0"; # To find the latest binary release stable link, have a look at # the CI pipeline for the latest commit of the stable branch # https://git.pleroma.social/pleroma/pleroma/-/tree/stable src = { aarch64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175288/artifacts/download"; - sha256 = "107kp5zqwq1lixk1cwkx4v7zpm0h248xzlm152aj36ghb43j2snw"; + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182392/artifacts/download"; + sha256 = "1drpd6xh7m2damxi5impb8jwvjl6m3qv5yxynl12i8g66vi3rbwf"; }; x86_64-linux = fetchurl { - url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/175284/artifacts/download"; - sha256 = "1c6l04gga9iigm249ywwcrjg6wzy8iiid652mws3j9dnl71w2sim"; + url = "https://git.pleroma.social/pleroma/pleroma/-/jobs/182388/artifacts/download"; + sha256 = "0glr0iiqmylwwsn5r946yqr9kx97j2zznrc0imyxm3j0vhz8xzl4"; }; }."${stdenv.hostPlatform.system}"; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/plex/raw.nix b/infra/libkookie/nixpkgs/pkgs/servers/plex/raw.nix index ca0e41f76d2..6261e2f9bfa 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/plex/raw.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.3.4014-58bd20c02"; + version = "1.21.4.4079-1b7748a7b"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw"; + sha256 = "0843sdl9c6382vjj3ykvcl6rizs2jnb4jqx19ah3phbcvsnjlhdb"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z"; + sha256 = "02v4jf6jajm5gvsilllln1vvnxx30gi2b8ljsby5d3xhhca6kmqx"; }; outputs = [ "out" "basedb" ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p "$out/lib" cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/lib/ @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { # to the '/db' file; we create this path in the FHS userenv (see the "plex" # package). ln -fs /db $f + runHook postInstall ''; # We're running in a FHS userenv; don't patch anything @@ -83,7 +85,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ badmutex - colemickens forkk lnl7 pjones diff --git a/infra/libkookie/nixpkgs/pkgs/servers/plik/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/plik/default.nix new file mode 100644 index 00000000000..b66ca14e415 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/servers/plik/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, makeWrapper, runCommand, callPackage }: + +let + version = "1.3.1"; + + programs = callPackage ./programs.nix {}; + + webapp = fetchurl { + url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz"; + sha256 = "KN6cp29KKdGamYnfL3jYltx0EDx6syDPfV0jShOk7Zw="; + }; + +in { + + inherit (programs) plik plikd-unwrapped; + + plikd = runCommand "plikd-${version}" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/libexec/plikd/{bin,webapp} $out/bin + tar xf ${webapp} plik-${version}-linux-amd64/webapp/dist/ + mv plik-*/webapp/dist $out/libexec/plikd/webapp + cp ${programs.plikd-unwrapped}/bin/plikd $out/libexec/plikd/bin/plikd + makeWrapper $out/libexec/plikd/bin/plikd $out/bin/plikd \ + --run "cd $out/libexec/plikd/bin" + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/servers/plik/programs.nix b/infra/libkookie/nixpkgs/pkgs/servers/plik/programs.nix new file mode 100644 index 00000000000..ff83ec5ff68 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/servers/plik/programs.nix @@ -0,0 +1,42 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: + +let + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "root-gg"; + repo = "plik"; + rev = version; + sha256 = "C/1Uwjsqd9n3WSXlnlq9K3EJHkLOSavS9cPqF2UqmGo="; + }; + + vendorSha256 = "klmWXC3tkoOcQHhiQZjR2C5jqaRJqMQOLtVxZ0cFq/Y="; + + meta = with lib; { + homepage = "https://plik.root.gg/"; + description = "Scalable & friendly temporary file upload system"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.mit; + }; +in { + + plik = buildGoModule { + pname = "plik"; + inherit version meta src vendorSha256; + + subPackages = [ "client" ]; + postInstall = '' + mv $out/bin/client $out/bin/plik + ''; + }; + + plikd-unwrapped = buildGoModule { + pname = "plikd-unwrapped"; + inherit version src vendorSha256; + + subPackages = [ "server" ]; + postFixup = '' + mv $out/bin/server $out/bin/plikd + ''; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/servers/rippled/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/rippled/default.nix index 22223f2a27e..cd19c77cab3 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/rippled/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/rippled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkg-config +{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config , openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: let diff --git a/infra/libkookie/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix b/infra/libkookie/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix index ec5794d1509..ba172ddefd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix @@ -1,33 +1,35 @@ -{ stdenv, lib, fetchgit, cmake, openssl, boost, zlib, rippled }: +{ stdenv, lib, fetchFromGitHub, cmake, openssl, boost, zlib, icu, rippled }: stdenv.mkDerivation rec { - name = "rippled-validator-keys-tool-20180927-${builtins.substring 0 7 rev}"; - rev = "d7774bcc1dc9439c586ea1c175fcd5ff3960b15f"; + pname = "rippled-validator-keys-tool"; + version = "0.3.2"; - src = fetchgit { - url = "https://github.com/ripple/validator-keys-tool.git"; - inherit rev; - sha256 = "1hcbwwa21n692qpbm0vqy5jvvnf4aias309610m4kwdsnzfw0902"; + src = fetchFromGitHub { + owner = "ripple"; + repo = "validator-keys-tool"; + rev = "5d7efcfeda3bdf6f5dda78056004a7c326321e9b"; + sha256 = "1irm8asp6plk9xw3ksf4fqnim8h0vj3h96w638lx71pga1h4zvmy"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl boost zlib rippled ]; + buildInputs = [ openssl boost zlib icu rippled ]; hardeningDisable = ["format"]; - preConfigure = '' - export CXX="$(command -v $CXX)" - export CC="$(command -v $CC)" - ''; + cmakeFlags = [ + "-Dep_procs=1" + ]; installPhase = '' + runHook preInstall install -D validator-keys $out/bin/validator-keys + runHook postInstall ''; meta = with lib; { description = "Generate master and ephemeral rippled validator keys"; homepage = "https://github.com/ripple/validator-keys-tool"; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline rmcgibbo ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index b5861ce3221..1cb5e37cb94 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PjITPuCndz/EuFEt9docmWN93TwZQbnyHV161hUwS0="; + sha256 = "sha256-pnMUUxV4DM2YClwc24l+5Ehh5zc+qEOLTtiqh7c+8PI="; }; - vendorSha256 = "sha256-6tp1hN1dRKm523IegMpsTO+/gktywqdNZflUbE4TPuU="; + vendorSha256 = "sha256-oWWUEPEpMLqXucQwUvM6fyGCwttTIV6ZcCM2VZXnKuM="; # Tests need docker doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sabnzbd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/sabnzbd/default.nix index 5f1f8e6230e..4533e3138a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -30,7 +30,8 @@ in stdenv.mkDerivation rec { sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2"; }; - buildInputs = [ pythonEnv makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; installPhase = '' mkdir -p $out diff --git a/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix b/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix index 86230e11cb9..3558fd5935e 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - buildInputs = [ makeWrapper jre_headless util-linux ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ] ++ optional enableUnfree zlib; installPhase = '' @@ -61,7 +62,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix b/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix index 6a51e5ea62f..f808b6985b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - buildInputs = [ makeWrapper jre_headless util-linux ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ] ++ optional enableUnfree zlib; installPhase = '' @@ -72,7 +73,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/infra/libkookie/nixpkgs/pkgs/servers/search/solr/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/search/solr/default.nix index 2b22c38143c..479a7616ae1 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/search/solr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/search/solr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ domenkozar aanderse ]; + maintainers = with maintainers; [ aanderse ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/infra/libkookie/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index d9a3332e021..ae0ae2e3eea 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.10"; + version = "0.23.11"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-EkExTDU7T7FYZrDtF0AF8wjn9fp8y9SLmINYGv8zvXk="; + sha256 = "sha256-1VUW8WBNlGSL9JpKhpYfAgCFp3ZGYgWFXTehOAueuZI="; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sql/dolt/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/sql/dolt/default.nix index 6f6b5c39074..20608f796fc 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.22.12"; + version = "0.22.13"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-SYgBy2WGP6ssMDohnbflnd2XpF8iwmxoTTlHQYc1+Wo="; + sha256 = "sha256-9/fpdxD3xj2hCId9koNhZLgA8SeucTue2iC/4Ues7bM="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-Q87cGO82EmehpuMR3SCW9oF8DtaGURp4coLec4Rv2Js="; + vendorSha256 = "sha256-dDJDiCWG4+YZzTsEbhv4KzuwrkBGYUxJzknBbrWGiCE="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 80033e406ee..0cf704d5f2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.39.11"; + version = "11.39.13"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "1b70r4b5m0r0xpy7i76xx0xsmwagsjdcp5j6nqfjcyn1m65ydzvs"; + sha256 = "sha256-e30Vykwk6U83/0pS3OWPJ2Oq2SAtNc1S6c1ZO42k39c="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sql/patroni/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/sql/patroni/default.nix index 8da0213a2aa..e02d386126a 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sql/patroni/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IlRltJrEMrRiwVVMYQywb0MqwEoL8MX3do2GlHXjuPc="; + sha256 = "048g211njwmgl2v7nx6x5x82b4bbp35n234z7ah10aybm3yrxnc7"; }; # cdiff renamed to ydiff; remove when patroni source reflects this. diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 27345616f89..3dd811b51fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -35,12 +35,12 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl libxml2 makeWrapper ] + [ zlib readline openssl libxml2 ] ++ lib.optionals icuEnabled [ icu ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - nativeBuildInputs = lib.optionals icuEnabled [ pkg-config ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals icuEnabled [ pkg-config ]; enableParallelBuilding = !stdenv.isDarwin; @@ -192,54 +192,54 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.24"; + version = "9.5.25"; psqlSchema = "9.5"; - sha256 = "0an2k4m1da96897hyxlff8p4p63wg4dffwsfg57aib7mp4yzsp06"; + sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n"; this = self.postgresql_9_5; thisAttr = "postgresql_9_5"; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.20"; + version = "9.6.21"; psqlSchema = "9.6"; - sha256 = "1dkv916y7vrfbygrfbfvs6y3fxaysnh32i5j88nvcnnl16jcn21x"; + sha256 = "0d0ngpadf1i7c0i2psaxcbmiwx8334ibcsn283n9fp4853pyl3wk"; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.15"; + version = "10.16"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0zhzj9skag1pgqas2rnd217vj41ilaalqna17j47gyngpvhbqmjr"; + sha256 = "1cvv8qw0gkkczqhiwx6ns7w88dwkvdz4cvb2d4ff14363f5p2p53"; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.10"; + version = "11.11"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "16bqp6ds37kbwqx7mk5gg3y6gv59wq6xz33iqwxldzk20vwd5rhk"; + sha256 = "0v0qk298nxmpzpgsxcsxma328hdkyzd7fwjs0zsn6zavl5zpnq20"; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.5"; + version = "12.6"; psqlSchema = "12"; - sha256 = "15gzg778da23sbfmy7sqg443f9ny480301lm7i3vay4m3ls2a3dx"; + sha256 = "028asz92mi3706zabfs8w9z03mzyx62d1l71qy9zdwfabj6xjzfz"; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.1"; + version = "13.2"; psqlSchema = "13"; - sha256 = "07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j"; + sha256 = "1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz"; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index d6df5e4ba0d..8f922baea66 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mYFItrFC0BeRwLfZA1SAV+4rvrNrx75lTWS7w2ZDHag="; + sha256 = "sha256-TbQanXNdomEjp11izowy4763NsQWUe5rLxoEmuHKFn0="; }; buildInputs = [ postgresql ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index d10907805aa..69e140058f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.0.1"; + version = "2.1.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "105zc5m3zvnrqr8409qdbycb4yp7znxmna76ri1m2djkdp5rh4q1"; + sha256 = "03bsvf5iwgiwxq4p1pxri795n3qm70gvd1sz9p0dxixxsjl34vxf"; }; # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream diff --git a/infra/libkookie/nixpkgs/pkgs/servers/swego/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/swego/default.nix index 91b0995466a..184c54ba9ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/swego/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/swego/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "swego"; - version = "0.9"; + version = "0.92"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-Wt+2spZfgBWzZEQP+SiDYI5DdLKrwFMgYT1ukbF4x0I="; + sha256 = "sha256-SiB0Z6Eqbn/6VGDTt5bQtgcT4V4AjRIIYYk98EW7ss4="; }; vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/tailscale/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/tailscale/default.nix index eb47593c596..32c5a23a9a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-zrKkBbsvIqJkPysKx3nJ3EIbePWMZCX9eegekAoqMqk="; + sha256 = "sha256-PMBlvres95UIbd3uqZWPE3OzyrEAGEXit/Z7X1p46GY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/teleport/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/teleport/default.nix index 100b021d9ce..8650ff108eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/teleport/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/teleport/default.nix @@ -41,21 +41,29 @@ buildGoPackage rec { popd ''; - dontStrip = true; + # Reduce closure size for client machines + outputs = [ "out" "client" ]; + + buildTargets = [ "full" ]; + + postInstall = '' + install -Dm755 -t $client/bin $out/bin/tsh + ''; doInstallCheck = true; installCheckPhase = '' $out/bin/tsh version | grep ${version} > /dev/null + $client/bin/tsh version | grep ${version} > /dev/null $out/bin/tctl version | grep ${version} > /dev/null $out/bin/teleport version | grep ${version} > /dev/null ''; - meta = { + meta = with lib; { description = "A SSH CA management suite"; homepage = "https://gravitational.com/teleport/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sigma tomberek ]; - platforms = lib.platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ sigma tomberek freezeboy ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/traefik/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/traefik/default.nix index d0125278176..e8282ec4c0b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/traefik/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.2"; + version = "2.4.3"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-W6NtlIxeRg432RTiaJHu25Izv1VWNqYetzilCr2gPjU="; + sha256 = "sha256-lCUwzd+ECi2g5jv6ksxrlDdx7cjLgBnaBdYbgzADkcg="; stripRoot = false; }; - vendorSha256 = "sha256-kwA0MtmlUEO1eQFr4NpdsMikEFQc3N3Meolw/xw9dgM="; + vendorSha256 = "sha256-kCRXDEuaxFVZuP7PkmZIiXjhMUWjMYbOOtWl4V81DeI="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/ums/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/ums/default.nix index 61bb815892a..3d4e4fdf51d 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/ums/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/ums/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' cp -a . $out/ diff --git a/infra/libkookie/nixpkgs/pkgs/servers/uwsgi/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/uwsgi/default.nix index bd74a628877..ddfa6faf243 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -5,7 +5,7 @@ , systemd, withSystemd ? stdenv.isLinux , libcap, withCap ? stdenv.isLinux , python2, python3, ncurses -, ruby, php, libmysqlclient +, ruby, php }: let php-embed = php.override { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/varnish/dynamic.nix b/infra/libkookie/nixpkgs/pkgs/servers/varnish/dynamic.nix index 20f8aa91ab6..6ad8288871b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/varnish/dynamic.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; - nativeBuildInputs = [ pkg-config docutils autoreconfHook varnish.python ]; + nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ]; buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix index 4b33048e923..719fab87ead 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -1,19 +1,21 @@ -{ pkgs, lib, stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.4289"; + version = "1.0.4628"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "0hs6hjcb0cxmakx2na3xkz9bld0xcil5slp4wjl5xql3s00mk10v"; + sha256 = "1kw4byy6mvqk3qd5nk5raka1bl9jp0kniszq6j5kc8nz3jql4qdz"; }; dontBuild = true; installPhase = '' + runHook preInstall mkdir $out mv * $out/ + runHook postInstall ''; passthru.tests = { diff --git a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix index 05741e0ac21..3ff42050eb2 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; buildInputs = [ qtbase libvirt cutelyst grantlee ]; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/lib cp src/libVirtlyst.so $out/lib diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xandikos/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xandikos/default.nix index 5241139cfa3..60480b3ac2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/xandikos/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "1x0bylmdizirvlcn6ryd43lffpmlq0cklj3jz956scmxgq4p6wby"; + sha256 = "sha256-/pr8ZqgYk24CdJNAETCDF4ZtufXkVEu1Zw25PcPEo7M="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix index 762154f018c..74d8d9ae520 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkg-config, udns, pandoc, coreutils } : + libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } : stdenv.mkDerivation rec { pname = "biboumi"; - version = "8.5"; + version = "9.0"; src = fetchurl { url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; - sha256 = "0rn9p99iqdyvxjzjq9w0ra7pkk0mngjy65nlg3hqfdw8kq9mv5qf"; + sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; }; louiz_catch = fetchgit { @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { patches = [ ./catch.patch ]; - nativeBuildInputs = [ cmake pkg-config pandoc ]; + nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; + buildFlags = [ "all" "man" ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix index 5336df42cbe..69b55a6f3c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; }; - nativeBuildInputs = [ fakegit ]; + nativeBuildInputs = [ fakegit makeWrapper ]; - buildInputs = [ erlang openssl expat libyaml gd makeWrapper ] + buildInputs = [ erlang openssl expat libyaml gd ] ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index cfa6e226955..a83da568126 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.11.7"; # also update communityModules + version = "0.11.8"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "0iw73ids6lv09pg2fn0cxsm2pvi593md71xk48zbcp28advc1zr8"; + sha256 = "1y38a33wab2vv9pz04blmn6m66wg4pixilh8x60jsx6mk0xih3w3"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "7678b4880719"; - sha256 = "1rpk3jcfhsa9hl7d7y638kprs9in0ljjp1nqxg30w1689v5h85d2"; + rev = "f210f242cf17"; + sha256 = "0ls45zfhhv8k1aywq3fvrh4ab7g4g1z1ma9mbcf2ch73m6aqhbyl"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix deleted file mode 100644 index ebb817f1645..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : - -stdenv.mkDerivation rec { - pname = "pyIRCt"; - version = "0.4"; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz"; - sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb"; - }; - - buildInputs = [ pythonPackages.wrapPython ]; - - pythonPath = [ - xmpppy pythonIRClib - ]; - - # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; - - installPhase = '' - mkdir -p $out/bin $out/share/${pname}-${version} - sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py - sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/${pname}-${version} - cat > $out/bin/pyIRCt < $out/bin/pyMAILt <| "$NIX_BUILD_TOP/env-vars" || true + export 2>/dev/null >| "$NIX_BUILD_TOP/env-vars" || true fi } diff --git a/infra/libkookie/nixpkgs/pkgs/test/patch-shebangs/default.nix b/infra/libkookie/nixpkgs/pkgs/test/patch-shebangs/default.nix index 5e1d859c138..5c49787eee3 100644 --- a/infra/libkookie/nixpkgs/pkgs/test/patch-shebangs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/test/patch-shebangs/default.nix @@ -1,26 +1,70 @@ { lib, stdenv, runCommand }: let - bad-shebang = stdenv.mkDerivation { - name = "bad-shebang"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - echo "#!/bin/sh" > $out/bin/test - echo "echo -n hello" >> $out/bin/test - chmod +x $out/bin/test - ''; + tests = { + bad-shebang = stdenv.mkDerivation { + name = "bad-shebang"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/bin/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep -v '^#!/bin/sh' $out/bin/test > /dev/null"; + }; + }; + + ignores-nix-store = stdenv.mkDerivation { + name = "ignores-nix-store"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!$NIX_STORE/path/to/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep \"^#!$NIX_STORE/path/to/sh\" $out/bin/test > /dev/null"; + }; + }; }; in runCommand "patch-shebangs-test" { - passthru = { inherit bad-shebang; }; + passthru = { inherit (tests) bad-shebang ignores-nix-store; }; meta.platforms = lib.platforms.all; } '' - printf "checking whether patchShebangs works properly... ">&2 - if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then - echo "yes" >&2 - touch $out - else - echo "no" >&2 + validate() { + local name=$1 + local testout=$2 + local assertion=$3 + + echo -n "... $name: " >&2 + + local rc=0 + (out=$testout eval "$assertion") || rc=1 + + if [ "$rc" -eq 0 ]; then + echo "yes" >&2 + else + echo "no" >&2 + fi + + return "$rc" + } + + echo "checking whether patchShebangs works properly... ">&2 + + fail= + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' + validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1 + '') tests)} + + if [ "$fail" ]; then + echo "failed" exit 1 + else + echo "succeeded" + touch $out fi '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix index b92344bf9c4..022111e4b31 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/nx-libs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "NX X server based on Xnest"; homepage = "https://github.com/ArcticaProject/nx-libs"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/run-scaled/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/run-scaled/default.nix index bae91bbc464..012eedf0779 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/run-scaled/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/run-scaled/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/setroot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/setroot/default.nix index e5a461b0e0e..014ac4c54be 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/setroot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/setroot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 ] ++ lib.optional enableXinerama libXinerama; - buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix index ec40e0b06db..bdade93329b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xbindkeys-config/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "xbindkeys-config"; version = "0.1.3"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ gtk ]; src = fetchurl { url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix index 6d0c46e52e9..207c052686f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; - buildInputs = [ libxslt docbook_xsl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxslt docbook_xsl ]; preFixup = '' # fallback values need to be last diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index 08fa4f15562..82aee8f818b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, rustPlatform, fetchFromGitLab, python3 -, xlibsWrapper, xorg, libpulseaudio, pkg-config, patchelf, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitLab +, python3 +, xlibsWrapper +, xorg +, libpulseaudio +, pkg-config +, patchelf +, Security +}: rustPlatform.buildRustPackage rec { pname = "xidlehook"; - version = "0.9.1"; + version = "0.10.0"; doCheck = false; @@ -12,11 +22,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "00j2iwp25hz9jlr45qszyipljqdnh7h3ni9bkd2lmk58kkvmhf1s"; + sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb"; }; - cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "050ihjhg33223x6pgvhqrjprx1clkj2x3jr6acf716vbwm3m0bmz"; + cargoBuildFlags = lib.optionals (!stdenv.isLinux) [ "--no-default-features" "--features" "pulse" ]; + cargoSha256 = "1r2xir0x04056kq7j13cpk8984kjrgxbixlacp6vz79yq9c8pv7k"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config patchelf python3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix index 65426a049fe..e2f15d969ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xkb-switch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xkb-switch"; - version = "1.6.0"; + version = "1.8.5"; src = fetchFromGitHub { owner = "ierton"; repo = "xkb-switch"; rev = version; - sha256 = "11yn0y1kx04rqxh0d81b5q7kbyz58pi48bl7hyhlv7p8yndkfg4b"; + sha256 = "sha256-DZAIL6+D+Hgs+fkJwRaQb9BHrEjAkxiqhOZyrR+Mpuk="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py b/infra/libkookie/nixpkgs/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py new file mode 100644 index 00000000000..697ad87a1b7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +import re +from xkeysnail.transform import * + +aa = False +def a_setvar(v): + def _setvar(): + transform._mark_set = False + global aa; aa = v + return _setvar +def a_ifvar(): + def _ifvar(): + transform._mark_set = False + global aa + if aa: + aa = False + return K("esc") + return K("enter") + return _ifvar +def a_flipmark(): + def _flipmark(): + transform._mark_set = not transform._mark_set; + return _flipmark + +define_keymap(re.compile("Google-chrome|Chromium-browser|Firefox"), { + K("C-b"): with_mark(K("left")), + K("C-f"): with_mark(K("right")), + K("C-p"): with_mark(K("up")), + K("C-n"): with_mark(K("down")), + K("M-b"): with_mark(K("C-left")), + K("M-f"): with_mark(K("C-right")), + K("C-a"): with_mark(K("home")), + K("C-e"): with_mark(K("end")), + + K("C-w"): [K("C-x"), set_mark(False)], + K("M-w"): [K("C-c"), K("right"), set_mark(False)], + K("C-y"): [K("C-v"), set_mark(False)], + K("C-k"): [K("Shift-end"), K("C-x"), set_mark(False)], + K("C-d"): [K("delete"), set_mark(False)], + K("M-d"): [K("C-delete"), set_mark(False)], + K("M-backspace"): [K("C-backspace"), set_mark(False)], + + K("C-slash"): [K("C-z"), set_mark(False)], + K("C-space"): a_flipmark(), + K("C-M-space"): with_or_set_mark(K("C-right")), + + # K("C-s"): K("F3"), + # K("C-r"): K("Shift-F3"), + # K("C-g"): [K("esc"), set_mark(False)] + + K("C-s"): [K("F3"), a_setvar(True)], + K("C-r"): [K("Shift-F3"), a_setvar(True)], + K("C-g"): [K("esc"), a_setvar(False)], + K("enter"): a_ifvar() +}) diff --git a/infra/libkookie/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix new file mode 100644 index 00000000000..fa52a714c7a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "xkeysnail"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mooz"; + repo = pname; + rev = "bf3c93b4fe6efd42893db4e6588e5ef1c4909cfb"; + sha256 = "0plcpb4ndzfsd5hj32m0g32swnhyph9sd759cdhhzmjvlq3j8q6p"; + }; + + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = with python3Packages; [ + evdev + xlib + inotify-simple + appdirs + ]; + + doCheck = false; + + postInstall = '' + mkdir -p $out/share + cp ./example/config.py $out/share/example.py + cp ${./browser-emacs-bindings.py} $out/share/browser.py + + makeWrapper $out/bin/xkeysnail $out/bin/xkeysnail-example \ + --add-flags "-q" --add-flags "$out/share/example.py" + makeWrapper $out/bin/xkeysnail $out/bin/xkeysnail-browser \ + --add-flags "-q" --add-flags "$out/share/browser.py" + ''; + + meta = with lib; { + description = "Yet another keyboard remapping tool for X environment"; + homepage = "https://github.com/mooz/xkeysnail"; + platforms = platforms.linux; + license = licenses.gpl1Only; + maintainers = with maintainers; [ bb2020 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 30d74c14ce5..e661af0f949 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecr-credential-helper"; - version = "0.4.0"; + version = "0.5.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "1whwxjzlyzyvrf2mzbd7my2kdz5fdbr79g18g9h4xrg8xyzk1k5q"; + sha256 = "sha256-GmGse+N7QeG2sAjCumGkUAWu/KfhnMltzeh+s8o+tiw="; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix index a9a49beda2f..9330291014d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.36"; + version = "0.0.37"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 @@ -28,7 +28,7 @@ buildPythonApplication rec { owner = "cevoaustralia"; repo = "aws-google-auth"; rev = version; - sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7"; + sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd"; }; propagatedBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix index 12f63e627e6..53855b6d28d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, pkgs , boto3 }: diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index d55b90f3b84..13860b4bf7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "aws-vault"; version = "6.2.0"; @@ -12,6 +12,16 @@ buildGoModule rec { vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd aws-vault \ + --bash $src/contrib/completions/bash/aws-vault.bash \ + --fish $src/contrib/completions/fish/aws-vault.fish \ + --zsh $src/contrib/completions/zsh/aws-vault.zsh + ''; + + doCheck = false; subPackages = [ "." ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix index 2360ef20e1f..264eb7b09c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -4,7 +4,6 @@ , groff , less }: - let py = python3.override { packageOverrides = self: super: { @@ -26,17 +25,20 @@ let }; }; -in with py.pkgs; buildPythonApplication rec { +in +with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too + version = "1.19.20"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY="; + sha256 = "sha256-Fu+KuGOGDUMXgwUKabZjaCBQHdlLLBwPJXU4rlohKNs="; }; + # https://github.com/aws/aws-cli/issues/4837 postPatch = '' - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" + substituteInPlace setup.py \ + --replace "docutils>=0.10,<0.16" "docutils>=0.10" ''; # No tests included diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/awslogs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/awslogs/default.nix index 3e2cf150557..d9fd55f32c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/awslogs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/awslogs/default.nix @@ -2,19 +2,23 @@ python3Packages.buildPythonApplication rec { pname = "awslogs"; - version = "0.11.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; rev = version; - sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc"; + sha256 = "1gyry8b64psvmjcb2lb3yilpa7b17yllga06svls4hi69arvrd8f"; }; - doCheck = false; - propagatedBuildInputs = with python3Packages; [ - boto3 termcolor dateutil docutils setuptools + boto3 termcolor dateutil docutils setuptools jmespath + ]; + + checkInputs = [ python3Packages.pytestCheckHook ]; + disabledTests = [ + "test_main_get_query" + "test_main_get_with_color" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/clair/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/clair/default.nix index cbe6e3eed1f..9460144998e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "10kgg2i5yzdfhylrdkmh8rsc4cgdnhcgfa8fa4dm8m3licjciwam"; + sha256 = "sha256-uGvcr7TG/NCi0YoYZnQU11zOxXDhFTnCmLQVxOqmXLY="; }; - vendorSha256 = "1l3b86f5xmyc6lskvb4ab30adcgzb69ayccc0wcz2f28sda3i80r"; + vendorSha256 = "sha256-CO4U8uSQeHXLPj5PH/SsOI/LjT2Rs/mBHsvNTudx72I="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index 7fb128caa19..48851c3784b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "docker-credential-gcr"; - version = "2.0.2"; + version = "2.0.4"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "0m7jx669yf27z2g9gw9vwncpwldrcb3ldlf1xhvbwbijnc2jk866"; + sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ="; }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 0db88659575..6e1da0b591e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.37.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-1IhCBDMfGW9hDvQoGSJKJ1ZlShzVeIGjVOfiUspHRBw="; + sha256 = "sha256-mq1/e9FW0jP6dY6zCBlPz5dBidKLS6IROBKESfHDvPI="; }; - vendorSha256 = "sha256-fa8IrJhsy5cBzBs4tGIx7ykJcXjdvLqms3Dk97P4Vik="; + vendorSha256 = "sha256-ANOeU3cFSwLcpdbpApM+j4r296ZGj/tuDV8oiMA7kMo="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/gixy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/gixy/default.nix index 118457d4080..06656a9e033 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/gixy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/gixy/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python3 }: -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gixy"; version = "0.1.20"; # package is only compatible with python 2.7 and 3.5+ - disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); + disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27); # fetching from GitHub because the PyPi source is missing the tests src = fetchFromGitHub { @@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec { sed -ie '/argparse/d' setup.py ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ cached-property ConfigArgParse pyparsing diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch b/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch new file mode 100644 index 00000000000..aec4be2ec19 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch @@ -0,0 +1,36 @@ +diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/api_lib/sql/instances.py +index 0d88ffe..814a436 100644 +--- a/lib/googlecloudsdk/api_lib/sql/instances.py ++++ b/lib/googlecloudsdk/api_lib/sql/instances.py +@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone): + def _GetCloudSqlProxyPath(): + """Determines the path to the cloud_sql_proxy binary.""" + sdk_bin_path = config.Paths().sdk_bin_path +- if not sdk_bin_path: +- # Check if cloud_sql_proxy is located on the PATH. +- proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy') +- if proxy_path: +- log.debug( +- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) +- return proxy_path +- else: +- raise exceptions.ToolException( +- 'A Cloud SQL Proxy SDK root could not be found. Please check your ' +- 'installation.') +- return os.path.join(sdk_bin_path, 'cloud_sql_proxy') ++ if sdk_bin_path and os.path.isfile(os.path.join(sdk_bin_path, 'cloud_sql_proxy')): ++ return os.path.join(sdk_bin_path, 'cloud_sql_proxy') ++ ++ # Check if cloud_sql_proxy is located on the PATH. ++ proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy') ++ if proxy_path: ++ log.debug( ++ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) ++ return proxy_path ++ ++ raise exceptions.ToolException( ++ 'A Cloud SQL Proxy SDK root could not be found. Please check your ' ++ 'installation.') + + + def _RaiseProxyError(error_msg=None): diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 36af063c448..1d585514f7e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,31 +21,37 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "09pv1xvycgfai151z6kbsggyldcd3cx6x1p04dcim2xrawqvng6s"; + sha256 = "sha256-aHFwcynt4xQ0T1J+OTSxgttU9W3VFJAqCwmQSdVg8Fk="; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1iybbvxjny33mw3h2f81fdvsvp65xa62c2qrzjv8hkrqkw69ckrp"; + sha256 = "sha256-MfldToK7ZfdWZiZnI1qKI1o/dSiUcysxzUkTYMVZ5u4="; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "325.0.0"; + version = "328.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); - buildInputs = [ python makeWrapper ]; + buildInputs = [ python ]; - nativeBuildInputs = [ jq ]; + nativeBuildInputs = [ jq makeWrapper ]; patches = [ + # For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected ./gcloud-path.patch + # Disable checking for updates for the package ./gsutil-disable-updates.patch + # Try to use cloud_sql_proxy from SDK only if it actually exists, otherwise, search for one in PATH + ./cloud_sql_proxy_path.patch ]; installPhase = '' + runHook preInstall + mkdir -p $out/google-cloud-sdk cp -R * .install $out/google-cloud-sdk/ @@ -91,6 +97,8 @@ in stdenv.mkDerivation rec { jq -c . $path > $path.min mv $path.min $path done + + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/mycli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/mycli/default.nix index 47c9aa7f5f8..ca845cce145 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/mycli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/mycli/default.nix @@ -7,19 +7,21 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.23.2"; + version = "1.24.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-auGbFAvwLR7aDChhgeNZPZPNGJo+b9Q4TFDaOrmU2zI="; + sha256 = "sha256-dI2Yvj2llI9TlMFbs35ijYeFuGqoTovZyRh+ILhNMmY="; }; propagatedBuildInputs = [ cli-helpers click configobj + importlib-resources paramiko prompt_toolkit + pyaes pycrypto pygments pymysql @@ -39,7 +41,8 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" + --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" \ + --replace "importlib_resources >= 5.0.0" "importlib_resources" ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/netplan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/netplan/default.nix new file mode 100644 index 00000000000..b9dc2c07073 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/netplan/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, glib +, pandoc +, systemd +, libyaml +, python3 +, libuuid +, bash-completion +, lib +}: + +stdenv.mkDerivation rec { + pname = "netplan"; + version = "0.101"; + + src = fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "netplan"; + rev = version; + hash = "sha256-bCK7J2pCQUwjZu8c1n6jhF6T/gvUGwydqAXpxUMLgMc="; + fetchSubmodules = false; + }; + + nativeBuildInputs = [ + pkg-config + glib + pandoc + ]; + + buildInputs = [ + systemd + glib + libyaml + (python3.withPackages (p: with p; [ pyyaml netifaces ])) + libuuid + bash-completion + ]; + + postPatch = '' + substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate" + substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" + + substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ + --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ + --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + ''; + + makeFlags = [ + "PREFIX=" + "DESTDIR=$(out)" + "SYSTEMD_GENERATOR_DIR=lib/systemd/system-generators/" + "SYSTEMD_UNIT_DIR=lib/systemd/units/" + "BASH_COMPLETIONS_DIR=share/bash-completion/completions" + ]; + + meta = with lib; { + description = "Backend-agnostic network configuration in YAML"; + homepage = "https://netplan.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 0498b56dcf5..6d8a068d48b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.19.0"; + version = "2.21.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz"; - sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-linux-x64.tar.gz"; + sha256 = "1zspkrfrrgkk8yhsa8lccky9as1v0nmz7wqxkfnx707nc986w5a3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; - sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-linux-amd64.tar.gz"; + sha256 = "0yzz24fhkd1ij3gvsgi48czpm30lwbzdswsfir1mdq0a6wwhll4w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz"; - sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-linux-amd64.tar.gz"; + sha256 = "1ml980mxhah193k4w75nvh7yzlc0j4k1sm9f51pvihxzmq5hjzgz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; - sha256 = "18gyan0dszfvx8fhvi8r2msbf8n9lbh10pnvcaqvdk8cr79lnzl9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-linux-amd64.tar.gz"; + sha256 = "12f6knxnpkdh00w0s9a9fqk934n5ry7k473sk42gz024j253pq8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-linux-amd64.tar.gz"; - sha256 = "05nmdjgwhm1pi5zljq33812wgkz1rpisjrvdn8lcsapwz3fchbjd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.8.1-linux-amd64.tar.gz"; + sha256 = "1g1rbvi3yizxs007hp0zgfysbam20gfg4xkc69gpwishy0j0m14q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-linux-amd64.tar.gz"; - sha256 = "12wjh0w7i1f6rd5r4pqc98ix4mkrkqwnvpv7hkcsn90rsxrlfysk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.16.1-linux-amd64.tar.gz"; + sha256 = "1v4zf3z6vcz074yay97kczh5dv9ii5mmkas57j6jqgpfm1lqymil"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-linux-amd64.tar.gz"; - sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.5.1-linux-amd64.tar.gz"; + sha256 = "02angr4bimgir42n0jdf69005fzkikknfvyxgdh8kpr555lbb17a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz"; - sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.8.1-linux-amd64.tar.gz"; + sha256 = "13987spi37vb7b6cd12axyvc2r2lvy1if1lwssxxj7jl95bss1d9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz"; - sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.12.0-linux-amd64.tar.gz"; + sha256 = "0srdmga79r2jh3mv4vcb0gnhmkky666v902vd20bbr1r2fmi8wji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz"; - sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.2.0-linux-amd64.tar.gz"; + sha256 = "07qg1vmbmjc6shz2nw37vcrccd7m6ghb0h9zjp0gvzks1b2fz32i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz"; - sha256 = "10d5gmhax02906jpr9nmb80xfxvy2ym8vjyj31sz2mcl9jnadk4z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.7.0-linux-amd64.tar.gz"; + sha256 = "19d83ydqh6fi7rl3j1gkmrnnbkijw4pj4rvkk1w3s842jsiqxlr9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-linux-amd64.tar.gz"; - sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.6.2-linux-amd64.tar.gz"; + sha256 = "01kyqw5x2jv0il8w4mg0man2dzikghdz4kirk3nabkm6fwncngk1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz"; - sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.2-linux-amd64.tar.gz"; + sha256 = "01jcilqw1z7klk8xa0z3c5rh6fi5c2xxr6sqw9qmmwgh1ncpdmhi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; - sha256 = "1c39fk37kx093n0ldk8szblgcx0hviyyd7mxzp7nb97s4rvmf48l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.4.1-linux-amd64.tar.gz"; + sha256 = "1ayjs4s6zv5lsr74y1zjicngqj111hp8zb5gmlr4x2qs5cxnz02n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-linux-amd64.tar.gz"; - sha256 = "0c2aypx8y6s892y2gygc8116rlarlcw1s2m39gkcdjjbfkmf8za0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.4.1-linux-amd64.tar.gz"; + sha256 = "11l6xsn42dr2mx8ayimdc19gn2vsiwq3h1qd716y9snnzkrsiyw7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-linux-amd64.tar.gz"; - sha256 = "0iqimhqh853jx6zd53z1r98ky0qhxfby9w519xpdlvxxq5aqb6kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.15.0-linux-amd64.tar.gz"; + sha256 = "1xraydxazx620y4m54qwjacmf5vs6x5ci9jymj52vrpd5c4lpw5p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-linux-amd64.tar.gz"; - sha256 = "1rh14rngpcbqly5i3cgwfgi90drkg6fa0gkgpfa7f9mkm4wpgla8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.7.2-linux-amd64.tar.gz"; + sha256 = "1lx4yk7wcnbn419zqjyp2aw81q5bg5dqjy74ghbc74qhbbxjz6q0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-linux-amd64.tar.gz"; - sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.3-linux-amd64.tar.gz"; + sha256 = "0par5cpp787iwxy1dbv9kw946bnvgd4qnzrh0hc4y6468w9k3kbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz"; - sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.4.1-linux-amd64.tar.gz"; + sha256 = "0w8l0py337msdh0w9czbydznchl1h22pkzp2yrj6lx1p9vl4qbmq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; - sha256 = "0lyvpfmjsjxpwq1b74j2jipp36n7zczlxgy0pr6j7c027d26sym6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-linux-amd64.tar.gz"; + sha256 = "1clhdj8jlmhfykirdfp8lkg9grhyyamjimxcy2mxshm6mwlaajcm"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz"; - sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-darwin-x64.tar.gz"; + sha256 = "0wijdxlhinjmn2rf7k02iwg1i14xd1v3cxvxssik56yk0mhkm42b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; - sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-darwin-amd64.tar.gz"; + sha256 = "00d66lmsd9ph7dpyrsdini8phlc197ssinfnkl3cj3j5v6hnzah1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz"; - sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-darwin-amd64.tar.gz"; + sha256 = "1p3rp2fq7lfqj03w1y8p21arvrvbbdwcd1nxnnqjnjwq3ahfvwnm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; - sha256 = "0dqyd8aywmxrsvipndwrwq5pxv7avzf8kpk6rdyip4j8hp156lbz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-darwin-amd64.tar.gz"; + sha256 = "0scx1vwpfan98cx6n2k06bph9xlpc41viirs34lf4mqdm2c2m3k5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-darwin-amd64.tar.gz"; - sha256 = "0xbbaphd0lypyzq262rapr42lmyz3wr14xab09qc156rjasr8w64"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.8.1-darwin-amd64.tar.gz"; + sha256 = "1nzrqm3rbqdl4q12ln87p78hfpnmbliavavhbqn3jr2kchfgy9j1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-darwin-amd64.tar.gz"; - sha256 = "10izly9m7847rsb533ch3n8rkhbfb3q6lcx80dk5ia8bfdlvc3cn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.16.1-darwin-amd64.tar.gz"; + sha256 = "0y3qadiyqa5krknkabfy60gjd7kmqjx8w72w8jrv5821bmxs3kzm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.5.1-darwin-amd64.tar.gz"; + sha256 = "1ksv79cglb6fifx4mrjk32lh25hq2n8yigphsk54lppvhvp9ynyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz"; - sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.8.1-darwin-amd64.tar.gz"; + sha256 = "1i1kf0mj8pagcm1q2sjlfqc42qv9pgchq8a8qxs1xllxcv2nqp96"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz"; - sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.12.0-darwin-amd64.tar.gz"; + sha256 = "1m02w4szp3dq9klwvi26fdxxdr3pqw77afcxarfxc92dhdq8rp2g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz"; - sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "128j5vrvgqzvn2cfdvnw89328fydahaj3i4pmbpk2swgqmn0kac8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "0xfkdmnax10zkgpipxaxfi0lgfgijnvssbwmfsaxxisdxscw2ig9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "1f9scgzzlcq6inl1z9b0xvcd9prr6w8acr20mnki5j1fn0m67sa5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-darwin-amd64.tar.gz"; - sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.6.2-darwin-amd64.tar.gz"; + sha256 = "099paln0sh7kp8393k264zz0bvrv2p7k7rywgj9ym9dncqq9za2r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz"; - sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.2-darwin-amd64.tar.gz"; + sha256 = "0afy6aphq14i7ww3a35ybzhwqwlxaybbxbhsa6w63hv3s4fw7wpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; - sha256 = "19v60l2djvigf60zacchfr98kfb8wxk1rmhdswyhhhz41jh30qhl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.4.1-darwin-amd64.tar.gz"; + sha256 = "1nngzlvx06kphxayqkyn0xrh22dv2pcpb9b0gvlicancbn01ql5w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-darwin-amd64.tar.gz"; - sha256 = "15w72087frbx6wyngi20bsssnr7si1bk1h94jav3d4cgm6nhpnwk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.4.1-darwin-amd64.tar.gz"; + sha256 = "041ml1yx7wk4whq6gfsb1zc49kkdws06dqpr5i910ln5avnhslvq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "05hap76yzss5bsgr20rm8sxb6r3iiwvq75lhf11laaxq2hnb7qdp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.15.0-darwin-amd64.tar.gz"; + sha256 = "13sy891ff4y53yw7h0p3cynycrxd8hq5pfmdnl7332ll7kls37p3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-darwin-amd64.tar.gz"; - sha256 = "033262l7yylw9y8ifrag2fsdpfvqjmmrxmmhksvysjmz9slb60kg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.7.2-darwin-amd64.tar.gz"; + sha256 = "0c83zdnx12g2dmvi98v7w3739x91d9lhqx5j6cvq8c24y7lxga78"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-darwin-amd64.tar.gz"; - sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.3-darwin-amd64.tar.gz"; + sha256 = "1b4y5apgkd2k9yfx3f7p0vs5l0gqhgccbszgnzqq465i0970b6r7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.4.1-darwin-amd64.tar.gz"; + sha256 = "1q00jmjprhnxgvjc4a50jdgd90zj71ymfhkl1w1bkqlrva9spiws"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; - sha256 = "11c1d1jw0z4ybwvqfvmjcx3gkpwnvi5vcq01bc7a2wg374mkhj62"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-darwin-amd64.tar.gz"; + sha256 = "0wpqk93ns9z3yvpas9aix345jm38hffssnz1dn5cxl6y0d5scjd8"; } ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh index c1a0e631016..061f3b1438e 100755 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,31 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.19.0" +VERSION="2.21.2" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.5.2" - "aws=3.25.1" - "cloudflare=2.11.1" - "consul=2.7.0" - "datadog=2.15.0" - "digitalocean=3.3.0" - "docker=2.7.0" - "gcp=4.9.0" - "github=2.5.1" - "gitlab=3.5.0" - "hcloud=0.5.1" - "kubernetes=2.7.8" - "mailgun=2.3.2" - "mysql=2.3.3" - "openstack=2.11.0" + "auth0=1.8.1" + "aws=3.30.1" + "cloudflare=2.13.1" + "consul=2.8.1" + "datadog=2.16.1" + "digitalocean=3.5.1" + "docker=2.8.1" + "gcp=4.12.0" + "github=3.2.0" + "gitlab=3.7.0" + "hcloud=0.6.2" + "kubernetes=2.8.2" + "mailgun=2.4.1" + "mysql=2.4.1" + "openstack=2.15.0" "packet=3.2.2" - "postgresql=2.5.3" - "random=3.0.1" - "vault=3.3.0" - "vsphere=2.11.4" + "postgresql=2.7.2" + "random=3.0.3" + "vault=3.4.1" + "vsphere=2.12.2" ) function genMainSrc() { @@ -56,7 +56,8 @@ function genSrcs() { done } -cat < data.nix +{ + cat < data.nix pulumiPkgs = { x86_64-linux = [ EOF -genMainSrc "linux" >> data.nix -genSrcs "linux" >> data.nix -echo " ];" >> data.nix - -echo " x86_64-darwin = [" >> data.nix -genMainSrc "darwin" >> data.nix -genSrcs "darwin" >> data.nix -echo " ];" >> data.nix -echo " };" >> data.nix -echo "}" >> data.nix + genMainSrc "linux" + genSrcs "linux" + echo " ];" + echo " x86_64-darwin = [" + genMainSrc "darwin" + genSrcs "darwin" + echo " ];" + echo " };" + echo "}" +} > data.nix diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix index ad0cae6ecde..592f4cc7648 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3002.2"; + version = "3002.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "vW0pYhzo4JlBJ3fNOWrzVHSqESuwmZtdqAQ4fYcpAHU="; + sha256 = "1bqranhanxcxjc1qcc6cm95f4xxag0ic9g61dq352hqh6m1l1ay8"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix index b6ca3135f56..031bb316ca5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix @@ -2,22 +2,24 @@ , lib , fetchgit , requests +, distro , makeWrapper , extraHandlers ? [] }: buildPythonPackage rec { pname = "ssh-import-id"; - version = "5.8"; + version = "5.11"; src = fetchgit { url = "https://git.launchpad.net/ssh-import-id"; rev = version; - sha256 = "0l9gya1hyf2qfidlmvg2cgfils1fp9rn5r8sihwvx4qfsfp5yaak"; + sha256 = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI="; }; propagatedBuildInputs = [ requests + distro ] ++ extraHandlers; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/turbovnc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/turbovnc/default.nix new file mode 100644 index 00000000000..df45e6f10b8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/turbovnc/default.nix @@ -0,0 +1,111 @@ +{ lib +, stdenv +, fetchFromGitHub + +# Dependencies +, cmake +, libjpeg_turbo +, makeWrapper +, mesa # for built-in 3D software rendering using swrast +, openjdk # for the client with Java GUI +, openjdk_headless # for the server +, openssh +, openssl +, pam +, perl +, which +, xkbcomp +, xkeyboard_config +, xorg +}: + +stdenv.mkDerivation rec { + pname = "turbovnc"; + version = "2.2.5"; + + src = fetchFromGitHub { + owner = "TurboVNC"; + repo = "turbovnc"; + rev = version; + sha256 = "0r2lk5lza7a9h02g4z5j59d8qj0x1q1my665d1x1plny4g46vam0"; + }; + + # TODO: + # * Build outputs that are unclear: + # * `-- FONT_ENCODINGS_DIRECTORY = /var/empty/share/X11/fonts/encodings` + # Maybe relevant what the tigervnc and tightvnc derivations + # do with their `fontDirectories`? + # * `SERVER_MISC_CONFIG_PATH = /var/empty/lib64/xorg` + # * The thing about xorg `protocol.txt` + # * Does SSH support require `openssh` on PATH? + # * Add `enableClient ? true` flag that disables the client GUI + # so that the server can be built without openjdk dependency. + # * Perhaps allow to build the client on non-Linux platforms. + + nativeBuildInputs = [ + cmake + makeWrapper + openjdk_headless + ]; + + buildInputs = [ + libjpeg_turbo + openssl + pam + perl + ] ++ (with xorg; [ + libSM + libX11 + libXext + libXi + xorgproto + ]); + + cmakeFlags = [ + # For the 3D software rendering built into TurboVNC, pass the path + # to the swrast dri driver in Mesa. + # Can also be given at runtime to its `Xvnc` as: + # -dridir /nix/store/...-mesa-20.1.10-drivers/lib/dri/ + "-DDRI_DRIVER_PATH=${mesa.drivers}/lib/dri" + # The build system doesn't find these files automatically. + "-DTJPEG_JAR=${libjpeg_turbo.out}/share/java/turbojpeg.jar" + "-DTJPEG_JNILIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" + "-DXKB_BASE_DIRECTORY=${xkeyboard_config}/share/X11/xkb" + "-DXKB_BIN_DIRECTORY=${xkbcomp}/bin" + ]; + + postInstall = '' + # turbovnc dlopen()s libssl.so depending on the requested encryption. + wrapProgram $out/bin/Xvnc \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} + + # `twm` is the default window manager that `vncserver` tries to start, + # and it has minimal dependencies (no non-Xorg). + # (This default is written by `vncserver` to `~/.vnc/xstartup.turbovnc`, + # see https://github.com/TurboVNC/turbovnc/blob/ffdb57d9/unix/vncserver.in#L201.) + # It checks for it using `which twm`. + wrapProgram $out/bin/vncserver \ + --prefix PATH : ${lib.makeBinPath [ which xorg.twm ]} + + # Patch /usr/bin/perl + patchShebangs $out/bin/vncserver + + # vncserver needs `xauth` + wrapProgram $out/bin/vncserver \ + --prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])} + + # The viewer is in Java and requires `JAVA_HOME`. + # For SSH support, `ssh` is required on `PATH`. + wrapProgram $out/bin/vncviewer \ + --prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ + --prefix PATH : ${lib.makeBinPath [ openssh ]} + ''; + + meta = { + homepage = "https://turbovnc.org/"; + license = lib.licenses.gpl2Plus; + description = "High-speed version of VNC derived from TightVNC"; + maintainers = with lib.maintainers; [ nh2 ]; + platforms = with lib.platforms; linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix index 2322ad4d986..571798fcd2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix @@ -3,7 +3,7 @@ , libgcrypt, e2fsprogs, util-linux, libgpgerror }: let - version = "0.8.5"; + version = "0.8.6"; in stdenv.mkDerivation { pname = "fsarchiver"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "fdupoux"; repo = "fsarchiver"; rev = version; - sha256 = "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp"; + sha256 = "sha256-7AfCI4abcUijobEl6FO+5A/FRwxPkNko44u85WbTwuc="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/unar/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/unar/default.nix index d0d0ef90e68..4021bc92e06 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { postPatch = '' for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ - --replace "= gcc" "=cc" \ - --replace "= g++" "=c++" \ + --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \ + --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \ --replace "-DGNU_RUNTIME=1" "" \ --replace "-fgnu-runtime" "-fobjc-nonfragile-abi" done diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/unp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/unp/default.nix index 34f8cb1c40e..c63ec008d67 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/archivers/unp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/unp/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { pname = "unp"; version = "2.0-pre7"; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; src = fetchurl { # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/archivers/xtrt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/archivers/xtrt/default.nix new file mode 100644 index 00000000000..175494057e0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/archivers/xtrt/default.nix @@ -0,0 +1,36 @@ +{ bzip2, fetchFromGitHub, gzip, gnutar, lib, stdenv, unzip, xz }: + +stdenv.mkDerivation rec { + pname = "xtrt"; + version = "unstable-2021-02-17"; + + src = fetchFromGitHub { + owner = "figsoda"; + repo = pname; + rev = "61884fb7c48c7e1e2194afd82b85f415a6dc7c20"; + sha256 = "073l4q6mx5if791p5a6w8m8bz2aypmjmycaijq4spql8bh6h12vf"; + }; + + postPatch = '' + substituteInPlace xtrt \ + --replace "bzip2 " "${bzip2}/bin/bzip2 " \ + --replace "gzip " "${gzip}/bin/gzip " \ + --replace "tar " "${gnutar}/bin/tar " \ + --replace "unzip " "${unzip}/bin/unzip " \ + --replace "xz " "${xz}/bin/xz " + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp xtrt $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Tiny script to extract archives by their extensions"; + homepage = "https://github.com/figsoda/xtrt"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 1478aa8c1e3..df4211ad039 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.01.25"; + version = "2021.02.21"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1c2jx03ssm9yyv6rgr5wfv88ivfgdgq3889yaghjyvllm3nv9380"; + sha256 = "10fa2g8vsz0y7kb0wxnz857r2gd9b0b278j0a5ipjaa7cjd0gi1b"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/default.nix index d531b22738b..7fea4bd28d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -1,11 +1,10 @@ { stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll , pythonPackages, imagemagick, gobject-introspection, gst_all_1 , runtimeShell -, fetchpatch , unstableGitUpdater -# Attributes needed for tests of the external plugins -, callPackage, beets +# external plugins package set +, beetsExternalPlugins , enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null , enableAcousticbrainz ? true @@ -117,15 +116,6 @@ let doInstallCheck = false; }); - pluginArgs = externalTestArgs // { inherit pythonPackages; }; - - plugins = { - alternatives = callPackage ./plugins/alternatives.nix pluginArgs; - check = callPackage ./plugins/check.nix pluginArgs; - copyartifacts = callPackage ./plugins/copyartifacts.nix pluginArgs; - extrafiles = callPackage ./plugins/extrafiles.nix pluginArgs; - }; - in pythonPackages.buildPythonApplication rec { pname = "beets"; # While there is a stable version, 1.4.9, it is more than 1000 commits behind @@ -170,7 +160,7 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ optional enableCheck plugins.check + ++ optional enableCheck beetsExternalPlugins.check ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableGmusic pythonPackages.gmusicapi @@ -180,9 +170,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableSonosUpdate pythonPackages.soco ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask - ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts - ++ optional enableExtraFiles plugins.extrafiles + ++ optional enableAlternatives beetsExternalPlugins.alternatives + ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts + ++ optional enableExtraFiles beetsExternalPlugins.extrafiles ; buildInputs = [ @@ -290,7 +280,8 @@ in pythonPackages.buildPythonApplication rec { makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; passthru = { - externalPlugins = plugins; + # FIXME: remove in favor of pkgs.beetsExternalPlugins + externalPlugins = beetsExternalPlugins; updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; @@ -298,7 +289,7 @@ in pythonPackages.buildPythonApplication rec { description = "Music tagger and library organizer"; homepage = "http://beets.io"; license = licenses.mit; - maintainers = with maintainers; [ aszlig domenkozar doronbehar lovesegfault pjones ]; + maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix index 793611699ec..797aab16c1a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, beets, pythonPackages }: +{ lib, fetchFromGitHub, beets, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix index 441dcfe579f..259b62a23b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/check.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ flac liboggz mp3val ]; # patch out broken tests - patches = [ ./beet-check-tests.patch ]; + patches = [ ./check-tests.patch ]; # patch out futures dependency, it is only needed for Python2 which we don't # support. diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 5af52066caa..b8a17a7d13e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, beets, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { name = "beets-copyartifacts"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridge/default.nix new file mode 100644 index 00000000000..034e73207e3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wine +, boost +, libxcb +}: + +let + # Derived from subprojects/bitsery.wrap + bitsery = rec { + version = "5.2.0"; + src = fetchFromGitHub { + owner = "fraillt"; + repo = "bitsery"; + rev = "v${version}"; + hash = "sha256-Bxdtjn2v2lP2lCnvjzmct6QHT7FpwmXoSZtd2oEFS4w="; + }; + }; + + # Derived from subprojects/function2.wrap + function2 = rec { + version = "4.1.0"; + src = fetchFromGitHub { + owner = "Naios"; + repo = "function2"; + rev = version; + hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk="; + }; + }; + + # Derived from subprojects/tomlplusplus.wrap + tomlplusplus = rec { + version = "2.1.0"; + src = fetchFromGitHub { + owner = "marzer"; + repo = "tomlplusplus"; + rev = "v${version}"; + hash = "sha256-i6yAEqwkinkPEzzb6ynXytS1SEOUDwi8SixMf62NVzs="; + }; + }; + + # Derived from vst3.wrap + vst3 = rec { + version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6"; + src = fetchFromGitHub { + owner = "robbert-vdh"; + repo = "vst3sdk"; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-4oLOa6kVB053Hrq7BBbZFdruAXuqnC944y5Kuib1F7s="; + }; + }; +in stdenv.mkDerivation rec { + pname = "yabridge"; + version = "3.0.1"; + + # NOTE: Also update yabridgectl's cargoSha256 when this is updated + src = fetchFromGitHub { + owner = "robbert-vdh"; + repo = pname; + rev = version; + hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0="; + }; + + # Unpack subproject sources + postUnpack = ''( + cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${bitsery.src} bitsery-${bitsery.version} + tar -xf bitsery-patch-${bitsery.version}.tar.xz + cp -R --no-preserve=mode,ownership ${function2.src} function2-${function2.version} + tar -xf function2-patch-${function2.version}.tar.xz + cp -R --no-preserve=mode,ownership ${tomlplusplus.src} tomlplusplus + cp -R --no-preserve=mode,ownership ${vst3.src} vst3 + )''; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wine + ]; + + buildInputs = [ + boost + libxcb + ]; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + mesonFlags = [ + "--cross-file" "cross-wine.conf" + + # Requires CMake and is unnecessary + "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" + + # tomlplusplus examples and tests don't build with winegcc + "-Dtomlplusplus:BUILD_EXAMPLES=disabled" + "-Dtomlplusplus:BUILD_TESTS=disabled" + ]; + + installPhase = '' + mkdir -p "$out/bin" "$out/lib" + cp yabridge-group.exe{,.so} "$out/bin" + cp yabridge-host.exe{,.so} "$out/bin" + cp libyabridge-vst2.so "$out/lib" + cp libyabridge-vst3.so "$out/lib" + ''; + + meta = with lib; { + description = "Yet Another VST bridge, run Windows VST2 plugins under Linux"; + homepage = "https://github.com/robbert-vdh/yabridge"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix new file mode 100644 index 00000000000..6a77b502aee --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, yabridge }: + +rustPlatform.buildRustPackage rec { + pname = "yabridgectl"; + version = yabridge.version; + + src = yabridge.src; + sourceRoot = "source/tools/yabridgectl"; + cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc="; + + patches = [ + # By default, yabridgectl locates libyabridge.so by using + # hard-coded distro-specific lib paths. This patch replaces those + # hard coded paths with lib paths from NIX_PROFILE. + ./libyabridge-from-nix-profiles.patch + ]; + + patchFlags = [ "-p3" ]; + + meta = with lib; { + description = "A small, optional utility to help set up and update yabridge for several directories at once"; + homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch new file mode 100644 index 00000000000..e17cda6ada3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch @@ -0,0 +1,70 @@ +diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs +index c1c89cf..d7bd822 100644 +--- a/tools/yabridgectl/src/config.rs ++++ b/tools/yabridgectl/src/config.rs +@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet}; + use std::env; + use std::fmt::Display; + use std::fs; ++use std::iter; + use std::path::{Path, PathBuf}; + use which::which; + use xdg::BaseDirectories; +@@ -216,34 +217,24 @@ impl Config { + } + } + None => { +- // Search in the system library locations and in `~/.local/share/yabridge` if no +- // path was set explicitely. We'll also search through `/usr/local/lib` just in case +- // but since we advocate against installing yabridge there we won't list this path +- // in the error message when `libyabridge-vst2.so` can't be found. +- let system_path = Path::new("/usr/lib"); ++ // Search through NIX_PROFILES & data home directory if no path was set explicitly. ++ let nix_profiles = env::var("NIX_PROFILES"); + let user_path = xdg_dirs.get_data_home(); +- let lib_directories = [ +- system_path, +- // Used on Debian based distros +- Path::new("/usr/lib/x86_64-linux-gnu"), +- // Used on Fedora +- Path::new("/usr/lib64"), +- Path::new("/usr/local/lib"), +- Path::new("/usr/local/lib/x86_64-linux-gnu"), +- Path::new("/usr/local/lib64"), +- &user_path, +- ]; ++ let lib_directories = nix_profiles.iter() ++ .flat_map(|profiles| profiles.split(' ') ++ .map(|profile| Path::new(profile).join("lib"))) ++ .chain(iter::once(user_path.clone())); ++ + let mut candidates = lib_directories +- .iter() + .map(|directory| directory.join(LIBYABRIDGE_VST2_NAME)); ++ + match candidates.find(|directory| directory.exists()) { + Some(candidate) => candidate, + _ => { + return Err(anyhow!( +- "Could not find '{}' in either '{}' or '{}'. You can override the \ +- default search path using 'yabridgectl set --path='.", ++ "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \ ++ default search path using 'yabridgectl set --path='.", + LIBYABRIDGE_VST2_NAME, +- system_path.display(), + user_path.display() + )); + } +diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs +index 0db1bd4..221cdd0 100644 +--- a/tools/yabridgectl/src/main.rs ++++ b/tools/yabridgectl/src/main.rs +@@ -102,7 +102,7 @@ fn main() -> Result<()> { + .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") + .long_about( + "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ +- is not set, then yabridgectl will look in both '/usr/lib' and \ ++ is not set, then yabridgectl will look through 'NIX_PROFILES' and \ + '~/.local/share/yabridge' by default.", + ) + .validator(validate_path) diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix index f35c7a44b58..c2ed7882331 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Enterprise ready, Network Backup Tool"; homepage = "http://bacula.org/"; license = with licenses; [ agpl3Only bsd2 ]; - maintainers = with maintainers; [ domenkozar lovek323 eleanor ]; + maintainers = with maintainers; [ lovek323 eleanor ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix index cd91d51d960..c619a69c111 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages +{ lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages , util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }: stdenv.mkDerivation rec { @@ -24,12 +24,6 @@ stdenv.mkDerivation rec { # Tainted Mode disables PERL5LIB substituteInPlace btrbk --replace "perl -T" "perl" - # Fix btrbk-mail - substituteInPlace contrib/cron/btrbk-mail \ - --replace "/bin/date" "${coreutils}/bin/date" \ - --replace "/bin/echo" "${coreutils}/bin/echo" \ - --replace '$btrbk' 'btrbk' - # Fix SSH filter script sed -i '/^export PATH/d' ssh_filter_btrbk.sh substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/bupstash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/bupstash/default.nix index 9ed70491fb3..9eba33235bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/bupstash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "013k8pr4865f5rp66fjf3a8069kmd29brxv0l20z571gy2kxs5p9"; + sha256 = "sha256-4+Ra7rNvIL4SpdCkRbPBNrZeTb1dMbuwZx+D++1qsGs="; }; - cargoSha256 = "17cdi93q71wsqqfkpz6mxcaqqhqclsbns0g1r9mni39nikw7amv1"; + cargoSha256 = "sha256-cZSscmH3XPfH141hZhew79/UZHsqDZRN3EoNnYkW0wA="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/diskrsync/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/diskrsync/default.nix index 3b5d901daf0..97870d5dedd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/diskrsync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/diskrsync/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goPackagePath = "github.com/dop251/diskrsync"; goDeps = ./deps.nix; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; preFixup = '' wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicati/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicati/default.nix index 5330ca60a4d..2d9124d6f51 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicati/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/duplicati/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/{bin,share/${pname}-${version}} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/duply/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/duply/default.nix index 15ac5acbe84..82d6bd5c601 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/duply/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/duply/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE="; }; - buildInputs = [ txt2man makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ txt2man ]; postPatch = "patchShebangs ."; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch new file mode 100644 index 00000000000..148b9a1a957 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch @@ -0,0 +1,25 @@ +From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 +From: Simon Bruder +Date: Thu, 25 Feb 2021 09:20:51 +0100 +Subject: [PATCH] Skip testing restore with permission failure + +The test fails in sandboxed builds. +--- + cmd/restic/integration_test.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go +index 7d198d33..1588ccb1 100644 +--- a/cmd/restic/integration_test.go ++++ b/cmd/restic/integration_test.go +@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) { + } + + func TestRestoreWithPermissionFailure(t *testing.T) { ++ t.Skip("Skipping testing restore with permission failure") + env, cleanup := withTestEnvironment(t) + defer cleanup() + +-- +2.29.2 + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix index 3317ada541a..65ff53bf677 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -3,16 +3,21 @@ buildGoModule rec { pname = "restic"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf"; + sha256 = "07gxf56g45gj2arvdnrr9656i9ykhy1y6k6zdlni1sa3aa2x2bbf"; }; - vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh"; + patches = [ + # The TestRestoreWithPermissionFailure test fails in Nix’s build sandbox + ./0001-Skip-testing-restore-with-permission-failure.patch + ]; + + vendorSha256 = "14z22lmdd681rn61alpqbn3i9fn0kcc74321vjvhz2ix2mch3c1z"; subPackages = [ "cmd/restic" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/sanoid/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/sanoid/default.nix index 569a07a459b..a60683a27e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/sanoid/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/sanoid/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs -, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs +, perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }: with lib; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/store-backup/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/store-backup/default.nix index d0ca5324cab..026a3141fed 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/store-backup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/store-backup/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; src = fetchurl { url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix index f3c415f3cd0..de7f678fde8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -17,7 +17,10 @@ buildGoModule rec { subPackages = [ "main/pg" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; + buildFlagsArray = [ + "-tags=brotli" + "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" + ]; postInstall = '' mv $out/bin/pg $out/bin/wal-g diff --git a/infra/libkookie/nixpkgs/pkgs/tools/backup/zrepl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/backup/zrepl/default.nix new file mode 100644 index 00000000000..8d5a5159877 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/backup/zrepl/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "zrepl"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "zrepl"; + repo = "zrepl"; + rev = "v${version}"; + sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo="; + }; + + vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA="; + + subPackages = [ "." ]; + + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute dist/systemd/zrepl.service $out/lib/systemd/system/zrepl.service \ + --replace /usr/local/bin/zrepl $out/bin/zrepl + ''; + + meta = with lib; { + homepage = "https://zrepl.github.io/"; + description = "A one-stop, integrated solution for ZFS replication"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cole-h danderson ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch deleted file mode 100644 index 90b60235aad..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 -From: srs5694 -Date: Fri, 15 May 2020 12:34:14 -0400 -Subject: [PATCH] Fix GCC 10 compile problem - ---- - Make.common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Make.common b/Make.common -index 3f0b919..95a3a97 100644 ---- a/Make.common -+++ b/Make.common -@@ -60,7 +60,7 @@ endif - # - - # ...for both GNU-EFI and TianoCore.... --OPTIMFLAGS = -Os -fno-strict-aliasing -+OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns - CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall - - # ...for GNU-EFI.... --- -2.29.2 - diff --git a/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 9c36e55b8f2..600967e996c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -14,17 +14,16 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.12.0"; - srcName = "refind-src-${version}"; + version = "0.13.1"; src = fetchurl { - url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; - sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; + url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9"; }; patches = [ + # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch - ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ]; @@ -44,6 +43,8 @@ stdenv.mkDerivation rec { buildFlags = [ "gnuefi" "fs_gnuefi" ]; installPhase = '' + runHook preInstall + install -d $out/bin/ install -d $out/share/refind/drivers_${efiPlatform}/ install -d $out/share/refind/tools_${efiPlatform}/ @@ -102,6 +103,8 @@ stdenv.mkDerivation rec { sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont + + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix index 6affd3ec662..df8ca279107 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/bchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; - makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; + makeFlags = lib.optionals stdenv.cc.isClang [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dt $out/bin bchunk diff --git a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix index 70ab6db07c2..795589a64ec 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { dontConfigure = true; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install --directory --mode=755 $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/hactool/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/hactool/default.nix index 85b95a6f769..c6e0a3a2851 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/hactool/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/hactool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D hactool $out/bin/hactool diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/lrzip/default.nix index 596ea053166..78ce2d39f09 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/lrzip/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/lrzip/default.nix @@ -1,15 +1,19 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: stdenv.mkDerivation rec { - version = "0.631"; + version = "0.640"; pname = "lrzip"; src = fetchurl { - url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2"; - sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d"; + url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; + sha256 = "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9"; }; - buildInputs = [ zlib lzo bzip2 nasm perl ]; + buildInputs = [ zlib lzo bzip2 lz4 nasm perl ]; + + configureFlags = [ + "--disable-asm" + ]; meta = { homepage = "http://ck.kolivas.org/apps/lrzip/"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/default.nix index 438e169d23c..f580709495e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/default.nix @@ -1,15 +1,14 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.6"; + pname = "ncompress"; + version = "5.0"; builder = ./builder.sh; - patches = [ ./makefile.patch ]; - src = fetchurl { - url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv"; + url = "mirror://sourceforge/project/ncompress/${pname}-${version}.tar.gz"; + sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch b/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch deleted file mode 100644 index b61b1272f8b..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/ncompress/makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def ---- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 -+++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 -@@ -31,7 +33,7 @@ - # -DDEF_ERRNO=1 Define error (not defined in errno.h). - # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. - # --options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -+options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -DNOFUNCDEF=1 - - # libary options - LBOPT= $(LDFLAGS) diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index cc6916869b6..12052100db3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.14.9"; + version = "1.15.1"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; + sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs="; }; nativeBuildInputs = [ pkg-config ]; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; homepage = "https://bindfs.org"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lovek323 lovesegfault ]; platforms = lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index ec9cd7ca61a..c55c1bc1c5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.10"; + version = "5.10.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-5xoNbdUE86XZV/zpowKB62Hs+ZHIrzFf4AYaG5eh0CE="; + sha256 = "sha256-E3nMcx/q5/RzrZ43yEW7+4czge9ns0Dxoi+8qaTaA0Q="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 2f179a151d1..6c101dbc9c0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp"; + sha256 = "1k5xjz353ry0vbmq1ql7brb9g4wwsijzix2zh5zpd768xl8nc1z8"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 61cc4573693..aaa5806d402 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -9,10 +9,11 @@ , babeltrace, gperf , gtest , cunit, snappy -, rocksdb, makeWrapper +, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng , rdkafka +, nixosTests # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -146,7 +147,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka + snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -171,12 +172,10 @@ in rec { cmakeFlags = [ "-DWITH_PYTHON3=ON" - "-DWITH_SYSTEM_ROCKSDB=OFF" + "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" - "-DWITH_SYSTEM_BOOST=ON" - "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_GTEST=ON" "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" @@ -201,6 +200,7 @@ in rec { meta = getMeta "Distributed storage system"; passthru.version = version; + passthru.tests = { inherit (nixosTests) ceph-single-node ceph-multi-node ceph-single-node-bluestore; }; }; ceph-client = runCommand "ceph-client-${version}" { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix index 8621298275e..d448b0f67b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, e2fsprogs }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, e2fsprogs }: stdenv.mkDerivation rec { pname = "e2tools"; - version = "0.0.16"; + version = "0.1.0"; - src = fetchurl { - url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz"; - sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; + src = fetchFromGitHub { + owner = "e2tools"; + repo = "e2tools"; + rev = "6ee7c2d9015dce7b90c3388096602e307e3bd790"; + sha256 = "0nlqynrhj6ww7bnfhhfcx6bawii8iyvhgp6vz60zbnpgd68ifcx7"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ e2fsprogs ]; enableParallelBuilding = true; meta = { - homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/"; + homepage = "https://e2tools.github.io/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix index aaffc70e10d..8a0671957c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse autoconf automake makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ fuse autoconf automake ]; preConfigure = "./autogen.sh"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix new file mode 100644 index 00000000000..00266817390 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, e2tools +, makeWrapper +, mtools +}: + +buildGoModule rec { + pname = "fwanalyzer"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "cruise-automation"; + repo = pname; + rev = version; + sha256 = "1pj6s7lzw7490488a30pzvqy2riprfnhb4nzxm6sh2nsp51xalzv"; + }; + + vendorSha256 = "1cjbqx75cspnkx7fgc665q920dsxnsdhqgyiawkvx0i8akczbflw"; + + subPackages = [ "cmd/${pname}" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/fwanalyzer" --prefix PATH : "${lib.makeBinPath [ e2tools mtools ]}" + ''; + + # The tests requires an additional setup (unpacking images, etc.) + doCheck = false; + + meta = with lib; { + description = "Tool to analyze filesystem images"; + homepage = "https://github.com/cruise-automation/fwanalyzer"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index d820e5e68e2..e39a3d33dac 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.32.0"; + version = "0.33.2"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "09k7479gd9rlzmxhcvc1b3ajy8frzd6881vnlvk3z9818n4aq7qc"; + sha256 = "sha256-y40JWfD6selBo2IP7VgASmlNUDhXwOdQIRlRHPi3Nh0="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix index 766ac1f82ea..a9e0cd12d9d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -45,5 +46,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem shamilton ]; + # 'fprintf' was not declared in this scope + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index 368f62f2196..6da9b9c92a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.32.2"; + version = "2.32.3"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-ybDVBcPkjsW2OxNxUmn5hG/qLEjxF9vqR8pZdb9tIBs="; + sha256 = "sha256-loOBMrAtvJAcFdcgwzEEko7TMM07Ocx+1umxjnLB1uY="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix new file mode 100644 index 00000000000..b7850f7023f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix @@ -0,0 +1,26 @@ +{ poetry2nix, pkgs, lib }: + +let + pythonPackages = (poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + (self: super: { + + rmfuse = super.rmfuse.overridePythonAttrs(old: { + meta = old.meta // { + description = "RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem."; + longDescription = '' + RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. + ''; + license = lib.licenses.mit; + homepage = "https://github.com/rschroll/rmfuse"; + maintainers = [ lib.maintainers.adisbladis ]; + }; + }); + + }) + ]; + }).python.pkgs; +in pythonPackages.rmfuse diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix new file mode 100644 index 00000000000..9185faedc07 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix @@ -0,0 +1,14 @@ +{ pkgs }: +self: super: { + + rmfuse = super.rmfuse.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/rschroll/rmfuse.git"; + rev = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7"; + sha256 = "129n00hricsf4jkgj39bq3m5nhvy4d4yg7mcvrcgwb2546wcix0n"; + }; + } + ); + +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock new file mode 100644 index 00000000000..a97b89181fb --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock @@ -0,0 +1,547 @@ +[[package]] +category = "main" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +name = "anyio" +optional = false +python-versions = ">=3.6.2" +version = "2.1.0" + +[package.dependencies] +idna = ">=2.8" +sniffio = ">=1.1" + +[package.extras] +curio = ["curio (>=1.4)"] +doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["coverage (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop"] +trio = ["trio (>=0.16)"] + +[[package]] +category = "main" +description = "asks - async http" +name = "asks" +optional = false +python-versions = ">= 3.6.2" +version = "2.4.12" + +[package.dependencies] +anyio = ">=2.0,<3.0" +async_generator = "*" +h11 = "*" + +[[package]] +category = "main" +description = "Async generators and context managers for Python 3.5+" +name = "async-generator" +optional = false +python-versions = ">=3.5" +version = "1.10" + +[[package]] +category = "main" +description = "Classes Without Boilerplate" +name = "attrs" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "20.3.0" + +[package.extras] +dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] +docs = ["furo", "sphinx", "zope.interface"] +tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] +tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] + +[[package]] +category = "main" +description = "The bidirectional mapping library for Python." +name = "bidict" +optional = false +python-versions = ">=3.6" +version = "0.21.2" + +[package.extras] +coverage = ["coverage (<6)", "pytest-cov (<3)"] +dev = ["setuptools-scm", "hypothesis (<6)", "py (<2)", "pytest (<7)", "pytest-benchmark (>=3.2.0,<4)", "sortedcollections (<2)", "sortedcontainers (<3)", "Sphinx (<4)", "sphinx-autodoc-typehints (<2)", "coverage (<6)", "pytest-cov (<3)", "pre-commit (<3)", "tox (<4)"] +docs = ["Sphinx (<4)", "sphinx-autodoc-typehints (<2)"] +precommit = ["pre-commit (<3)"] +test = ["hypothesis (<6)", "py (<2)", "pytest (<7)", "pytest-benchmark (>=3.2.0,<4)", "sortedcollections (<2)", "sortedcontainers (<3)", "Sphinx (<4)", "sphinx-autodoc-typehints (<2)"] + +[[package]] +category = "main" +description = "Foreign Function Interface for Python calling C code." +name = "cffi" +optional = false +python-versions = "*" +version = "1.14.5" + +[package.dependencies] +pycparser = "*" + +[[package]] +category = "main" +description = "cssselect2" +name = "cssselect2" +optional = false +python-versions = ">=3.6" +version = "0.4.1" + +[package.dependencies] +tinycss2 = "*" +webencodings = "*" + +[package.extras] +doc = ["sphinx", "sphinx-rtd-theme"] +test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] + +[[package]] +category = "main" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +name = "h11" +optional = false +python-versions = ">=3.6" +version = "0.12.0" + +[[package]] +category = "main" +description = "Internationalized Domain Names in Applications (IDNA)" +name = "idna" +optional = false +python-versions = ">=3.4" +version = "3.1" + +[[package]] +category = "main" +description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +name = "lxml" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" +version = "4.6.2" + +[package.extras] +cssselect = ["cssselect (>=0.7)"] +html5 = ["html5lib"] +htmlsoup = ["beautifulsoup4"] +source = ["Cython (>=0.29.7)"] + +[[package]] +category = "main" +description = "Capture the outcome of Python function calls." +name = "outcome" +optional = false +python-versions = ">=3.6" +version = "1.1.0" + +[package.dependencies] +attrs = ">=19.2.0" + +[[package]] +category = "main" +description = "PDF file reader/writer library" +name = "pdfrw" +optional = false +python-versions = "*" +version = "0.4" + +[[package]] +category = "main" +description = "Python Imaging Library (Fork)" +name = "pillow" +optional = false +python-versions = ">=3.6" +version = "8.1.0" + +[[package]] +category = "main" +description = "C parser in Python" +name = "pycparser" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.20" + +[[package]] +category = "main" +description = "Python 3 bindings for libfuse 3 with async I/O support" +name = "pyfuse3" +optional = false +python-versions = ">=3.5" +version = "3.2.0" + +[package.dependencies] +trio = ">=0.15" + +[[package]] +category = "main" +description = "The Reportlab Toolkit" +name = "reportlab" +optional = false +python-versions = "*" +version = "3.5.59" + +[package.dependencies] +pillow = ">=4.0.0" + +[[package]] +category = "main" +description = "reMarkable Cloud Library" +name = "rmcl" +optional = false +python-versions = ">=3.7,<4.0" +version = "0.3.1" + +[package.dependencies] +asks = ">=2.4.12,<3.0.0" +trio = ">=0.18.0,<0.19.0" +xdg = ">=5.0.1,<6.0.0" + +[[package]] +category = "main" +description = "" +name = "rmfuse" +optional = false +python-versions = "^3.7" +version = "0.1.1" + +[package.dependencies] +bidict = "^0.21.2" +pyfuse3 = "^3.2.0" +rmcl = "^0.3.1" +rmrl = "^0.1.2" + +[package.source] +reference = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7" +type = "git" +url = "https://github.com/rschroll/rmfuse.git" +[[package]] +category = "main" +description = "Render reMarkable documents to PDF" +name = "rmrl" +optional = false +python-versions = ">=3.7,<4.0" +version = "0.1.2" + +[package.dependencies] +pdfrw = ">=0.4,<0.5" +reportlab = ">=3.5.59,<4.0.0" +svglib = ">=1.0.1,<2.0.0" +xdg = ">=5.0.1,<6.0.0" + +[[package]] +category = "main" +description = "Sniff out which async library your code is running under" +name = "sniffio" +optional = false +python-versions = ">=3.5" +version = "1.2.0" + +[[package]] +category = "main" +description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" +name = "sortedcontainers" +optional = false +python-versions = "*" +version = "2.3.0" + +[[package]] +category = "main" +description = "A pure-Python library for reading and converting SVG" +name = "svglib" +optional = false +python-versions = ">=3" +version = "1.0.1" + +[package.dependencies] +cssselect2 = ">=0.2.0" +lxml = "*" +reportlab = "*" +tinycss2 = ">=0.6.0" + +[[package]] +category = "main" +description = "tinycss2" +name = "tinycss2" +optional = false +python-versions = ">=3.6" +version = "1.1.0" + +[package.dependencies] +webencodings = ">=0.4" + +[package.extras] +doc = ["sphinx", "sphinx-rtd-theme"] +test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] + +[[package]] +category = "main" +description = "A friendly Python library for async concurrency and I/O" +name = "trio" +optional = false +python-versions = ">=3.6" +version = "0.18.0" + +[package.dependencies] +async-generator = ">=1.9" +attrs = ">=19.2.0" +cffi = ">=1.14" +idna = "*" +outcome = "*" +sniffio = "*" +sortedcontainers = "*" + +[[package]] +category = "main" +description = "Character encoding aliases for legacy web content" +name = "webencodings" +optional = false +python-versions = "*" +version = "0.5.1" + +[[package]] +category = "main" +description = "Variables defined by the XDG Base Directory Specification" +name = "xdg" +optional = false +python-versions = ">=3.6,<4.0" +version = "5.0.1" + +[metadata] +content-hash = "df8dfb527656dec034712b2d07aaacfdee20f89f635d38af52bb21888d7d4130" +lock-version = "1.0" +python-versions = "^3.8" + +[metadata.files] +anyio = [ + {file = "anyio-2.1.0-py3-none-any.whl", hash = "sha256:c286818ccd5dcbd5d385b223f16a055393474527b1d5650da489828a9887d559"}, + {file = "anyio-2.1.0.tar.gz", hash = "sha256:8a56e08623dc55955a06719d4ad62de6009bb3f1dd04936e60b2104dd58da484"}, +] +asks = [ + {file = "asks-2.4.12.tar.gz", hash = "sha256:38de944eb350e7e4e3a918055fa8ff033da5f7b5ff385c1160a2d6b9d84783b0"}, +] +async-generator = [ + {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"}, + {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"}, +] +attrs = [ + {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, + {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, +] +bidict = [ + {file = "bidict-0.21.2-py2.py3-none-any.whl", hash = "sha256:929d056e8d0d9b17ceda20ba5b24ac388e2a4d39802b87f9f4d3f45ecba070bf"}, + {file = "bidict-0.21.2.tar.gz", hash = "sha256:4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"}, +] +cffi = [ + {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"}, +] +cssselect2 = [ + {file = "cssselect2-0.4.1-py3-none-any.whl", hash = "sha256:2f4a9f20965367bae459e3bb42561f7927e0cfe5b7ea1692757cf67ef5d7dace"}, + {file = "cssselect2-0.4.1.tar.gz", hash = "sha256:93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"}, +] +h11 = [ + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, +] +idna = [ + {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"}, + {file = "idna-3.1.tar.gz", hash = "sha256:c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"}, +] +lxml = [ + {file = "lxml-4.6.2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a9d6bc8642e2c67db33f1247a77c53476f3a166e09067c0474facb045756087f"}, + {file = "lxml-4.6.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:791394449e98243839fa822a637177dd42a95f4883ad3dec2a0ce6ac99fb0a9d"}, + {file = "lxml-4.6.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:68a5d77e440df94011214b7db907ec8f19e439507a70c958f750c18d88f995d2"}, + {file = "lxml-4.6.2-cp27-cp27m-win32.whl", hash = "sha256:fc37870d6716b137e80d19241d0e2cff7a7643b925dfa49b4c8ebd1295eb506e"}, + {file = "lxml-4.6.2-cp27-cp27m-win_amd64.whl", hash = "sha256:69a63f83e88138ab7642d8f61418cf3180a4d8cd13995df87725cb8b893e950e"}, + {file = "lxml-4.6.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:42ebca24ba2a21065fb546f3e6bd0c58c3fe9ac298f3a320147029a4850f51a2"}, + {file = "lxml-4.6.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:f83d281bb2a6217cd806f4cf0ddded436790e66f393e124dfe9731f6b3fb9afe"}, + {file = "lxml-4.6.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:535f067002b0fd1a4e5296a8f1bf88193080ff992a195e66964ef2a6cfec5388"}, + {file = "lxml-4.6.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:366cb750140f221523fa062d641393092813b81e15d0e25d9f7c6025f910ee80"}, + {file = "lxml-4.6.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:97db258793d193c7b62d4e2586c6ed98d51086e93f9a3af2b2034af01450a74b"}, + {file = "lxml-4.6.2-cp35-cp35m-win32.whl", hash = "sha256:648914abafe67f11be7d93c1a546068f8eff3c5fa938e1f94509e4a5d682b2d8"}, + {file = "lxml-4.6.2-cp35-cp35m-win_amd64.whl", hash = "sha256:4e751e77006da34643ab782e4a5cc21ea7b755551db202bc4d3a423b307db780"}, + {file = "lxml-4.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:681d75e1a38a69f1e64ab82fe4b1ed3fd758717bed735fb9aeaa124143f051af"}, + {file = "lxml-4.6.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:127f76864468d6630e1b453d3ffbbd04b024c674f55cf0a30dc2595137892d37"}, + {file = "lxml-4.6.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4fb85c447e288df535b17ebdebf0ec1cf3a3f1a8eba7e79169f4f37af43c6b98"}, + {file = "lxml-4.6.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:5be4a2e212bb6aa045e37f7d48e3e1e4b6fd259882ed5a00786f82e8c37ce77d"}, + {file = "lxml-4.6.2-cp36-cp36m-win32.whl", hash = "sha256:8c88b599e226994ad4db29d93bc149aa1aff3dc3a4355dd5757569ba78632bdf"}, + {file = "lxml-4.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:6e4183800f16f3679076dfa8abf2db3083919d7e30764a069fb66b2b9eff9939"}, + {file = "lxml-4.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d8d3d4713f0c28bdc6c806a278d998546e8efc3498949e3ace6e117462ac0a5e"}, + {file = "lxml-4.6.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:8246f30ca34dc712ab07e51dc34fea883c00b7ccb0e614651e49da2c49a30711"}, + {file = "lxml-4.6.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:923963e989ffbceaa210ac37afc9b906acebe945d2723e9679b643513837b089"}, + {file = "lxml-4.6.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:1471cee35eba321827d7d53d104e7b8c593ea3ad376aa2df89533ce8e1b24a01"}, + {file = "lxml-4.6.2-cp37-cp37m-win32.whl", hash = "sha256:2363c35637d2d9d6f26f60a208819e7eafc4305ce39dc1d5005eccc4593331c2"}, + {file = "lxml-4.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:f4822c0660c3754f1a41a655e37cb4dbbc9be3d35b125a37fab6f82d47674ebc"}, + {file = "lxml-4.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0448576c148c129594d890265b1a83b9cd76fd1f0a6a04620753d9a6bcfd0a4d"}, + {file = "lxml-4.6.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:60a20bfc3bd234d54d49c388950195d23a5583d4108e1a1d47c9eef8d8c042b3"}, + {file = "lxml-4.6.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:2e5cc908fe43fe1aa299e58046ad66981131a66aea3129aac7770c37f590a644"}, + {file = "lxml-4.6.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:50c348995b47b5a4e330362cf39fc503b4a43b14a91c34c83b955e1805c8e308"}, + {file = "lxml-4.6.2-cp38-cp38-win32.whl", hash = "sha256:94d55bd03d8671686e3f012577d9caa5421a07286dd351dfef64791cf7c6c505"}, + {file = "lxml-4.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:7a7669ff50f41225ca5d6ee0a1ec8413f3a0d8aa2b109f86d540887b7ec0d72a"}, + {file = "lxml-4.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e0bfe9bb028974a481410432dbe1b182e8191d5d40382e5b8ff39cdd2e5c5931"}, + {file = "lxml-4.6.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:6fd8d5903c2e53f49e99359b063df27fdf7acb89a52b6a12494208bf61345a03"}, + {file = "lxml-4.6.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7e9eac1e526386df7c70ef253b792a0a12dd86d833b1d329e038c7a235dfceb5"}, + {file = "lxml-4.6.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:7ee8af0b9f7de635c61cdd5b8534b76c52cd03536f29f51151b377f76e214a1a"}, + {file = "lxml-4.6.2-cp39-cp39-win32.whl", hash = "sha256:2e6fd1b8acd005bd71e6c94f30c055594bbd0aa02ef51a22bbfa961ab63b2d75"}, + {file = "lxml-4.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:535332fe9d00c3cd455bd3dd7d4bacab86e2d564bdf7606079160fa6251caacf"}, + {file = "lxml-4.6.2.tar.gz", hash = "sha256:cd11c7e8d21af997ee8079037fff88f16fda188a9776eb4b81c7e4c9c0a7d7fc"}, +] +outcome = [ + {file = "outcome-1.1.0-py2.py3-none-any.whl", hash = "sha256:c7dd9375cfd3c12db9801d080a3b63d4b0a261aa996c4c13152380587288d958"}, + {file = "outcome-1.1.0.tar.gz", hash = "sha256:e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967"}, +] +pdfrw = [ + {file = "pdfrw-0.4-py2.py3-none-any.whl", hash = "sha256:758289edaa3b672e9a1a67504be73c18ec668d4e5b9d5ac9cbc0dc753d8d196b"}, + {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"}, +] +pillow = [ + {file = "Pillow-8.1.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a"}, + {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:93a473b53cc6e0b3ce6bf51b1b95b7b1e7e6084be3a07e40f79b42e83503fbf2"}, + {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174"}, + {file = "Pillow-8.1.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded"}, + {file = "Pillow-8.1.0-cp36-cp36m-win32.whl", hash = "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d"}, + {file = "Pillow-8.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:b09e10ec453de97f9a23a5aa5e30b334195e8d2ddd1ce76cc32e52ba63c8b31d"}, + {file = "Pillow-8.1.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:b02a0b9f332086657852b1f7cb380f6a42403a6d9c42a4c34a561aa4530d5234"}, + {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8"}, + {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:604815c55fd92e735f9738f65dabf4edc3e79f88541c221d292faec1904a4b17"}, + {file = "Pillow-8.1.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7"}, + {file = "Pillow-8.1.0-cp37-cp37m-win32.whl", hash = "sha256:47c0d93ee9c8b181f353dbead6530b26980fe4f5485aa18be8f1fd3c3cbc685e"}, + {file = "Pillow-8.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:96d4dc103d1a0fa6d47c6c55a47de5f5dafd5ef0114fa10c85a1fd8e0216284b"}, + {file = "Pillow-8.1.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:7916cbc94f1c6b1301ac04510d0881b9e9feb20ae34094d3615a8a7c3db0dcc0"}, + {file = "Pillow-8.1.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:3de6b2ee4f78c6b3d89d184ade5d8fa68af0848f9b6b6da2b9ab7943ec46971a"}, + {file = "Pillow-8.1.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d"}, + {file = "Pillow-8.1.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae"}, + {file = "Pillow-8.1.0-cp38-cp38-win32.whl", hash = "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59"}, + {file = "Pillow-8.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6c5275bd82711cd3dcd0af8ce0bb99113ae8911fc2952805f1d012de7d600a4c"}, + {file = "Pillow-8.1.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6"}, + {file = "Pillow-8.1.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:5e2fe3bb2363b862671eba632537cd3a823847db4d98be95690b7e382f3d6378"}, + {file = "Pillow-8.1.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7612520e5e1a371d77e1d1ca3a3ee6227eef00d0a9cddb4ef7ecb0b7396eddf7"}, + {file = "Pillow-8.1.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0"}, + {file = "Pillow-8.1.0-cp39-cp39-win32.whl", hash = "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b"}, + {file = "Pillow-8.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865"}, + {file = "Pillow-8.1.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:a3d3e086474ef12ef13d42e5f9b7bbf09d39cf6bd4940f982263d6954b13f6a9"}, + {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:731ca5aabe9085160cf68b2dbef95fc1991015bc0a3a6ea46a371ab88f3d0913"}, + {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:bba80df38cfc17f490ec651c73bb37cd896bc2400cfba27d078c2135223c1206"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:c3d911614b008e8a576b8e5303e3db29224b455d3d66d1b2848ba6ca83f9ece9"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:81c3fa9a75d9f1afafdb916d5995633f319db09bd773cb56b8e39f1e98d90820"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-win32.whl", hash = "sha256:b6f00ad5ebe846cc91763b1d0c6d30a8042e02b2316e27b05de04fa6ec831ec5"}, + {file = "Pillow-8.1.0.tar.gz", hash = "sha256:887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba"}, +] +pycparser = [ + {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, + {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, +] +pyfuse3 = [ + {file = "pyfuse3-3.2.0.tar.gz", hash = "sha256:45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"}, +] +reportlab = [ + {file = "reportlab-3.5.59-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c"}, + {file = "reportlab-3.5.59-cp27-cp27m-win32.whl", hash = "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491"}, + {file = "reportlab-3.5.59-cp27-cp27m-win_amd64.whl", hash = "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69"}, + {file = "reportlab-3.5.59-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e"}, + {file = "reportlab-3.5.59-cp36-cp36m-win32.whl", hash = "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4"}, + {file = "reportlab-3.5.59-cp36-cp36m-win_amd64.whl", hash = "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f"}, + {file = "reportlab-3.5.59-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378"}, + {file = "reportlab-3.5.59-cp37-cp37m-win32.whl", hash = "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0"}, + {file = "reportlab-3.5.59-cp37-cp37m-win_amd64.whl", hash = "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd"}, + {file = "reportlab-3.5.59-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux1_i686.whl", hash = "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057"}, + {file = "reportlab-3.5.59-cp38-cp38-win32.whl", hash = "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f"}, + {file = "reportlab-3.5.59-cp38-cp38-win_amd64.whl", hash = "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1"}, + {file = "reportlab-3.5.59-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux1_i686.whl", hash = "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16"}, + {file = "reportlab-3.5.59-cp39-cp39-win32.whl", hash = "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06"}, + {file = "reportlab-3.5.59-cp39-cp39-win_amd64.whl", hash = "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8"}, + {file = "reportlab-3.5.59.tar.gz", hash = "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536"}, +] +rmcl = [ + {file = "rmcl-0.3.1-py3-none-any.whl", hash = "sha256:e4ebcc3e6ce7e9efb1dec4a2d0a44c463ef3854d44e1f8919c65a2b3f9312ec7"}, + {file = "rmcl-0.3.1.tar.gz", hash = "sha256:5b5316adf53cca9e56273cad220cb7374cd56e7bac962c943868b05fc090e98c"}, +] +rmfuse = [] +rmrl = [ + {file = "rmrl-0.1.2-py3-none-any.whl", hash = "sha256:173231c7122a11201232ed8fe74e4a9a65192b87886ef8a98ae912aa9b875c26"}, + {file = "rmrl-0.1.2.tar.gz", hash = "sha256:8c8e757af5ca3eb7475f56803f7f37256fe4c5cad3a9ea5ad7534b2ebd172447"}, +] +sniffio = [ + {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, + {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, +] +sortedcontainers = [ + {file = "sortedcontainers-2.3.0-py2.py3-none-any.whl", hash = "sha256:37257a32add0a3ee490bb170b599e93095eed89a55da91fa9f48753ea12fd73f"}, + {file = "sortedcontainers-2.3.0.tar.gz", hash = "sha256:59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1"}, +] +svglib = [ + {file = "svglib-1.0.1.tar.gz", hash = "sha256:ff01593e8c07ea462d3742e1f4141bfa261cbd4400ceb25dfb8fec3508ad0e50"}, +] +tinycss2 = [ + {file = "tinycss2-1.1.0-py3-none-any.whl", hash = "sha256:0353b5234bcaee7b1ac7ca3dea7e02cd338a9f8dcbb8f2dcd32a5795ec1e5f9a"}, + {file = "tinycss2-1.1.0.tar.gz", hash = "sha256:fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a"}, +] +trio = [ + {file = "trio-0.18.0-py3-none-any.whl", hash = "sha256:a42af0634ba729cbfe8578be058750c6471dac19fbc7167ec6a3ca3f966fb424"}, + {file = "trio-0.18.0.tar.gz", hash = "sha256:87a66ae61f27fe500c9024926a9ba482c07e1e0f56380b70a264d19c435ba076"}, +] +webencodings = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] +xdg = [ + {file = "xdg-5.0.1-py3-none-any.whl", hash = "sha256:9ddd6649bee9148f952305603a08474e3ef37c909eb19dfcb9737d54ebcc407e"}, + {file = "xdg-5.0.1.tar.gz", hash = "sha256:97a27058caa61b4ce04e05471643caa6bc8c563d2638f92c0516ac50208146d8"}, +] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml new file mode 100644 index 00000000000..1163e308e70 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml @@ -0,0 +1,15 @@ +[tool.poetry] +name = "rmfuse-env" +version = "0.1.0" +description = "" +authors = [] + +[tool.poetry.dependencies] +python = "^3.8" +rmfuse = {git = "https://github.com/rschroll/rmfuse.git"} + +[tool.poetry.dev-dependencies] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/update b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/update new file mode 100644 index 00000000000..77cfe9ff86d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmfuse/update @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p poetry poetry2nix.cli +set -eu +poetry lock +poetry2nix lock diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmount/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmount/default.nix index 96d950e74ff..1d8ced17aae 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmount/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/rmount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D ${src}/rmount.man $out/share/man/man1/rmount.1 diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix index 4ff36e3b1d8..e80e6530371 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.88"; + version = "1.89"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-LxqTKu9F8FqHnjp1a9E/+WbH1Ol6if/OpY7LGsVE9Bw="; + sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k="; }; buildInputs = [ curl openssl libxml2 ] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index 05d7189fbaa..98f8861699f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ fuse samba glib attr libsecret ]; - postPatch = '' - substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h" - ''; - meta = with lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch new file mode 100644 index 00000000000..0d6804a647b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch @@ -0,0 +1,76 @@ +From d925c9a11ee2e88ac8aac03f51892746f2bcf8cd Mon Sep 17 00:00:00 2001 +From: Phillip Lougher +Date: Thu, 25 Feb 2021 23:12:10 +0000 +Subject: [PATCH] Mksquashfs: add -no-hardlinks option + +Normally Mksquashfs will detect hardlinks (multiple files with the +same inode) and hardlink them in the Squashfs image. + +But often hardlinks are used in the original filesystem +to save space, when files are discovered to be duplicate. +In this special case the only reason the files are +hardlinked is to save space, and where the filesystem +doesn't handle duplicate files (different inode, same +data). + +Squashfs does handle duplicate files, and so add +an option to ignore hardlinks and instead +store them as duplicates. + +Signed-off-by: Phillip Lougher +--- + squashfs-tools/mksquashfs.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index a45b77f..d4dc359 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -312,6 +312,9 @@ struct dir_info *root_dir; + FILE *log_fd; + int logging=FALSE; + ++/* Should Mksquashfs detect hardlinked files? */ ++int no_hardlinks = FALSE; ++ + static char *read_from_disk(long long start, unsigned int avail_bytes); + void add_old_root_entry(char *name, squashfs_inode inode, int inode_number, + int type); +@@ -3093,11 +3096,11 @@ struct inode_info *lookup_inode3(struct stat *buf, int pseudo, int id, + + /* + * Look-up inode in hash table, if it already exists we have a +- * hard-link, so increment the nlink count and return it. +- * Don't do the look-up for directories because we don't hard-link +- * directories. ++ * hardlink, so increment the nlink count and return it. ++ * Don't do the look-up for directories because Unix/Linux doesn't ++ * allow hard-links to directories. + */ +- if ((buf->st_mode & S_IFMT) != S_IFDIR) { ++ if ((buf->st_mode & S_IFMT) != S_IFDIR && !no_hardlinks) { + for(inode = inode_info[ino_hash]; inode; inode = inode->next) { + if(memcmp(buf, &inode->buf, sizeof(struct stat)) == 0) { + inode->nlink ++; +@@ -5447,7 +5450,9 @@ int main(int argc, char *argv[]) + comp = lookup_compressor(COMP_DEFAULT); + + for(i = source + 2; i < argc; i++) { +- if(strcmp(argv[i], "-mkfs-time") == 0 || ++ if(strcmp(argv[i], "-no-hardlinks") == 0) ++ no_hardlinks = TRUE; ++ else if(strcmp(argv[i], "-mkfs-time") == 0 || + strcmp(argv[i], "-fstime") == 0) { + if((++i == argc) || !parse_num_unsigned(argv[i], &mkfs_time)) { + ERROR("%s: %s missing or invalid time value\n", argv[0], argv[i - 1]); +@@ -5893,6 +5898,7 @@ printOptions: + "files larger than block size\n"); + ERROR("-no-duplicates\t\tdo not perform duplicate " + "checking\n"); ++ ERROR("-no-hardlinks\t\tdo not hardlink files, instead store duplicates\n"); + ERROR("-all-root\t\tmake all files owned by root\n"); + ERROR("-root-mode \tset root directory permissions to octal \n"); + ERROR("-force-uid \tset all file uids to \n"); +-- +2.30.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix index c833cfe10ad..cddb1722584 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix @@ -1,39 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, zlib, xz +{ lib +, stdenv +, fetchFromGitHub +, zlib +, xz , lz4 +, lzo , zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "squashfs"; version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; + rev = version; sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; - # Tag "4.4" points to this commit. - rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch + # Add -no-hardlinks option. This is a rebased version of + # c37bb4da4a5fa8c1cf114237ba364692dd522262, can be removed + # when upgrading to the next version after 4.4 + ./0001-Mksquashfs-add-no-hardlinks-option.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd lz4 ]; + buildInputs = [ zlib xz zstd lz4 lzo ]; - preBuild = "cd squashfs-tools"; + preBuild = '' + cd squashfs-tools + '' ; - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; + installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" ]; + makeFlags = [ + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZO_SUPPORT=1" + ]; - meta = { - homepage = "http://squashfs.sourceforge.net/"; + meta = with lib; { + homepage = "https://github.com/plougher/squashfs-tools"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ruuda ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ruuda ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix index d8d41450079..9c49c4677d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/xtreemfs/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { pname = "XtreemFS"; version = "1.5.1.81"; - buildInputs = [ which attr makeWrapper python ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which attr python ]; patches = [ (fetchpatch { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/games/ajour/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/games/ajour/default.nix index 291c783c914..b2cbe58ce96 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/games/ajour/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "1lwwj16q24k3d3vaj64zkai4cb15hxp6bzicp004q5az4gbriwih"; + sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz"; }; - cargoSha256 = "17j6v796ahfn07yjj9xd9kygy0sllz93ac4gky8w0hcixdwjp3i5"; + cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1"; nativeBuildInputs = [ autoPatchelfHook diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix index 3422b9a53bd..9337d5cca23 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { name = "diagrams-builder"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = with lib; concatStrings (intersperse "\n" (map exeWrapper backends)); diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix index a22f0bc60d4..4ab54593ed8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.nix @@ -1,30 +1,33 @@ -{lib, stdenv, fetchurl, libdmtx, pkg-config, imagemagick}: -let - s = # Generated upstream information - rec { - baseName="dmtx-utils"; - version="0.7.4"; - name="${baseName}-${version}"; - hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; - url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; - sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libdmtx imagemagick - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libdmtx +, imagemagick +}: + +stdenv.mkDerivation rec { + pname = "dmtx-utils"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "dmtx"; + repo = "dmtx-utils"; + rev = "v${version}"; + sha256 = "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4"; }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libdmtx imagemagick ]; + meta = { - inherit (s) version; description = "Data matrix command-line utilities"; - license = lib.licenses.lgpl2 ; - maintainers = [lib.maintainers.raskin]; + homepage = "https://github.com/dmtx/dmtx-utils"; + changelog = "https://github.com/dmtx/dmtx-utils/blob/v${version}/ChangeLog"; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.upstream b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.upstream deleted file mode 100644 index 2bb7fe31bf7..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dmtx-utils/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/libdmtx/files/libdmtx/ -SF_version_dir -version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$' -SF_redirect diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/fgallery/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/fgallery/default.nix index 40308ffa1a9..865e0f141ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/fgallery/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/fgallery/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - buildInputs = [ unzip makeWrapper ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); installPhase = '' mkdir -p "$out/bin" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix index de866221267..7449eedb3a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc="; + sha256 = "sha256-Cm/w0bwDMu5REsQpkwMBgnROxpI+nMQwC16dY/VdOFU="; }; - cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI="; + cargoSha256 = "sha256-fy8apB1UbpBAnp8mFnL7rNj/GSSUkNz/trqsVrAfFfI="; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/icoutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/icoutils/default.nix index 704c3a2db52..9fe41d91db2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/icoutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/icoutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; - buildInputs = [ makeWrapper libpng perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libpng perl ]; propagatedBuildInputs = [ perlPackages.LWP ]; patchPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix index 77acafcb812..6291dc9d642 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }: +{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }: with lib; with haskell.lib; @@ -29,7 +29,7 @@ justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: { # wrapper for runtime dependencies registration wrapProgram "$out/bin/ldgallery" \ - --prefix PATH : ${lib.makeBinPath [ imagemagick7 ]} + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} # bash completion mkdir -p "$out/share/bash-completion/completions" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/default.nix deleted file mode 100644 index a1c81f16f2b..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: - -/* how to calibrate your monitor: - Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles -*/ -stdenv.mkDerivation { - name = "lprof-1.11.4.1"; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; - buildInputs = [ qt3 lcms1 libtiff vigra ]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - export QTDIR=${qt3} - export qt_directory=${qt3} - ''; - - src = fetchurl { - url = "mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz"; - sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; - }; - - sconsFlags = "SYSLIBS=1"; - preBuild = '' - export CXX=g++ - ''; - prefixKey = "PREFIX="; - - patches = [ ./lcms-1.17.patch ./keep-environment.patch ]; - - meta = { - description = "Little CMS ICC profile construction set"; - homepage = "https://sourceforge.net/projects/lprof"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - broken = true; # Broken since 2020-07-28 (https://hydra.nixos.org/build/135234622) - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch b/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch deleted file mode 100644 index 7d0beaed587..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- lprof-1.11.4.1.org/SConstruct 2006-06-06 02:11:32.000000000 +0100 -+++ lprof-1.11.4.1/SConstruct 2017-08-29 12:56:13.425654683 +0100 -@@ -22,12 +22,7 @@ - # opts.Add(BoolOption('qt-mt-lib', 'Flag used to set QT library to either qt-mt or qt. Value of 1 = qt-mt, 0 = qt.', 'yes')) - - # setup base environment --env = Environment( -- ENV = { -- 'PATH' : os.environ[ 'PATH' ], -- 'HOME' : os.environ[ 'HOME' ], # required for distcc -- 'LDFLAGS' : '' -- }, options = opts) -+env = Environment(ENV = os.environ, options = opts) - - opts.Update(env) - opts.Save('lprof.conf', env) # Save, so user doesn't have to diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch b/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch deleted file mode 100644 index a88471e143f..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/liblprof/lcmsprf.h 2007-08-31 15:36:20.000000000 -0700 -+++ b/src/liblprof/lcmsprf.h 2007-08-31 15:37:39.000000000 -0700 -@@ -67,6 +67,9 @@ - #define mmax(a,b) ((a) > (b)?(a):(b)) - #endif - -+#if LCMS_VERSION > 116 -+typedef int BOOL; -+#endif - - /* Misc operations ------------------------------------------------------------------------ */ - - diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pdfread/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pdfread/default.nix index abe560c81fe..6201b2d5888 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pdfread/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pdfread/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; - buildInputs = [ unzip python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip python ]; broken = true; # Not found. diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index ded99674186..99b9e3e0e48 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin -, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat +, openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - openexr zlib imagemagick fftwFloat + openexr zlib imagemagick6 fftwFloat fftw gsl libexif perl opencv2 qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix index e4a8b705a16..18a156ea504 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pngcrush/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; - makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat configurePhase = '' sed -i s,/usr,$out, Makefile diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix index ec2cb359a5e..a4772cad3c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip libGLU makeWrapper ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 unzip libGLU ]; + nativeBuildInputs = [ qmake4Hook makeWrapper ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: patches = [ ./gcc47.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/welkin/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/welkin/default.nix index 53e7378bd3b..2f9c43373bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/welkin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/welkin/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "welkin-r9638/tags/${version}"; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p $out/{bin,share} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/zbar/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/zbar/default.nix index 301e760cb56..df0983b2d64 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/zbar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/zbar/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "zbar"; - version = "0.23.1"; + version = "0.23.90"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "mchehab"; repo = "zbar"; rev = version; - sha256 = "0l4nxha8k18iqzrbqpgca49lrf1gigy3kpbzl3ldw2lw8alwy8x2"; + sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix index 66f264bc7a3..456a57a1351 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix @@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; - verifyCargoDeps = true; meta = with lib; { homepage = "https://github.com/myfreeweb/${pname}"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2af4061ae04..2767b4c7c0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME} ''; + dontWrapQtApps = true; + meta = with lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 35683101918..e9d7f0765b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,7 +2,7 @@ , libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules -, xkeyboard_config, pcre, libuuid +, xkeyboard_config, pcre, libuuid, xorg, makeWrapper , withPinyin ? true , fetchFromGitLab }: @@ -68,7 +68,12 @@ stdenv.mkDerivation rec { patchShebangs cmake/ ''; - nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre ]; + postInstall = '' + wrapProgram $out/bin/fcitx \ + --prefix PATH : "${xorg.xmodmap}/bin" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre makeWrapper ]; buildInputs = [ xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 0daeaa794ce..1b76cec554d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchurl , fetchFromGitHub , cmake , extra-cmake-modules diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 6184ea36549..560393b3193 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-lua"; rev = version; - sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE="; + sha256 = "sha256-46s3F3NHGuef0wPhYiPocms0jv5Vo+cVRd5FzlfjMZY="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 8e5254b75c4..f8601a64e2a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-rime"; rev = version; - sha256 = "sha256-mPNZ/B5bpxua+E1T+oz9v2QKAzGraA2cfT8oJacC35U="; + sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8="; }; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 4feae0d4acc..5e42016ec7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-table-other"; rev = version; - sha256 = "sha256-P+KaUmjAHe1CZ5rNMQAxwKSW5ZMVgQcwkgdlungXTLM="; + sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 17501d5f362..020e829f098 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/fcitx5 \ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/hime/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/hime/default.nix index 8ec6146a020..988f8941d14 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/hime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/hime/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; - + dontWrapQtApps = true; meta = with lib; { homepage = "http://hime-ime.github.io/"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index c555c507d7b..a0aea92ea4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -60,13 +60,13 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.23"; + version = "1.5.24"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "0qnblqhz8wyhchnm36zrxhbvi9g4fcwcgmw7p60yjybdlhq4asc7"; + sha256 = "sha256-1qx06MlEUjSS067FdQG1Bdi4ZAh3hPcNjUX5PIiC3Sk="; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/0x0/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/0x0/default.nix index e0f84329b89..0b9c6f7c3bb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/0x0/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/0x0/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1qpylyxrisy3p2lyirfarfj5yzrdjgsgxwf8gqwljpcjn207hr72"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 0x0 $out/bin/0x0 @@ -26,5 +26,6 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/somasis/scripts/"; maintainers = [ maintainers.ar1a ]; license = licenses.unlicense; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile new file mode 100644 index 00000000000..be47216200d --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile @@ -0,0 +1,37 @@ +source 'https://rubygems.org' +gemspec + + +group :development, :test do + #gem 'anystyle-data', github: 'inukshuk/anystyle-data' + #gem 'wapiti', github: 'inukshuk/wapiti-ruby' + gem 'bibtex-ruby' + gem 'rake' + gem 'rspec', '~>3.0' + gem 'language_detector', github: 'feedbackmine/language_detector' + gem 'unicode-scripts' + gem 'edtf' + gem 'citeproc' + gem 'unicode_utils' if RUBY_VERSION < '2.4' +end + +group :coverage do + gem 'simplecov', require: false + gem 'coveralls', require: false if ENV['CI'] +end + +group :debug do + gem 'byebug', require: false +end + +group :profile do + gem 'ruby-prof', require: false + gem 'gnuplot', require: false +end + +group :extra do + gem 'lmdb' + gem 'redis' + gem 'redis-namespace' + gem 'yard' +end diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock new file mode 100644 index 00000000000..8d28ef80894 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/Gemfile.lock @@ -0,0 +1,99 @@ +GIT + remote: https://github.com/feedbackmine/language_detector.git + revision: 89102790194150b3a8110ce691f9989b8ce70f8d + specs: + language_detector (0.1.2) + +PATH + remote: . + specs: + anystyle (1.3.10) + anystyle-data (~> 1.2) + bibtex-ruby (~> 5.0) + gli (~> 2.17) + namae (~> 1.0) + wapiti (~> 1.0, >= 1.0.2) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.3.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + anystyle-data (1.2.0) + bibtex-ruby (5.1.4) + latex-decode (~> 0.0) + builder (3.2.4) + byebug (11.1.3) + citeproc (1.0.10) + namae (~> 1.0) + concurrent-ruby (1.1.7) + diff-lcs (1.4.4) + docile (1.3.2) + edtf (3.0.5) + activesupport (>= 3.0, < 7.0) + gli (2.19.2) + gnuplot (2.6.2) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + latex-decode (0.3.1) + lmdb (0.5.3) + minitest (5.14.1) + namae (1.0.1) + rake (13.0.1) + redis (4.2.1) + redis-namespace (1.8.0) + redis (>= 3.0.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + ruby-prof (1.4.1) + simplecov (0.19.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov-html (0.12.2) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-scripts (1.6.0) + wapiti (1.0.7) + builder (~> 3.2) + yard (0.9.25) + zeitwerk (2.4.0) + +PLATFORMS + ruby + +DEPENDENCIES + anystyle! + bibtex-ruby + byebug + citeproc + edtf + gnuplot + language_detector! + lmdb + rake + redis + redis-namespace + rspec (~> 3.0) + ruby-prof + simplecov + unicode-scripts + yard + +BUNDLED WITH + 2.1.4 diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec new file mode 100644 index 00000000000..57db427fb02 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/anystyle.gemspec @@ -0,0 +1,52 @@ +# -*- encoding: utf-8 -*- +lib = File.expand_path('../lib/', __FILE__) +$:.unshift lib unless $:.include?(lib) + +require 'anystyle/version' + +Gem::Specification.new do |s| + s.name = 'anystyle' + s.version = AnyStyle::VERSION.dup + s.platform = Gem::Platform::RUBY + s.authors = ['Sylvester Keil'] + s.email = ['http://sylvester.keil.or.at'] + s.homepage = 'http://anystyle.io' + s.summary = 'Smart and fast bibliography parser.' + s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.' + s.license = 'BSD-2-Clause' + s.executables = [] + s.require_path = 'lib' + + s.required_ruby_version = '>= 2.2' + + s.add_runtime_dependency('bibtex-ruby', '~>5.0') + s.add_runtime_dependency('anystyle-data', '~>1.2') + s.add_runtime_dependency('gli', '~>2.17') + s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2') + s.add_runtime_dependency('namae', '~>1.0') + + s.files = + `git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{ + .coveralls.yml + .gitignore + .rspec + .simplecov + .travis.yml + Gemfile + Rakefile + appveyor.yml + anystyle.gemspec + res/core.xml + } + + s.rdoc_options = %w{ + --line-numbers + --inline-source + --title "AnyStyle" + --main README.md + } + s.extra_rdoc_files = %w{README.md LICENSE} + +end + +# vim: syntax=ruby diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix new file mode 100644 index 00000000000..7a437cafc28 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildRubyGem +, bundlerEnv +, ruby +, poppler_utils +}: +let + deps = bundlerEnv rec { + name = "anystyle-cli-${version}"; + source.sha256 = lib.fakeSha256; + version = "1.3.1"; + inherit ruby; + gemdir = ./.; + gemset = lib.recursiveUpdate (import ./gemset.nix) { + anystyle.source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n"; + type = "gem"; + }; + }; + }; +in +buildRubyGem rec { + inherit ruby; + gemName = "anystyle-cli"; + pname = gemName; + version = "1.3.1"; + source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy"; + + propagatedBuildInputs = [ deps ]; + + preFixup = '' + wrapProgram $out/bin/anystyle --prefix PATH ${poppler_utils}/bin + ''; + + meta = with lib; { + description = "Command line interface to the AnyStyle Parser and Finder"; + homepage = "https://anystyle.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix new file mode 100644 index 00000000000..46444760b7b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/anystyle-cli/gemset.nix @@ -0,0 +1,1570 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; + type = "gem"; + }; + version = "6.0.3.2"; + }; + anystyle = { + dependencies = ["anystyle-data" "bibtex-ruby" "gli" "namae" "wapiti"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + path = ./.; + type = "path"; + }; + version = "1.3.10"; + }; + anystyle-data = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ry6836mq48d85hjcfp7xiw0yk3ivpiwjvmdwv5jag30ijfyaccy"; + type = "gem"; + }; + version = "1.2.0"; + }; + bibtex-ruby = { + dependencies = ["latex-decode"]; + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00zwmmmjrbrxhajdvn1d4rnv2qw00arcj021cwyx3hl6dsv22l2w"; + type = "gem"; + }; + version = "5.1.4"; + }; + builder = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + byebug = { + groups = ["debug"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + citeproc = { + dependencies = ["namae"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2"; + type = "gem"; + }; + version = "1.0.10"; + }; + concurrent-ruby = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + type = "gem"; + }; + version = "1.1.7"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + docile = { + groups = ["coverage" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + type = "gem"; + }; + version = "1.3.2"; + }; + edtf = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xknzamagsx68iq7zdiswr077sxirig77yggbcsw51m8365ajzpc"; + type = "gem"; + }; + version = "3.0.5"; + }; + gli = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q598mvl20isn3ja1ya0p72svmqwx3m6fjp5slnv0b2c5mh0ahvv"; + type = "gem"; + }; + version = "2.19.2"; + }; + gnuplot = { + groups = ["profile"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cvb84lahhy6qxkkgg0pfk9b85qrb1by2p3jlpqgczl6am58vhnj"; + type = "gem"; + }; + version = "2.6.2"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + type = "gem"; + }; + version = "1.8.5"; + }; + language_detector = { + groups = ["development" "test"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "89102790194150b3a8110ce691f9989b8ce70f8d"; + sha256 = "0wxs9i0wqmwysrz1c1i85i4f670m217y12rj5slcmd1y4ylsmvyi"; + type = "git"; + url = "https://github.com/feedbackmine/language_detector.git"; + }; + version = "0.1.2"; + }; + latex-decode = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dqanr69as05vdyp9gx9737w3g44rhyk7x96bh9x01fnf1yalyzd"; + type = "gem"; + }; + version = "0.3.1"; + }; + lmdb = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qk2ycgyyk052dvbgik35mr4n9im4k1j6v7anbjqhx52y5f07sfg"; + type = "gem"; + }; + version = "0.5.3"; + }; + minitest = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + type = "gem"; + }; + version = "5.14.1"; + }; + namae = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w0dgvmdy8lw2b5q9zvhqd5k98a192vdmka96qngi9cvnsh5snw"; + type = "gem"; + }; + version = "1.0.1"; + }; + rake = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + type = "gem"; + }; + version = "13.0.1"; + }; + redis = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19hm66kw5vx1lmlh8bj7rxlddyj0vfp11ajw9njhrmn8173d0vb5"; + type = "gem"; + }; + version = "4.2.1"; + }; + redis-namespace = { + dependencies = ["redis"]; + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; + type = "gem"; + }; + version = "1.8.0"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + type = "gem"; + }; + version = "3.9.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; + type = "gem"; + }; + version = "3.9.3"; + }; + ruby-prof = { + groups = ["profile"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cd91m08ih0imfpy4k87618hd4mhyz291a6bx2hcskza4nf6d27"; + type = "gem"; + }; + version = "1.4.1"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html"]; + groups = ["coverage"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b082xrklq6k755cc3rzpnfdjv5338rlky9him36jasw8s9q68mr"; + type = "gem"; + }; + version = "0.19.0"; + }; + simplecov-html = { + groups = ["coverage" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9"; + type = "gem"; + }; + version = "0.12.2"; + }; + thread_safe = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + unicode-scripts = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04xfy4f61xf7qnbfa68aqscmyxk7wx3swn571cijsfqalhz8swjg"; + type = "gem"; + }; + version = "1.6.0"; + }; + wapiti = { + dependencies = ["builder"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aw2l759cfmii9a67pn8pswip11v08nabkzm825mrmxa6r91izqs"; + type = "gem"; + }; + version = "1.0.7"; + }; + yard = { + groups = ["extra"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd"; + type = "gem"; + }; + version = "0.9.25"; + }; + zeitwerk = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + type = "gem"; + }; + version = "2.4.0"; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/arp-scan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/arp-scan/default.nix index e25543b5145..720b0a875a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/arp-scan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/arp-scan/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { URI ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perlPackages.perl libpcap makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ perlPackages.perl libpcap ]; postInstall = '' for name in get-{oui,iab}; do diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/aspcud/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/aspcud/default.nix index 4c5622fab09..a50bc311f24 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/aspcud/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/aspcud/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.9.4"; + version = "1.9.5"; pname = "aspcud"; src = fetchzip { url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; - sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; + sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bat-extras/default.nix index 7d3f1dc0a36..323099f02c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bat-extras/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat # batdiff, batgrep, and batwatch , coreutils , less diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix index d6e1e9e5d77..d72b0fdef1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1kbziqm00skj65gpjq6m83hmfk9g3xyx88gai1r80pzsx8g239w1"; + sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8"; }; - cargoSha256 = "1pdja5jhk036hpgv77xc3fcvra1sw0z5jc1ry53i0r7362lnwapz"; + cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4"; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -39,11 +39,14 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${lib.makeBinPath [ less ]}" ''; + checkFlags = [ "--skip=pager_more" "--skip=pager_most" ]; + passthru.tests = { inherit (nixosTests) bat; }; meta = with lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; + changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball zowoq ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bc/default.nix index 96c2d00ffa8..bb5ed84e7d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bc/default.nix @@ -3,9 +3,10 @@ }: stdenv.mkDerivation rec { - name = "bc-1.07.1"; + pname = "bc"; + version = "1.07.1"; src = fetchurl { - url = "mirror://gnu/bc/${name}.tar.gz"; + url = "mirror://gnu/bc/${pname}-${version}.tar.gz"; sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; }; @@ -30,10 +31,10 @@ stdenv.mkDerivation rec { # masss-rebuild. strictDeps = true; - meta = { + meta = with lib; { description = "GNU software calculator"; homepage = "https://www.gnu.org/software/bc/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index ff14f2d1a4e..1a782661466 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.200"; + version = "1.201"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "07z686h2fv9b3446fcym0sfzxwgkm9cc4bd3zhpv6j8bdfadnjxw"; + sha256 = "sha256-XVaROIxyNBBFoXf+K1mv4mW8wWozqMcs1cgaWj8L8Q0="; }; nativeBuildInputs = [ dpkg ]; @@ -14,10 +14,16 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; installPhase = " + runHook preInstall substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl mv usr $out + runHook postInstall "; meta = with lib; { @@ -26,7 +32,7 @@ stdenv.mkDerivation rec { longDescription = '' Font converter to generate console fonts from BDF source fonts ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ rnhmjoj vrthra ]; platforms = platforms.unix; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix index 1d8bd38c1e1..735508fed21 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp"; + sha256 = "sha256-f3IdTk1GEo1GlbiJMCpqwheNJrndm7aCojA+GuKMTao="; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/blflash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/blflash/default.nix new file mode 100644 index 00000000000..bf09fc8d0a7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/blflash/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "blflash"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "spacemeowx2"; + repo = "blflash"; + rev = "v${version}"; + sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg="; + }; + + cargoSha256 = "sha256-tt9jfcoEw/HQ0/qU4lhbqKtIw/lthDTcyf/3HYQNPEY="; + + meta = with lib; { + description = "An bl602 serial flasher written in Rust"; + homepage = "https://github.com/spacemeowx2/blflash"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 79094dc9540..c78c0121ed0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bmap-tools"; - version = "3.4"; + version = "3.6"; src = fetchFromGitHub { owner = "intel"; repo = "bmap-tools"; rev = "v${version}"; - sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q"; + sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl"; }; + propagatedBuildInputs = with python3Packages; [ six ]; + # tests fail only on hydra. doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix index cb5f582d2de..4b22e6493a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/broadlink-cli/default.nix @@ -1,17 +1,16 @@ { lib, python3Packages, fetchFromGitHub }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - inherit (python3Packages.broadlink) version; + version = "0.16.0"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. src = fetchFromGitHub { owner = "mjg59"; repo = "python-broadlink"; - # this rev is version 0.15.0 - rev = "99add9e6feea6e47be4f3a58783556d7838b759c"; - sha256 = "1q1q62brvfjcb18i0j4ca5cxqzjwv1iywdrdby0yjqa4wm6ywq6b"; + rev = version; + sha256 = "sha256-fdwy58AopAcDp18APzvYionEbrKfTlH/yFpT1gG5iDs="; }; format = "other"; @@ -23,8 +22,8 @@ python3Packages.buildPythonApplication { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin cli/broadlink_{cli,discovery} - install -Dm644 -t $out/share/doc/broadlink cli/README.md + install -Dm555 -t $out/bin cli/broadlink_{cli,discovery} + install -Dm444 -t $out/share/doc/broadlink cli/README.md runHook postInstall ''; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix index c647d3b3902..ffe3fd0fe16 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/byobu/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ perl makeWrapper gettext ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl gettext ]; propagatedBuildInputs = [ textual-window-manager screen ]; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix index e79774da917..90abc765920 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase -, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata +, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation }: @@ -21,8 +21,6 @@ mkDerivation rec { qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; - enableParallelBuilding = false; - cmakeFlags = [ "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/capture/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/capture/default.nix index d0e6c167349..d858e0fbc46 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/capture/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/capture/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 src/capture.sh $out/bin/capture diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/chafa/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/chafa/default.nix index f196bb5af03..51fbba8d706 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.6.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; + sha256 = "sha256-GaXVMM23U3M+qNJrWYR+DLiCmILcuX5EIkQqzwN/l1Y="; }; nativeBuildInputs = [ autoconf diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix new file mode 100644 index 00000000000..e00ceb9517f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, expat +, fontconfig +, freetype +}: + +rustPlatform.buildRustPackage rec { + pname = "cicero-tui"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "eyeplum"; + repo = "cicero-tui"; + rev = "v${version}"; + sha256 = "1bz2y37qf9c3fxc73chb42rffdivp5krczhgd9rnwq5r6n6bdgq7"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + expat + fontconfig + freetype + ]; + + cargoSha256 = "04359gf9mirczqwh8jv3rf0cc4pp05r8ncqyz0n8r7x5qv77kgcp"; + + meta = with lib; { + description = "Unicode tool with a terminal user interface"; + homepage = "https://github.com/eyeplum/cicero-tui"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cloc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cloc/default.nix index f518c1b8e3f..3e18d3f4b54 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */Unix) ''; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ - perl AlgorithmDiff ParallelForkManager RegexpCommon - ]); + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ perl AlgorithmDiff ParallelForkManager RegexpCommon ]); makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix index b10259f24fc..32ef248ca85 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper , gawk, gnused, util-linux, file -, wget, python3, qemu-utils, euca2ools +, wget, python3, qemu-utils , e2fsprogs, cdrkit , gptfdisk }: diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix index 92890c056b1..7f57cab585b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix index aeecb053212..501c4e29a41 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/convfont/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 convfont $out/bin/convfont diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix index 8caf4cb706f..0c5ffb4a6de 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/convimg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix index c05d50cdbc1..39e6e6f211a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -7,7 +7,7 @@ let description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; - maintainers = [ maintainers.petabyteboy ]; + maintainers = with maintainers; [ petabyteboy felixsinger ]; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix index 8de7cc99336..cbeede0cc30 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - buildInputs = [ unzip xz dpkg libxslt python setuptools makeWrapper curl gnupg diffutils ] ++ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/dijo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/dijo/default.nix index b8dc950773b..3ecb201468a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/dijo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.5"; in +let version = "0.2.6"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "sha256-DdK9qdF+rFtAhemPwMpiZrtUdgD0iFqjgiZ3Yp/vLAI="; + sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ="; }; - cargoSha256 = "sha256-bdSXyxiHwGtdyce2YyPKq+3RfZIL425RvwRfKi59RVI="; + cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/disfetch/default.nix index afce1429e69..80afcb5cd9f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.14"; + version = "1.20"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p"; + sha256 = "sha256-P5Sq8ld6pPACHn7iOJ9Uk+zR8ZLxHVvnRyFfkfGGv6I="; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix index 063442b75f2..f0bb6905b43 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.10"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-Rt+60j1+uwL6g4HGc+xdUzGK6nanGfRYbekO54iKsPE="; + sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-6L1J5RHI657Z03rMmhwEzgpQ0//dykqGi8bI2Enc3N8="; + cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/entr/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/entr/default.nix index 581b39f3c4c..5d8d0d94201 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.7"; + version = "4.8"; src = fetchurl { - url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "sha256-tsGrdkTYO7Kiadx0Fghno74PXfEWx+tFPCUFMXNTRCk="; + url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; + sha256 = "1bi5fhr93n72pkap4mqsjd1pwnqjf6czg359c5xwczavfk6mamgh"; }; postPatch = '' @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://entrproject.org/"; + homepage = "https://eradman.com/entrproject/"; description = "Run arbitrary commands when files change"; + changelog = "https://github.com/eradman/entr/raw/${version}/NEWS"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ pSub synthetica ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/exa/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/exa/default.nix index f275d254677..326a978f060 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -1,43 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, pkg-config, zlib , Security, libiconv, installShellFiles }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "exa"; - version = "0.9.0"; + version = "unstable-2021-01-14"; - cargoSha256 = "0nl106jlbr8gnnlbi20mrc6zyww7vxgmw6w34ibndxqh9ggxwfvr"; + cargoSha256 = "1lmjh0grpnx20y6raxnxgjkr92h395r6jk8mm2ypc4cxpxczdqvl"; src = fetchFromGitHub { owner = "ogham"; - repo = "exa"; - rev = "v${version}"; - sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; + repo = pname; + rev = "13b91cced4cab012413b25c9d3e30c63548639d0"; + sha256 = "18y4v1s102lh3gvgjwdd66qlsr75wpwpcj8zsk5y5r95a405dkfm"; }; - patches = [ - (fetchpatch { - # https://github.com/ogham/exa/pull/584 - name = "fix-panic-on-broken-symlink-in-git-repository.patch"; - url = "https://github.com/ogham/exa/pull/584/commits/a7a8e99cf3a15992afb2383435da0231917ffb54.patch"; - sha256 = "0n5q483sz300jkp0sbb350hdinmkw7s6bmigdyr6ypz3fvygd9hx"; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; postInstall = '' - installManPage contrib/man/exa.1 + pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 + pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 + installManPage man/exa.1 man/exa_colors.5 installShellCompletion \ - --name exa contrib/completions.bash \ - --name exa.fish contrib/completions.fish \ - --name _exa contrib/completions.zsh + --name exa completions/completions.bash \ + --name exa.fish completions/completions.fish \ + --name _exa completions/completions.zsh ''; # Some tests fail, but Travis ensures a proper build diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/expect/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/expect/default.nix index 12e63686d51..718da8dca4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { done ''; + outputs = [ "out" "dev" ]; + meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix index 0ca5f42f74d..6028140234e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dz6vGRsWc7ubc/drj2Qw/of8AciPgVzc4++Eozg0Luo="; + sha256 = "sha256-zKjYUkkm15YRF0YFJKi2A6twvmHuEyxdWcNs37r2dJg="; }; - cargoSha256 = "sha256-/HBTmLZLhv89mvIVLocw9XbfOgxh9KsjA6KT60IuJeA="; + cargoSha256 = "sha256-e95DRhD22zvizUJOM2It45Bx05iK3KtaMgFPkMbR7iI="; + + doInstallCheck = true; + + installCheckPhase = '' + [[ "$($out/bin/fend "1 km to m")" = "1000 m" ]] + ''; meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix index a923dbf651f..f0ed87bcc22 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/flameshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"; + sha256 = "sha256-E5J61k1tVpbwlzYHbCY1rf9+GODcJRRAQwb0jR4s7BU="; }; nativeBuildInputs = [ cmake qttools qtsvg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index aa9f175e900..a504efbf1eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s"; + sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law"; }; nativeBuildInputs = [ cmake flex bison ]; - patches = [ ./fix-luajit-darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ]; + + # _FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O"; postPatch = '' substituteInPlace src/CMakeLists.txt \ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fontfor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fontfor/default.nix new file mode 100644 index 00000000000..c77809ece1e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fontfor/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, expat +, fontconfig +, freetype +}: + +rustPlatform.buildRustPackage rec { + pname = "fontfor"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "7sDream"; + repo = "fontfor"; + rev = "v${version}"; + sha256 = "1b07hd41blwsnb91vh2ax9zigm4lh8n0i5man0cjmxhavvbfy12b"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + expat + fontconfig + freetype + ]; + + cargoSha256 = "194c4knjfb3pnpvw3zl1srwx3q1jp6z78vzln0q2mk5nf0a35yy0"; + + meta = with lib; { + description = "Find fonts which can show a specified character and preview them in browser"; + homepage = "https://github.com/7sDream/fontfor"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 2140e405ff4..ffee232172c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, lib -, fetchpatch +{ stdenv, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist @@ -15,25 +14,15 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20200314"; + version = "20201107"; - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; }; - patches = [ - # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 - # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see - # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 - # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. - (fetchpatch { - name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; - url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; - sha256 = "14qfp8pwh0vzzib4hq2nc6xhn8lc1cal1sb0lqwb2q5dijqx5kqk"; - }) - ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix index 7416961e84e..963063710a3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "1cqa52n5y6g087w4yzc273jpxhzpinwkqd32azg03dkczbgx5b2v"; + sha256 = "sha256-udHSyw7tf1toB+v67BvJ49INFJdNR2BjQuHEzQJyIoU="; }; - cargoSha256 = "00yhp2b74plrbi944apbxpkw2y6nbgf81sinfchw44ww1i58mfhj"; + cargoSha256 = "sha256-vVIanMkc0sPzu0L48oOh8wEEUOckR/AYkz81u4OR+fE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fwup/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fwup/default.nix index 4d072e6d2bf..5d3259c4b6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -1,27 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config -, zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium -, libarchive, darwin, coreutils }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, DiskArbitration +, pkg-config +, bzip2 +, libarchive +, libconfuse +, libsodium +, lzma +, zlib +, coreutils +, dosfstools +, mtools +, unzip +, zip +, which +, xdelta +}: stdenv.mkDerivation rec { pname = "fwup"; - version = "1.5.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg"; + sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w="; }; - doCheck = true; - patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; + patches = [ ./fix-testrunner-darwin.patch ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; - buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] + buildInputs = [ + bzip2 + libarchive + libconfuse + libsodium + lzma + zlib + ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.DiskArbitration - ]; - propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; + DiskArbitration + ]; + + propagatedBuildInputs = [ + coreutils + dosfstools + mtools + unzip + zip + ]; + + checkInputs = [ + which + xdelta + ]; + + doCheck = true; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix index 837277a5c85..25542543d65 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -1,28 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: buildGoModule rec { pname = "fzf"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8"; + sha256 = "085apa4msw8v8f57942xh7wfw3dkavrl9d58yj6i3yr75l3vg05r"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; outputs = [ "out" "man" ]; - patches = [ - # Fix test failure on go 1.15 - (fetchpatch { - url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch"; - sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1"; - }) - ]; - fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; buildInputs = [ ncurses ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix index 9f9a73a989e..e06d20eb2ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.62"; + version = "0.9.64"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fyr+khLgaX5xbKCW3pqt6fFvZBHGEVs1BsMireZDxP0="; + sha256 = "sha256-NPvkT7jSbDjcZDHpMIOik9fNsz7OJXQ3g9OFxkpA3pk="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index febaa4415a2..b5fc2d0d2bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.155.1"; + version = "0.157.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eVRsDyPlUvVhEnN8aJW8vPw4UqvK2/6pblgnwH2RhkY="; + sha256 = "sha256-wUlAllWBGJBZ98lbf2pOfW3a31r74py5Zh7uszkRYqA="; }; - vendorSha256 = "sha256-VFFwp+n13NL3YpzdWPVzgrH8d4BQHffwpRXvYn9MSaQ="; + vendorSha256 = "sha256-8SOUFlbwGwRuOB50V9eXE9KQWGiSexTZct6Rux6Stuw="; buildFlagsArray = [ "-ldflags=" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix index 5be309be582..8ebb2924b03 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; passthru.tests = { inherit (nixosTests) graylog; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/grc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/grc/default.nix index 8fe35012090..e47ea74bbe9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, buildPythonApplication }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "grc"; - version = "1.11.3"; + version = "1.12"; format = "other"; src = fetchFromGitHub { - owner = "garabik"; - repo = "grc"; - rev = "v${version}"; - sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; + owner = "garabik"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA="; }; postPatch = '' @@ -21,23 +21,20 @@ python3Packages.buildPythonApplication rec { installPhase = '' runHook preInstall - ./install.sh "$out" "$out" install -Dm444 -t $out/share/zsh/vendor-completions _grc - runHook postInstall ''; meta = with lib; { - description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; - platforms = platforms.unix; - + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; + description = "A generic text colouriser"; longDescription = '' Generic Colouriser is yet another colouriser (written in Python) for beautifying your logfiles or output of commands. ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index bc933312afc..19d2e862ec4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -1,10 +1,14 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config +, pkgsBuildBuild +, nixosTests , fuse # only needed for grub-mount +, runtimeShell , zfs ? null , efiSupport ? false , zfsSupport ? false , xenSupport ? false +, kbdcompSupport ? false, ckbcomp }: with lib; @@ -53,11 +57,20 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] + postPatch = if kbdcompSupport then '' + sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@' + '' else '' + echo '#! ${runtimeShell}' > util/grub-kbdcomp.in + echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in + ''; + + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext ]; + buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; + strictDeps = true; + hardeningDisable = [ "all" ]; # Work around a bug in the generated flex lexer (upstream flex bug?) @@ -90,7 +103,10 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; - configureFlags = [ "--enable-grub-mount" ] # dep of os-prober + configureFlags = [ + "--enable-grub-mount" # dep of os-prober + "BUILD_CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" + ] ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; @@ -110,6 +126,14 @@ stdenv.mkDerivation rec { sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" ''; + passthru.tests = { + nixos-grub = nixosTests.grub; + nixos-install-simple = nixosTests.installer.simple; + nixos-install-grub1 = nixosTests.installer.grub1; + nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub; + nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation; + }; + meta = with lib; { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf4/default.nix index d127bc25c3c..5373c64d647 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -4,11 +4,15 @@ , fixDarwinDylibNames , cmake , libjpeg +, uselibtirpc ? stdenv.isLinux , libtirpc , zlib , szip ? null +, javaSupport ? false +, jdk }: -let uselibtirpc = stdenv.isLinux; +let + javabase = "${jdk}/jre/lib/${jdk.architecture}"; in stdenv.mkDerivation rec { pname = "hdf"; @@ -52,9 +56,9 @@ stdenv.mkDerivation rec { libjpeg szip zlib - ] ++ lib.optionals uselibtirpc [ - libtirpc - ]; + ] + ++ lib.optional javaSupport jdk + ++ lib.optional uselibtirpc libtirpc; preConfigure = lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH @@ -75,6 +79,11 @@ stdenv.mkDerivation rec { "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" + ] ++ lib.optionals javaSupport [ + "-DHDF4_BUILD_JAVA=ON" + "-DJAVA_HOME=${jdk}" + "-DJAVA_AWT_LIBRARY=${javabase}/libawt.so" + "-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so" ] ++ lib.optionals (szip != null) [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf5/default.nix index fc7bb635040..e97a6dbdd18 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -8,6 +8,8 @@ , mpiSupport ? false , mpi , enableShared ? !stdenv.hostPlatform.isStatic +, javaSupport ? false +, jdk }: # cpp and mpi options are mutually exclusive @@ -17,11 +19,11 @@ assert !cpp || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.6"; + version = "1.10.7"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082"; }; passthru = { @@ -35,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [] ++ optional (gfortran != null) gfortran - ++ optional (szip != null) szip; + ++ optional (szip != null) szip + ++ optional javaSupport jdk; propagatedBuildInputs = [] ++ optional (zlib != null) zlib @@ -46,7 +49,8 @@ stdenv.mkDerivation rec { ++ optional (gfortran != null) "--enable-fortran" ++ optional (szip != null) "--with-szlib=${szip}" ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] - ++ optional enableShared "--enable-shared"; + ++ optional enableShared "--enable-shared" + ++ optional javaSupport "--enable-java"; patches = [ ./bin-mv.patch diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfjava/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfjava/default.nix deleted file mode 100644 index 70a2f091116..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfjava/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, javac }: - -stdenv.mkDerivation rec { - pname = "hdf-java"; - version = "3.3.2"; - - src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-${version}/src/CMake-hdfjava-${version}.tar.gz"; - sha256 = "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr"; - }; - - nativeBuildInputs = [ cmake javac ]; - - dontConfigure = true; - buildPhase = "./build-hdfjava-unix.sh"; - installPhase = '' - mkdir -p $out - cp -r build/_CPack_Packages/Linux/TGZ/HDFJava-3.3.2-Linux/HDF_Group/HDFJava/${version}/* $out/ - ''; - - meta = { - description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; - license = lib.licenses.free; # BSD-like - homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = lib.platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfview/default.nix index dc13bb52791..8537e5748c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -1,39 +1,58 @@ -{ lib, stdenv, fetchurl, ant, javac, hdf_java }: +{ lib, stdenv, fetchurl, ant, jdk, nettools, hdf4, hdf5, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "hdfview"; - version = "2.14"; + version = "3.1.2"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz"; - sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; + sha256 = "0kyw9i3f817z71l0ak7shl0wqxasz9h5fl05mklyapa7cj27637c"; }; - nativeBuildInputs = [ ant javac ]; + nativeBuildInputs = [ + ant jdk + nettools # "hostname" required + copyDesktopItems + ]; - HDFLIBS = hdf_java; + HDFLIBS = (hdf4.override { javaSupport = true; }).out; + HDF5LIBS = (hdf5.override { javaSupport = true; }).out; buildPhase = '' - ant run - ant package + runHook preBuild + + ant createJPackage + + runHook postBuild ''; + desktopItem = makeDesktopItem rec { + name = "HDFView"; + desktopName = name; + exec = name; + icon = name; + comment = meta.description; + categories = "Science;DataVisualization;"; + }; + installPhase = '' - mkdir $out - # exclude jre - cp -r build/HDF_Group/HDFView/*/{lib,share} $out/ - mkdir $out/bin - cp -r build/HDF_Group/HDFView/*/hdfview.sh $out/bin/hdfview - chmod +x $out/bin/hdfview - substituteInPlace $out/bin/hdfview \ - --replace "@JAVABIN@" "${javac}/bin/" \ - --replace "@INSTALLDIR@" "$out" + runHook preInstall + + mkdir -p $out/bin $out/lib + cp -a build/dist/HDFView/bin/HDFView $out/bin/ + cp -a build/dist/HDFView/lib/app $out/lib/ + ln -s ${jdk}/lib/openjdk $out/lib/runtime + + mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps + cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/ + + runHook postInstall ''; meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; license = lib.licenses.free; # BSD-like - homepage = "https://support.hdfgroup.org/products/java/index.html"; + homepage = "https://portal.hdfgroup.org/display/HDFVIEW/HDFView"; platforms = lib.platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 3bd45730313..5cb5b3872a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.14.2) - html-proofer (3.18.5) + html-proofer (3.18.8) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -15,13 +15,15 @@ GEM typhoeus (~> 1.3) yell (~> 2.0) mercenary (0.4.0) - mini_portile2 (2.4.0) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + mini_portile2 (2.5.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) parallel (1.20.1) public_suffix (4.0.6) + racc (1.5.2) rainbow (3.0.0) typhoeus (1.4.0) ethon (>= 0.9.0) diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/default.nix index ba136b06b8a..73025a212b2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/default.nix @@ -1,4 +1,4 @@ -{ bundlerEnv, ruby, lib }: +{ bundlerEnv, ruby, lib, bundlerUpdateScript }: bundlerEnv rec { name = "${pname}-${version}"; @@ -8,11 +8,13 @@ bundlerEnv rec { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript pname; + meta = with lib; { description = "A tool to validate HTML files"; homepage = "https://github.com/gjtorikian/html-proofer"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 92ce4b8bf82..d05e096f78d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz0041fizdmggc5k9an4s3qk6diyybn2agcia2wr96vymfb2qjh"; + sha256 = "0i5anzj9lp2m6bvghcbz16dlv5ww2mcwgkfj878mamgvb2pfk2m9"; type = "gem"; }; - version = "3.18.5"; + version = "3.18.8"; }; mercenary = { groups = ["default"]; @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; 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"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -104,6 +104,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rainbow = { groups = ["default"]; platforms = []; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ix/default.nix index ed47e477854..83d8a770419 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ix/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 1c2d7ab6717..51134e48c04 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { - owner = "ul"; + owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m"; + sha256 = "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8"; }; - cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; + cargoSha256 = "0g67s6n45rxvv1q5s7x5ajh5n16p68bhlsrsjp46qamrraz63d68"; - buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/keychain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/keychain/default.nix index 49b3ffbb7dd..61abb3eee10 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/keychain/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/keychain/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/{bin,share/man/man1} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/krapslog/default.nix new file mode 100644 index 00000000000..4574d6c3534 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/krapslog/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "krapslog"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "acj"; + repo = "krapslog-rs"; + rev = version; + sha256 = "1yllvy3z3115aqxhnjn9rq2z67rgf2w53naygnl6ixpjhpafcr3k"; + }; + + cargoSha256 = "05gvl6yiyibcdscdf9a6k28xizdr5kfqbhynfbjny2hpqqjmnxzl"; + + meta = with lib; { + description = "Visualize a log file with sparklines"; + homepage = "https://github.com/acj/krapslog-rs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lbdb/default.nix index d33cdbacb15..fd8b805743a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ goobook perl ConvertASN1 perlldap AuthenSASL ] ++ optional (!stdenv.isDarwin) finger_bsd ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index 9b57a295de0..759e8608090 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lf/default.nix index ec002ae4232..7ec9d0d407a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "056g2g503ppbqqbq5nk90sl8ki1q4fixdc25a6wv15gm1inxrb4b"; + sha256 = "0j7c21lsgcc39ng9ni94y3zfcqwyf9jc52fi8mcpkp0lpcx5ava9"; }; - vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; + vendorSha256 = "15fl9v69wkzwzpq6x4xhcd5g6xyck3mlpbz1bbb61l75jjzg913m"; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lice/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lice/default.nix index 3322196d6ed..4cb3f794fd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -1,18 +1,17 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, buildPythonPackage, fetchPypi , setuptools, pytestCheckHook }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { + pname = "lice"; + version = "0.6"; - version = "0.4"; - name = "lice-${version}"; - - src = fetchFromGitHub { - owner = "licenses"; - repo = "lice"; - rev = version; - sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx"; - fetchSubmodules = true; + src = fetchPypi { + inherit pname version; + sha256 = "0skyyirbidknfdzdvsjga8zb4ar6xpd5ilvz11dfm2a9yxh3d59d"; }; + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lifecycled/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lifecycled/default.nix new file mode 100644 index 00000000000..1c30b760a9c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lifecycled/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "lifecycled"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "lifecycled"; + rev = "v${version}"; + sha256 = "F9eovZpwbigP0AMdjAIxULPLDC3zO6GxQmPdt5Xvpkk="; + }; + + vendorSha256 = "q5wYKSLHRzL+UGn29kr8+mUupOPR1zohTscbzjMRCS0="; + + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute init/systemd/lifecycled.unit $out/lib/systemd/system/lifecycled.service \ + --replace /usr/bin/lifecycled $out/bin/lifecycled + ''; + + meta = with lib; { + description = "A daemon for responding to AWS AutoScaling Lifecycle Hooks"; + homepage = "https://github.com/buildkite/lifecycled/"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h grahamc ]; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/lorri/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/lorri/default.nix index 951cb8b5caa..401636ab687 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -14,10 +14,10 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.2"; - gitRev = "43a260c221d5dac4a44fd82271736c8444474eec"; - sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n"; - cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4"; + version = "1.3"; + gitRev = "a26745e404c3a201fe98af4c000bb27f910542b1"; + sha256 = "0gfkqvla2cphyhnl5xw19yf1v4pvwsvphr019y5r914cwqwnkb92"; + cargoSha256 = "1a1alhpivlmxy8iv0ki7s0b8hf3hadashf81rzn207wn3yihsnaf"; in (rustPlatform.buildRustPackage rec { pname = "lorri"; @@ -25,13 +25,13 @@ in (rustPlatform.buildRustPackage rec { meta = with lib; { description = "Your project's nix-env"; - homepage = "https://github.com/target/lorri"; + homepage = "https://github.com/nix-community/lorri"; license = licenses.asl20; maintainers = with maintainers; [ grahamc Profpatsch ]; }; src = fetchFromGitHub { - owner = "target"; + owner = "nix-community"; repo = pname; rev = gitRev; inherit sha256; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/man-db/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/man-db/default.nix index 44cb6962b8e..4ac11aa62c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.3"; + name = "man-db-2.9.4"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "1f4palf5bdyf3f8sa0981cqxn9cjcr2pz53ngrrsybb9n0da2nps"; + sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; }; outputs = [ "out" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch index e92f5a46ae7..6bead60dc56 100755 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch @@ -1,5 +1,5 @@ From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001 -From: Nima Vasseghi +From: Private Date: Wed, 30 Dec 2020 16:06:46 -0800 Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix index dc29aad2a54..125f8f35acc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/memtest86-efi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.3"; + version = "8.4"; src = fetchzip { # TODO: We're using the previous version of memtest86 because the @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # binaries that we make sure to version, then we could probably keep up # with the latest versions released by the company. url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96"; + sha256 = "sha256-jh4FKCYZbOQhRv6B7N8Hmw6RQCQvbBGaGFTMLwM1nk8="; stripRoot = false; }; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { ') mkdir $out mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ + + runHook postInstall ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 7fb66e22e98..81437378c32 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -8,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0hskb72gnp66vkyxsqnxhjcqgvjj7wbd2nm5wxp94abc5l1fiigv"; + sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg="; }; - cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; + cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o="; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 26056364b77..9d2e64d6b70 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -3,7 +3,7 @@ , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - version = "1.23.0"; + version = "1.24.6"; rpath = lib.makeLibraryPath [ alsaLib @@ -49,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv"; + sha256 = "sha256-GTMJ3Mu0vym2u4uZcq5LnbOod1yanCWHbGLXjVq30Hc="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix index 71a12c88796..920cab1763b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Substitute xrandr path with @xrandr@ so we can replace it with + # real path in substituteInPlace + ./xrandr.patch + ]; + + postPatch = '' + substituteInPlace mons.sh --replace '@xrandr@' '${xrandr}/bin/xrandr' + ''; + nativeBuildInputs = [ help2man ]; makeFlags = [ "DESTDIR=$(out)" @@ -22,6 +32,6 @@ stdenv.mkDerivation rec { description = "POSIX Shell script to quickly manage 2-monitors display"; homepage = "https://github.com/Ventto/mons.git"; license = licenses.mit; - maintainers = [ maintainers.mschneider ]; + maintainers = with maintainers; [ mschneider thiagokokada ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/xrandr.patch b/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/xrandr.patch new file mode 100644 index 00000000000..6cbcdf9d514 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mons/xrandr.patch @@ -0,0 +1,14 @@ +diff --git a/mons.sh b/mons.sh +index b86ce5c..feb0f33 100755 +--- a/mons.sh ++++ b/mons.sh +@@ -151,8 +151,7 @@ main() { + # ============================= + + [ -z "$DISPLAY" ] && { echo 'DISPLAY: no variable set.'; exit 1; } +- command -vp xrandr >/dev/null 2>&1 || { echo 'xrandr: command not found.'; exit 1; } +- XRANDR="$(command -pv xrandr)" ++ XRANDR="@xrandr@" + + # ============================= + # Argument Checking diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/moreutils/default.nix index ad2d0127ab0..5a1452007af 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -15,12 +15,13 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook ''; - buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ] ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mslink/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mslink/default.nix new file mode 100644 index 00000000000..56354ff2527 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mslink/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "mslink"; + version = "1.3"; + + src = fetchurl { + url = "http://www.mamachine.org/mslink/mslink_v${version}.tar.gz"; + sha256 = "1qiwqa6w2in6gk4sxiy37c2wwpakin6l2ad2cf5s7ij96z2ijgqg"; + }; + + preBuild = '' + rm mslink # clean up shipped executable + ''; + + installPhase = '' + install -D mslink $out/bin/mslink + ''; + + meta = with lib; { + description = "Create Windows Shortcut Files (.LNK) without using Windows"; + homepage = "http://www.mamachine.org/mslink/index.en.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix index 783f93daab4..2acbfd41adf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/mysqltuner/default.nix @@ -5,23 +5,32 @@ stdenv.mkDerivation rec { version = "1.7.21"; src = fetchFromGitHub { - owner = "major"; - repo = "MySQLTuner-perl"; - rev = version; + owner = "major"; + repo = "MySQLTuner-perl"; + rev = version; sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; + postPatch = '' + substituteInPlace mysqltuner.pl \ + --replace '/usr/share' "$out/share" + ''; + buildInputs = [ perl ]; installPhase = '' - mkdir -p $out/bin - install -m0755 mysqltuner.pl $out/bin/mysqltuner + runHook preInstall + + install -Dm0555 mysqltuner.pl $out/bin/mysqltuner + install -Dm0444 -t $out/share/mysqltuner basic_passwords.txt vulnerabilities.csv + + runHook postInstall ''; meta = with lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; homepage = "http://mysqltuner.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg shamilton ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 1ed201802d5..1826d6846d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub, bash }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "neofetch"; version = "7.1.0"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"; }; - dontBuild = true; + strictDeps = true; + buildInputs = [ bash ]; + postPatch = '' + patchShebangs --host neofetch + ''; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix index efacd87d9a4..3fe8e3f3870 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: +{ lib, stdenv, fetchFromGitHub, gnugrep, nix, nixFlakes }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ="; + sha256 = "sha256-a0OyIONKtVWh9g/FZ6H0JSRuA1U48HSOX53G9z/h7t8="; }; # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - substituteInPlace direnvrc \ - --replace "grep" "${gnugrep}/bin/grep" \ - --replace "nix-shell" "${nix}/bin/nix-shell" \ - --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc + substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix index c5ac32af3be..0c021591e5e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = lib.makeLibraryPath [ xorg.libX11 diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 168eda1cf3d..678c2607b61 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; - buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ autoconf automake curl jdk nettools python git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/os-prober/default.nix index 07279400fc4..bc5dbe4672e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # executables install -Dt $out/bin os-prober linux-boot-prober diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix index 720b73f3fe2..1209ab9d254 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,29 +1,22 @@ { fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { - name = "parallel-20200922"; + pname = "parallel"; + version = "20210222"; src = fetchurl { - url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0wj19kwjk0hwm8bk9yfcf3rpr0314lmjy5xxlvvdqnbbc4ml2418"; + url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; + sha256 = "sha256-TmmwCuti906i/cZXnTHStKTMCmT+dc9hkmMSQC8b5ys="; }; - patches = [ - ./fix-max-line-length-allowed.diff - ]; - - postPatch = '' - substituteInPlace src/parallel --subst-var-by coreutils ${coreutils} - ''; - - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${lib.makeBinPath [ procps perl ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}" ''; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff b/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff deleted file mode 100644 index c6d501ecb22..00000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff +++ /dev/null @@ -1,17 +0,0 @@ -Correct path to coreutils echo to fix parallel --max-line-length-allowed. - -Author: Bjørn Forsman - -diff --git a/src/parallel b/src/parallel -index a047fd94..9fc5f671 100755 ---- a/src/parallel -+++ b/src/parallel -@@ -11580,7 +11580,7 @@ sub is_acceptable_command_line_length($$) { - $len += length $Global::parallel_env; - } - # Force using non-built-in command -- ::qqx("/bin/echo ".${string}x(($len-length "/bin/echo ")/length $string)); -+ ::qqx("@coreutils@/bin/echo ".${string}x(($len-length "@coreutils@/bin/echo ")/length $string)); - ::debug("init", "$len=$? "); - return not $?; - } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix index 7c7a611b97c..e954bfbe5e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/parted/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "parted-3.3"; + name = "parted-3.4"; src = fetchurl { url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp"; + sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pb_cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pb_cli/default.nix index eacbc0d6bd2..48b819d5bfd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pb_cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pb_cli/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0w6a789zffvz4ixsb92q45n5s4xyx7s2l2f07972i3dajaaai8z7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; liveDeps = [ jq curl ] ++ lib.optional screenshots maim ++ lib.optional video capture diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index 8afaa61e35b..970a5bc8265 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -2,16 +2,24 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.6.6"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr"; + sha256 = "sha256-W/UUc0qwOvLSXYWepkCydst113BqR9EsZK0Es+6HSt8="; }; - vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; + vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU="; + + subPackages = [ "cmd" ]; + + buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/pgcenter + ''; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/piston-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/piston-cli/default.nix index bf9c7c9096c..73e3ca8d689 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/piston-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/piston-cli/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "piston-cli"; - version = "1.2.1"; + version = "1.2.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno="; + sha256 = "hhOistr5lHF6rIuMpudKwSuBQhaQDzTdelAOCjyVQZk="; }; propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix index 7ffbd8ded1c..009d841bf55 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb-compat-0_1 makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/plowshare/default.nix index d9c208510fc..0b5005b9c82 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/plowshare/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/plowshare/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ponysay/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ponysay/default.nix index b94ca6cfea3..113c2b05ff5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ponysay/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ponysay/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; - buildInputs = [ python3 texinfo makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 texinfo ]; inherit python3; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index a4ee216288f..2f6ff216dc8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -1,14 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "powerline-go"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pge57OXNE0MY2rlspVsqxdoe1r/XWjrq/q9ygdns2c8="; + sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE="; }; vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; @@ -17,7 +20,9 @@ buildGoModule rec { meta = with lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; - license = licenses.gpl3; + homepage = "https://github.com/justjanne/powerline-go"; + changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}"; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index c8a2b338817..77f865a6a16 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' PREFIX=\"\" DESTDIR=$out make install diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix index 9159de9fd8c..64cc91f170b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "3.1.5"; + version = "4.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; + sha256 = "sha256-564ZHrok5RVFR9OYPpd6WjSZKieNFhnvUbBklayGOb0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pubs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pubs/default.nix index be5fd6d499c..3b6df828fda 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/pws/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/pws/default.nix index 0edec63c8c9..e98323b75ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/pws/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/pws/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "pws-${(import ./gemset.nix).pws.version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = ["installPhase"]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index ac1431d3a1b..a78d6f143a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -1,26 +1,30 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, readline }: stdenv.mkDerivation rec { pname = "rlwrap"; - version = "0.43"; + version = "0.45"; - src = fetchurl { - url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; + src = fetchFromGitHub { + owner = "hanslub42"; + repo = "rlwrap"; + rev = "v${version}"; + sha256 = "1ppkjdnxrxh99g4xaiaglm5bmp24006rfahci0cn1g7zwilkjy8s"; }; - buildInputs = [ readline ]; - - # Be high-bit-friendly - preBuild = '' - sed -i src/readline.c -e "s@[*]p [<] ' '@(*p >= 0) \\&\\& (*p < ' ')@" + postPatch = '' + substituteInPlace src/readline.c \ + --replace "if(*p >= 0 && *p < ' ')" "if(*p >= 0 && (*p >= 0) && (*p < ' '))" ''; - meta = { + nativeBuildInputs = [ autoreconfHook perl ]; + + buildInputs = [ readline ]; + + meta = with lib; { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 0e094a4b2ad..38a43c7ac3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.1"; + version = "2021.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1GpM7IW27MgbXG6iVo5qnWaotwN1GgcXf7dFGRF8s0w="; + sha256 = "sha256-msu5LReTYupgoS6Rm2nrMz9jauciAD99hh+w8BhSYn4="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/sacad/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/sacad/default.nix new file mode 100644 index 00000000000..c5c48c271db --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/sacad/default.nix @@ -0,0 +1,39 @@ +{ lib, python3Packages, jpegoptim, optipng }: + +python3Packages.buildPythonApplication rec { + pname = "sacad"; + version = "2.3.4"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r"; + }; + + propagatedBuildInputs = with python3Packages; [ + aiohttp + appdirs + bitarray + cssselect + fake-useragent + lxml + mutagen + pillow + tqdm + unidecode + web-cache + jpegoptim + optipng + ]; + + # tests require internet connection + doCheck = false; + + pythonImportsCheck = [ "sacad" ]; + + meta = with lib; { + description = "Smart Automatic Cover Art Downloader"; + homepage = "https://github.com/desbma/sacad"; + license = licenses.mpl20; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/savepagenow/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/savepagenow/default.nix new file mode 100644 index 00000000000..d9166d07b74 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/savepagenow/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "savepagenow"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "pastpages"; + repo = pname; + rev = "v${version}"; + sha256 = "1lz6rc47cds9rb35jdf8n13gr61wdkh5jqzx4skikm1yrqkwjyhm"; + }; + + propagatedBuildInputs = with python3Packages; [ click requests ]; + + # requires network access + doCheck = false; + + meta = with lib; { + description = "A simple Python wrapper for archive.org's \"Save Page Now\" capturing service"; + homepage = "https://github.com/pastpages/savepagenow"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/screen/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/screen/default.nix index 0443deae077..70a95957855 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = lib.optional stdenv.hostPlatform.isMusl + patches = [ + (fetchpatch { + # Fixes denial of services in encoding.c, remove > 4.8.0 + name = "CVE-2021-26937.patch"; + url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch"; + sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0"; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix index 3a49876a860..7909aaa1a72 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.9.3"; + version = "0.9.4"; src = fetchCrate { inherit pname version; - sha256 = "026mgqcp9sg6wwikghrc3rgh5p6wdbnvav5pb3xvs79lj85d5ga7"; + sha256 = "0yvjzmz2vqc63l8911jflqf5aww7wxsav2yal5wg9ci9hzq6dl7j"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "07bs23x2vxzlrca5swwq8khmd9fbdhlhm0avwp9y231df6xdi2ys"; + cargoSha256 = "0xh4f8c62kzj2fx7hyhdy13zhay13a6d2d7i9yz0n40dfgf70qx0"; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 423135d53fd..8d8e587879b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,18 +8,18 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "2.8"; + version = "3.0"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1977xyxi9jfj7qra1sz7c9lk885cadpci66jvbzvnwm6d60m05lb"; + sha256 = "1k7829sgvs2ihnf8d3zrqk99ifm9867wcn6f8zg628h8aqsif4fc"; }; pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths; - nativeBuildInputs = [ gitMinimal zip ]; + buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths; + nativeBuildInputs = [ gitMinimal zip makeWrapper ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix index 4bc5c28b559..b3f58c4cdb1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix @@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tab-rs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tab-rs/default.nix index b6c9b35ac87..affea98ea55 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tab-rs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tab-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tab-rs"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "austinjones"; repo = pname; rev = "v${version}"; - sha256 = "1gyl2dxyhh4d2lpxg9s5cx734sfs1kys5z5hjqfgbiny28hp9sw6"; + sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; }; - cargoSha256 = "1apjzn164kakb2snrq1wfl7grm72hkddi3am6d01h5kkngkp68qm"; + cargoSha256 = "0c2478c5gblvci0s68pv8386kxhs88dxzcpd2rq6l82bjn7yzymd"; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tldr/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tldr/default.nix index 25eee1c7b83..dfde5a9113b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tldr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tldr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkg-config ]; - makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix index f3f53627956..830c365fa40 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "473e27f3b69864b905d1340d97917cd202705c761611eb3aec4c24521f69b52c"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 2fb41edaa7c..c6021c0599b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.4.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xrp2oGqJRhjYYZ0dDvYiUfgKM2mazOAlkJQyawDk2y4="; + sha256 = "sha256-UikJZFSnkYGGGMm6hrOqs+ax9HwUsZPht9wV79rJBgE="; }; - cargoSha256 = "sha256-EK48mrTYgh0AgC53rvVRFfdZP/FS9LOZWr8TF13qEl0="; + cargoSha256 = "sha256-8MvXpJVwiIThwq8Du/9nQ0QINpqgemwiRpunzIUqkXk="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index 9e88e5da4f8..fe121c2d51c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { description = "An automatic hinter for TrueType fonts"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index c1dfae68050..f5bbe2de73f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "v${version}"; - sha256 = "1wxsiygw6gwv1h90yassnxylkyi2dfz7y59qkmb7rs8a8javj7nv"; + sha256 = "sha256-F3fOoZYnfIWMrESyVJ/9z6Vou1279avhs600rQayUVA="; }; buildInputs = [ libusb1 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/unclutter/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/unclutter/default.nix index 1b760298191..66344c9fdee 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/unclutter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/unclutter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [xlibsWrapper]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -pv "$out/bin" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/vsh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/vsh/default.nix index f3eb1f9ad8e..a94c58368a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -2,21 +2,17 @@ buildGoModule rec { pname = "vsh"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "1f6szcdakfx3zap1zpkrcs134plv7vnyilzcxs5jbhrrbr6q1807"; + sha256 = "0dhn2aqd52fgasy4j3ar67fzwzcxfi1vl09kni8jwcna8rjgg3fj"; }; - vendorSha256 = "0a2kjql4ibglxkq5dgzr2sxxxm38nf83s4rsk2gd1cf7v0flr02j"; - - # vendor dir in vsh repo is incomplete - deleteVendor = true; - - runVend = true; + # vendor directory is part of repository + vendorSha256 = null; # make sure version gets set at compile time buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index a0392bf4754..05750b962f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation { name = "xvfb-run"; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin cp ${xvfb_run} $out/bin/xvfb-run diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/yad/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/yad/default.nix index 84d4833d63e..29f1ed6d3d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "7.2"; + version = "7.3"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx"; + sha256 = "sha256-3y3QLqUWBSJ9BLI8gd0LQ9SxNhcj5dXpz8Y2Hi2iCwU="; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 1fc8a3916bf..96a4b8e7fee 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.02.10"; + version = "2021.03.03"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn"; + sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 0f81f132abd..02982f9cc4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -11,8 +11,6 @@ , qtgraphicaleffects , qtquickcontrols , qtquickcontrols2 -, qtdeclarative -, qtsvg , yubikey-manager , yubikey-personalization }: @@ -34,8 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; - enableParallelBuilding = true; - pythonPath = [ yubikey-manager ]; dontWrapQtApps = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 64ae387e1a6..79be68c8d56 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo="; + sha256 = "sha256-q4hJ6QAR8cXjXM2e5Et1/DzyEw9L0120sgpTtqGG5wQ="; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix index eda64978c63..33a90636659 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/default.nix index 0976a764a6f..374a76871cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/airfield/default.nix @@ -42,7 +42,8 @@ let in stdenv.mkDerivation { inherit name version src; - buildInputs = [ makeWrapper nodejs ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nodejs ]; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/argus-clients/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/argus-clients/default.nix index ead19b17926..cd935a5f5d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/argus-clients/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/argus-clients/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkg-config, perl }: +{ lib, stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, pkg-config, perl, libtirpc, libnsl }: stdenv.mkDerivation rec { pname = "argus-clients"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj"; }; - patchPhase = '' + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + + postPatch = '' for file in ./examples/*/*.pl; do substituteInPlace $file \ --subst-var-by PERLBIN ${perl}/bin/perl @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-perl=${perl}/bin/perl" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; + buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex libnsl ]; meta = with lib; { description = "Clients for ARGUS"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/atftp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/atftp/default.nix index 0038a5e2e7f..0e76cb94346 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/atftp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/atftp/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; }; - buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/boundary/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/boundary/default.nix index 6c653125c33..37cb23f9876 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "boundary"; - version = "0.1.5"; + version = "0.1.7"; src = fetchsrc version { - x86_64-linux = "sha256-A8dfmFjvOHDwotCyRq9QQ9uHJIkq1JkIwtHsqDqTSNo="; - aarch64-linux = "sha256-i2qc4bmoSzUwNCQmnXLFQ+W4VZjVwXzEBSF3NeTju3M="; - x86_64-darwin = "sha256-lKGTpS2TmgxFdjUsBXKg8Mu6oJA0VidHc/noWWEuUVo="; + x86_64-linux = "sha256-cSD9V/Hj/eEc6k+LMNRnSEA94fA6bQUfCgA+XdqAR4k="; + aarch64-linux = "sha256-MG97PhG/t1rdmTF3n2YHYsTo8VODCaY3cfnv8YHgAY8="; + x86_64-darwin = "sha256-p60UiIy9DGx7AaEvmyo4FLa0Z67MQRNJkw1nHaM6eww="; }; dontConfigure = true; @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { install -D boundary $out/bin/boundary ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/boundary --help + $out/bin/boundary version + runHook postInstallCheck + ''; + dontPatchELF = true; dontPatchShebangs = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/carddav-util/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/carddav-util/default.nix index 39728f7e9a0..112a95eccc6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/carddav-util/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/carddav-util/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; }; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/cassowary/default.nix index b918516f926..f0aecf7363a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1so9EMry7U6GfpxgqLpcqC+ZaWAn4qAsnyDZvo0FAZY="; + sha256 = "sha256-IaS2QU9DBupv06AMzJXBM2iZkNVw31Pt1bOMQNBEiq0="; }; - vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; + vendorSha256 = "sha256-RuwrnuTNfiYpIuohw7OQv95hjOAeWCMuajsZVUUDxBQ="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/chisel/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/chisel/default.nix index 56868e07688..5d82a549e88 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/chisel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/chisel/default.nix @@ -1,18 +1,17 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv }: buildGoModule rec { pname = "chisel"; - version = "1.7.4"; + version = "1.7.6"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1vg9tJLYbW8pfPpw3gQ15c9Kwj2lFfblMRhOK4yWKb8="; + sha256 = "sha256-hUurgwbSUcNZiSi+eVTG/Ija/yxPeWuvEE5pUiG7Dls="; }; vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix index 543c86db307..2091a4aa549 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTkUGsVwK6nwHUQpYhkPYF/Cf4URrr5ThB67sxq7Ecs="; + sha256 = "sha256-T6oBdhBX850GXb19MTOFVo9LRfOgCyMW3GIljMMeGmg="; }; - vendorSha256 = "sha256-J7VGYxX1bH5CeDhpqK9mIbHUekXslImZ+O3wN5Q7kYk="; + vendorSha256 = "sha256-HqlHUVWwvO15nitpwIh/u0GfF8wqJqkviyxOp7QHYz8="; doCheck = false; @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ contrun Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/connect/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/connect/default.nix index 1f0831fb890..8b8c0018c66 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/connect/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/connect/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7"; }; - makeFlags = [ "CC=cc" ]; # gcc and/or clang compat + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat installPhase = '' install -D -m ugo=rx connect $out/bin/connect diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix index 4a4578a7356..79f78c8fff4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.7"; + version = "8.6.8"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Hsxu/gqMKRWBJT7JqOw8Ck+5fQG0D3wSJBb9fgkPsw="; + sha256 = "sha256-ierNKZ14F3EKtQRdOd7D4jhaA7M6zwnFVSk6aUh4VPc="; }; - vendorSha256 = "sha256-ULXC8lVu/TTSzYJ4EpAQvDwntRV0+Vmr8VPaEe54qdA="; + vendorSha256 = "sha256-F/Vxl9Z5LgAmnRt/FOdW9eVN7IVb1ZEKiYOSpT9+L0E="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dhcp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dhcp/default.nix index c56ba5a4a66..751dd2c8c1f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dhcp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dhcp/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { ./set-hostname.patch ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl makeWrapper ]; - buildInputs = [ makeWrapper openldap ]; + buildInputs = [ openldap ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index d92408b3669..d8f4285e0b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "dnsmasq"; - version = "2.83"; + version = "2.84"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; - sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz"; + sha256 = "sha256-YDGVxktzE3YJsH4QJK4LN/ZSsvX+Rn3OZphbPRhQBQw="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 68a6660db9f..6668d6e986a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XwXGhFyPsJWHWea3Cj3X6mOV/oseaRAMaEHoppX+WRw="; + sha256 = "sha256-+k8dGVYyCY+CI8+8OPBqoICu0KO2eM+6Hy8E+KyOqPs="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/ferm/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/ferm/default.nix index f344dec6186..29f9481fe32 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/ferm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/ferm/default.nix @@ -3,12 +3,12 @@ let inherit (lib.versions) majorMinor; in stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.6"; pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; - sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb"; + sha256 = "sha256-aJVBRl58Bzy9YEyc0Y8RPDHAtBuxJhRyalmxfkQFiIU="; }; # perl is used at build time to gather the ferm version. diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix index 480a64127ca..681f6002ca6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-eM3XTZ/Y0Kk5bdC+xskS/btGEVrC50342YBYJdXAlDg="; + sha256 = "sha256-mZJyxbxMIw3jr7ASzYKEfZFh4GS6ZfGKsRkzOtUCYOA="; }; - cargoSha256 = "sha256-U3WXb6qGGshaWJ3GIC+c3W9Y8Cz0O23J7mVojCwitlk="; + cargoSha256 = "sha256-JIyv21u+r2CpgsiW5O7Fy4CWXpkW4jRDrH0CSY2CgiU="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix index 869cd46b330..d31751e7d5c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make CC=cc posix + make CC=${stdenv.cc.targetPrefix}cc posix ''; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail/default.nix index 4e20cbe7441..44481802cc0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ lib.maintainers.raskin lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 40be3d2944a..90f969f2d76 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, lib }: +{ fetchFromGitHub, python3Packages, lib }: python3Packages.buildPythonApplication rec { pname = "getmail6"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 6ff8ba096b4..a682e15891f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o" - ] ++ lib.optional stdenv.isDarwin "CC=cc"; + ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix index ab215952091..92465a9fc72 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,17 +9,18 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"; + sha256 = "sha256-f1ew2i/tgRdIAo/oOgFIFquKve+ImRzqoZqmlzfwpz8="; }; buildInputs = with lib; [ boost zlib openssl ] ++ optional upnpSupport miniupnpc; + makeFlags = let ynf = a: b: a + "=" + (if b then "yes" else "no"); in [ (ynf "USE_AESNI" aesniSupport) @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { (ynf "USE_UPNP" upnpSupport) ]; + enableParallelBuilding = true; + installPhase = '' install -D i2pd $out/bin/i2pd ''; @@ -36,6 +39,6 @@ stdenv.mkDerivation rec { description = "Minimal I2P router written in C++"; license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/isync/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/isync/default.nix index 59315c4bf4b..f6263f187bf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/isync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44"; + sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/kea/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/kea/default.nix index d32c2f5cc57..064aa162fba 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.8.2"; + version = "1.9.3"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0f8x1blfmbcak0cd21jm1zpz4w8iimldhjilwkwgvmmrxnmsfv28"; + sha256 = "sha256-gEuEbqvy/YpXfNkeNcaobI5gH2AvlL6E/lm2HfPATZ8="; }; patches = [ ./dont-create-var.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 7ce5e0ccbf0..a805fe7e9e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.1.5"; + version = "2.2.1"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "0zdh3g491mlc0x4g8q09vq62a7pb8n13a39jnfdgrm9k29khn0sj"; + sha256 = "sha256-Cupi5arScECKmHCBcC0Cmm/64JhidMyNUB75YmGMJag="; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix index 18ae090f211..f34b43f3c32 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx"; + sha256 = "sha256-mNIA524w9iYsSkSTFIwYQIJ4mDKRRqV6NPjw+SjKPe8="; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix index f4ef542a960..6c1f454ca8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.10"; + version = "3.12"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9"; + sha256 = "0n51ng1f8yf5zfsnh8s0pj9bnw6icb2r0y78gl2kzijaghhzlhvd"; }; postPatch = '' @@ -31,12 +31,6 @@ stdenv.mkDerivation rec { patches = [ ./fix-build-mb-len-max.patch ./path-to-cat.patch - # mailquota.c:277: undefined reference to `get_size' - # https://lists.gnu.org/archive/html/bug-mailutils/2020-08/msg00002.html - (fetchpatch { - url = "http://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=37713b42a501892469234b90454731d8d8b7a3e6"; - sha256 = "1mwj77nxvf4xvqf26yjs59jyksnizj0lmbymbzg4kmqynzq3zjny"; - }) # Fix cross-compilation # https://lists.gnu.org/archive/html/bug-mailutils/2020-11/msg00038.html (fetchpatch { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 130a7a18ae0..a6c50e46205 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-02-10T07-32-57Z"; + version = "2021-02-19T05-34-40Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-dwgQ322KV1aR1RYSowHkb7Q0Pn7vuiV6Me1s6cMyaEs="; + sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4="; }; - vendorSha256 = "sha256-MXCZZZ7NGDu8NMBzfIiNdRduvj7d7nboN2r8ObGx4dQ="; + vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix index 5ddbf24bb6a..92c241967ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ protobuf ncurses zlib makeWrapper openssl bash-completion ] + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; + buildInputs = [ protobuf ncurses zlib openssl bash-completion ] ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/mu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/mu/default.nix index 03e19d5cb7a..8f46e657edb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.13"; + version = "1.4.15"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0"; + sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openresolv/default.nix index bc7db4fc6f3..f486c903c5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openresolv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openresolv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; configurePhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 16e97bab214..2120679fef3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; - buildInputs = [ makeWrapper coreutils gawk util-linux ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ coreutils gawk util-linux ]; installPhase = '' install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix index 4ab93b7574a..075d60038d8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -2,11 +2,8 @@ , enableDaemon ? false # build amule daemon , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui -, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }: - -assert httpServer -> libpng != null; -assert client -> libX11 != null; +, fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng +, autoreconfHook, pkg-config, makeWrapper, libX11 }: stdenv.mkDerivation rec { pname = "amule"; @@ -78,5 +75,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom ]; platforms = platforms.unix; + # Could not find crypto++ installation or sources. + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix new file mode 100644 index 00000000000..586fc780699 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "pritunl-ssh"; + version = "1.0.1674.4"; + + src = fetchFromGitHub { + owner = "pritunl"; + repo = "pritunl-zero-client"; + rev = version; + sha256 = "07z60lipbwm0p7s2bxcij21jid8w4nyh6xk2qq5qdm4acq4k1i88"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/bin + install ssh_client.py $out/bin/pritunl-ssh + install ssh_host_client.py $out/bin/pritunl-ssh-host + ''; + + meta = with lib; { + description = "Pritunl Zero SSH client"; + homepage = "https://github.com/pritunl/pritunl-zero-client"; + license = licenses.unfree; + maintainers = with maintainers; [ Thunderbottom ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix index efb57e7d247..85a8cd5d768 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.31"; + version = "3.0.32"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs="; + sha256 = "sha256-xh3kAIxiRF7Bjx8nBAfL8jcuq6k76szcnjI4uy3v7tc="; }; hardeningEnable = [ "pie" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.phreedom ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix index 8eb20538ea9..56a553c0c80 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/proxychains/default.nix @@ -1,27 +1,33 @@ -{ lib, stdenv, fetchFromGitHub } : +{ lib +, stdenv +, fetchFromGitHub +}: + stdenv.mkDerivation rec { pname = "proxychains"; - version = "4.2.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "haad"; - repo = "proxychains"; + repo = pname; rev = "${pname}-${version}"; - sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc"; + sha256 = "083xdg6fsn8c2ns93lvy794rixxq8va6jdf99w1z0xi4j7f1nyjw"; }; postPatch = '' - # Temporary work-around; most likely fixed by next upstream release - sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' + # Suppress compiler warning. Remove it when upstream fix arrives + substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation" ''; + postInstall = '' cp src/proxychains.conf $out/etc ''; - meta = { + meta = with lib; { description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/s5cmd/default.nix new file mode 100644 index 00000000000..f4a6c2915be --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/s5cmd/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "s5cmd"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "peak"; + repo = "s5cmd"; + rev = "v${version}"; + sha256 = "sha256-09vBYwnTfLIuu2SPP7DYB+U6sUkQffglIOHNn4+47qQ="; + }; + + vendorSha256 = null; + + meta = with lib; { + homepage = "https://github.com/peak/s5cmd"; + description = "Parallel S3 and local filesystem execution tool"; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 06d081b745c..cf761c8ca27 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.23"; + version = "1.9.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3"; + sha256 = "1lxx9xzkv3y2qjffa5dmwv0ygka71dx3c2995ggcgy5fb19yrghc"; }; - cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p"; + cargoSha256 = "0p93dv4nlwl5167dmp160l09wqba5d40gaiwc6vbzb4iqdicgwls"; - SODIUM_USE_PKG_CONFIG = 1; + RUSTC_BOOTSTRAP = 1; - buildInputs = [ openssl libsodium ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ]; meta = with lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index bda3d36c245..4a0b3c13394 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "06813k8a1gpakgykz5h75qpdlhrci9r39309n3qqh34ynbjil468"; + sha256 = "sha256-jUxAkC9nMiDiHKyKtmdtOEyb9jqOEiy5D3NqymluX28="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/snabb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/snabb/default.nix index f65f97ed91d..d65f4fae30e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1sas9d9kk92mc2wrwgmm0xxz7ycmh388dwvyxf1hy183yvin1nac"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { ''; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.lukego maintainers.domenkozar ]; + maintainers = [ maintainers.lukego ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/spoofer/default.nix index 23b3f2688c9..a983ef9c42c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl protobuf libpcap traceroute ] ++ optional withGUI qt5.qtbase ; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/swaks/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/swaks/default.nix index fb822177725..49ef0afc060 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/swaks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/swaks/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv"; }; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/swec/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/swec/default.nix index 71fea1c2e83..c98a3417d1c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/swec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/swec/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; - buildInputs = [ makeWrapper perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ]; checkInputs = [ perlPackages.HTTPServerSimple perlPackages.Parent ]; configurePhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpflow/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpflow/default.nix index 74c7f0f1135..cc923c0daf6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpflow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tcpflow/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tcpflow"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "simsong"; repo = pname; rev = "${pname}-${version}"; - sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy"; + sha256 = "0vbm097jhi5n8pg08ia1yhzc225zv9948blb76f4br739l9l22vq"; fetchSubmodules = true; }; @@ -23,8 +23,10 @@ stdenv.mkDerivation rec { substituteInPlace bootstrap.sh \ --replace ".git" "" \ --replace "/bin/rm" "rm" - substituteInPlace configure.ac \ - --replace "1.5.1" "1.5.2" + # Temporary fix for a build error: + # https://src.fedoraproject.org/rpms/tcpflow/blob/979e250032b90de2d6b9e5b94b5203d98cccedad/f/tcpflow-1.6.1-format.patch + substituteInPlace src/datalink.cpp \ + --replace 'DEBUG(6)(s.c_str());' 'DEBUG(6) ("%s", s.c_str());' ''; preConfigure = "bash ./bootstrap.sh"; @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { ''; inherit (src.meta) homepage; license = licenses.gpl3; - maintainers = with maintainers; [ primeos raskin obadz ]; + maintainers = with maintainers; [ raskin obadz ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix index a077ddb3de4..5d1966114b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -31,7 +31,7 @@ in pythonPackages.buildPythonPackage rec { sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/telepresence \ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 059c531cc61..b97c49dd9c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,22 +2,24 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.3"; + version = "0.34.8"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tkIoLYfqlnyyAAgEKyQgE317uwyhc8xRTCTUXi+9r9s="; + sha256 = "sha256:03k44w23167az2kk6ccp3139kykzkhack4w2vy0wvs2lb67xiqd9"; }; - vendorSha256 = "sha256-DviK+MkJwcv2Dhwmqra5G/fTaWxXFbUSUVnAkSHjeII="; - - doCheck = false; + vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg="; subPackages = [ "cmd/tendermint" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; + preBuild = '' + makeFlagsArray+=( + "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" + ) + ''; meta = with lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/tox-node/default.nix index f250b8d6b65..0b682fa97c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/tox-node/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -21,14 +21,6 @@ buildRustPackage rec { SODIUM_USE_PKG_CONFIG = "yes"; - installPhase = '' - runHook preInstall - - install -D $releaseDir/tox-node $out/bin/tox-node - - runHook postInstall - ''; - doCheck = false; cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws="; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix index 24b17af3d3e..232e049e456 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -18,6 +18,9 @@ # , withSystemd ? false , systemd ? null + # optionally support DNS-over-HTTPS as a server +, withDoH ? false +, libnghttp2 }: stdenv.mkDerivation rec { @@ -31,7 +34,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ]; + buildInputs = [ openssl nettle expat libevent ] + ++ lib.optionals withSystemd [ pkg-config systemd ] + ++ lib.optionals withDoH [ libnghttp2 ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -47,6 +52,8 @@ stdenv.mkDerivation rec { "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" + ] ++ lib.optionals withDoH [ + "--with-libnghttp2=${libnghttp2.dev}" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/vpnc/default.nix index a754e7e9937..edb50559fc0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { # `ifconfig' as found in net-tools (not GNU Inetutils). propagatedBuildInputs = [ nettools ]; - buildInputs = [libgcrypt perl makeWrapper openssl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [libgcrypt perl openssl ]; preConfigure = '' sed -i 's|^#OPENSSL|OPENSSL|g' Makefile diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix new file mode 100644 index 00000000000..48b99cadf2b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix @@ -0,0 +1,29 @@ +{ lib, perlPackages, fetchFromGitHub, installShellFiles }: + +perlPackages.buildPerlPackage rec { + pname = "wakeonlan"; + version = "0.41"; + + src = fetchFromGitHub { + owner = "jpoliv"; + repo = pname; + rev = "wakeonlan-${version}"; + sha256 = "0m48b39lz0yc5ckx2jx8y2p4c8npjngxl9wy86k43xgsd8mq1g3c"; + }; + + outputs = [ "out" ]; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + install -Dt $out/bin wakeonlan + installManPage blib/man1/wakeonlan.1 + ''; + + meta = with lib; { + description = "Perl script for waking up computers via Wake-On-LAN magic packets"; + homepage = "https://github.com/jpoliv/wakeonlan"; + license = licenses.artistic1; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/webwormhole/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/webwormhole/default.nix new file mode 100644 index 00000000000..8fbaf3159a2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/webwormhole/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "webwormhole"; + version = "unstable-2021-01-16"; + + src = fetchFromGitHub { + owner = "saljam"; + repo = pname; + rev = "c85e196c8a8a885815136aa8aee1958ad80a3bb5"; + sha256 = "D10xmBwmEbeR3nU4CmppFBzdeE4Pm2+o/Vb5Yd+pPtM="; + }; + + vendorSha256 = "sha256-yK04gjDO6JSDcJULcbJBBuPBhx792JNn+B227lDUrWk="; + + meta = with lib; { + description = "Send files using peer authenticated WebRTC"; + homepage = "https://github.com/saljam/webwormhole"; + license = licenses.bsd3; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/wget2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/wget2/default.nix new file mode 100644 index 00000000000..1537da36163 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/wget2/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch + # build support +, autoreconfHook +, flex +, gnulib +, lzip +, pkg-config +, python3 +, texinfo + # libraries +, brotli +, bzip2 +, gpgme +, libhsts +, libidn2 +, libpsl +, lzma +, nghttp2 +, sslSupport ? true +, openssl +, pcre2 +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "wget2"; + version = "1.99.2"; + + src = fetchFromGitLab { + owner = "gnuwget"; + repo = pname; + rev = version; + sha256 = "1gws8y3z8xzi46c48n7jb162mr3ar4c34s7yy8kjcs14yzq951qz"; + }; + + patches = [ + (fetchpatch { + name = "fix-autotools-2.70.patch"; + url = "https://gitlab.com/gnuwget/wget2/-/commit/580af869093cfda6bc8a9d5901850354a16b3666.patch"; + sha256 = "1x6wq4wxvvy6174d52qrhxkcgmv366f8smxyki49zb6rs4gqhskd"; + }) + (fetchpatch { + name = "update-potfiles-for-gnulib-2020-11-28.patch"; + url = "https://gitlab.com/gnuwget/wget2/-/commit/368deb9fcca0c281f9c76333607cc878c3945ad0.patch"; + sha256 = "1qsz8hbzbgg14wikxsbjjlq0cp3jw4pajbaz9wdn6ny617hdvi8y"; + }) + ]; + + # wget2_noinstall contains forbidden reference to /build/ + postPatch = '' + substituteInPlace src/Makefile.am \ + --replace 'bin_PROGRAMS = wget2 wget2_noinstall' 'bin_PROGRAMS = wget2' + ''; + + nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ]; + + buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl lzma nghttp2 pcre2 zlib zstd ] + ++ lib.optional sslSupport openssl; + + # TODO: include translation files + autoreconfPhase = '' + # copy gnulib into build dir and make writable. + # Otherwise ./bootstrap copies the non-writable files from nix store and fails to modify them + rmdir gnulib + cp -r ${gnulib} gnulib + chmod -R u+w gnulib/{build-aux,lib} + + # fix bashisms can be removed when https://gitlab.com/gnuwget/wget2/-/commit/c9499dcf2f58983d03e659e2a1a7f21225141edf is in the release + sed 's|==|=|g' -i configure.ac + + ./bootstrap --no-git --gnulib-srcdir=gnulib --skip-po + ''; + + configureFlags = [ + "--disable-static" + # TODO: https://gitlab.com/gnuwget/wget2/-/issues/537 + (lib.withFeatureAs sslSupport "ssl" "openssl") + ]; + + outputs = [ "out" "lib" "dev" ]; + + meta = with lib; { + description = "successor of GNU Wget, a file and recursive website downloader."; + longDescription = '' + Designed and written from scratch it wraps around libwget, that provides the basic + functions needed by a web client. + Wget2 works multi-threaded and uses many features to allow fast operation. + In many cases Wget2 downloads much faster than Wget1.x due to HTTP2, HTTP compression, + parallel connections and use of If-Modified-Since HTTP header. + ''; + homepage = "https://gitlab.com/gnuwget/wget2"; + # wget2 GPLv3+; libwget LGPLv3+ + license = with licenses; [ gpl3Plus lgpl3Plus ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 1e401deaa26..5cfb61d7fbf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200827"; + version = "1.0.20210223"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3"; + sha256 = "sha256-YlqviVEYrGYZAJtUg2zAU8AzsQotxguljltC3N2ruUc="; }; outputs = [ "out" "man" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/xh/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/xh/default.nix index b7246959017..1d1736cd816 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Yet another HTTPie clone in Rust"; homepage = "https://github.com/ducaale/xh"; + changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ payas SuperSandro2000 ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/zap/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/zap/default.nix index 183f226f84b..bccc840a27a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -1,31 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: -let jdk = jdk8; in stdenv.mkDerivation rec { pname = "zap"; - version = "2.7.0"; - src = fetchFromGitHub { - owner = "zaproxy"; - repo = "zaproxy"; - rev =version; - sha256 = "1bz4pgq66v6kxmgj99llacm1d85vj8z78jlgc2z9hv0ha5i57y32"; + version = "2.10.0"; + src = fetchurl { + url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; + sha256 = "1mz9s56pbs62g4pnd1ml8y6jpf9ilisdwwvjv5kn6yxrcdi2zzqh"; }; - buildInputs = [ jdk ant ]; + buildInputs = [ jre ]; - buildPhase = '' - cd build - echo -n "${version}" > version.txt - ant -f build.xml setup init compile dist copy-source-to-build package-linux - ''; + # From https://github.com/zaproxy/zaproxy/blob/master/zap/src/main/java/org/parosproxy/paros/Constant.java + version_tag = "2010000"; + # Copying config and adding version tag before first use to avoid permission + # issues if zap tries to copy config on it's own. installPhase = '' - mkdir -p "$out/share" - tar xvf "ZAP_${version}_Linux.tar.gz" -C "$out/share/" - mkdir -p "$out/bin" - echo "#!${runtimeShell}" > "$out/bin/zap" - echo \"$out/share/ZAP_${version}/zap.sh\" >> "$out/bin/zap" - chmod +x "$out/bin/zap" + mkdir -p "$out/bin" "$out/share" + cp -pR . "$out/share/${pname}/" + + cat >> "$out/bin/${pname}" << EOF + #!${runtimeShell} + export PATH="${lib.makeBinPath [ jre ]}:\$PATH" + export JAVA_HOME='${jre}' + if ! [ -f "~/.ZAP/config.xml" ];then + mkdir -p "\$HOME/.ZAP" + head -n 2 $out/share/${pname}/xml/config.xml > "\$HOME/.ZAP/config.xml" + echo "${version_tag}" >> "\$HOME/.ZAP/config.xml" + tail -n +3 $out/share/${pname}/xml/config.xml >> "\$HOME/.ZAP/config.xml" + fi + exec "$out/share/${pname}/zap.sh" "\$@" + EOF + + chmod u+x "$out/bin/${pname}" ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index c17023103f8..04711b3d861 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0a9sjcri96pv4pvvi94g7jyldwfhqqsi1k58maymm0jnqnj91z25"; + sha256 = "06b6k1rzqkd7cdl7n0gz5ky48fs2nhn0q2qxx1rww38vbfc7lpmf"; }; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix new file mode 100644 index 00000000000..275cc88e597 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix @@ -0,0 +1,36 @@ +{ cmake +, fetchFromGitHub +, fping +, lib +, libowlevelzs +, net-snmp +, stdenv +}: + +# TODO: add a services entry for the /etc/zs-apc-spdu.conf file +stdenv.mkDerivation rec { + pname = "zs-apc-spdu-ctl"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "zs-apc-spdu-ctl"; + rev = "v${version}"; + sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ fping libowlevelzs net-snmp ]; + + postPatch = '' + substituteInPlace src/confent.cxx \ + --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping" + ''; + + meta = with lib; { + description = "APC SPDU control utility"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index b177b9a233a..46020233ff1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,21 +1,23 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers -, directory, HUnit, mtl, nix-derivation, process, relude, lib -, stm, text, time, unix, fetchFromGitHub +, cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib +, stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub +, lock-file, data-default, expect, runtimeShell }: -mkDerivation { +mkDerivation rec { pname = "nix-output-monitor"; - version = "0.1.0.2"; + version = "1.0.3.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "0r4348cbmnpawbfa20qw3wnywiqp0jkl5svzl27jrm2yk2g51509"; - rev = "5bf7534"; + sha256 = "1gidg03cwz8ss370bgz4a2g9ldj1lap5ws7dmfg6vigpx8mxigpb"; + rev = "v${version}"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal async attoparsec base containers directory mtl - nix-derivation relude stm text time unix + ansi-terminal async attoparsec base cassava containers directory mtl + nix-derivation relude stm terminal-size text time unix wcwidth lock-file + data-default ]; executableHaskellDepends = [ ansi-terminal async attoparsec base containers directory mtl @@ -25,6 +27,13 @@ mkDerivation { ansi-terminal async attoparsec base containers directory HUnit mtl nix-derivation process relude stm text time unix ]; + postInstall = '' + cat > $out/bin/nom-build << EOF + #!${runtimeShell} + ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom + EOF + chmod a+x $out/bin/nom-build + ''; homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; license = lib.licenses.agpl3Plus; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix index 40e74fba8a8..cfe8a9a1c7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "0w1himwix7iv40rixj9afknwmqg2qmkif23z217gc7x63zyg9vdc"; + sha256 = "sha256-99rYdyDLAdY2JCy/x4wYksrV8mhKPERYjWNh4UOtYrk="; }; - cargoSha256 = "1qzhii72hjdxmgfncvyk80ybvk6zywd6v73bb1ibhnry734grzvw"; + cargoSha256 = "sha256-9XmCZwLzaX61HJWRSi7wf7BdLCOMFYIVXiDNYYfUTlk="; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix index 668a623ee2a..f171a150045 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/cargo-deb/default.nix @@ -8,24 +8,26 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.24.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "b49351f6770aa7aeb053dd1d4a02d6b086caad2a"; - sha256 = "1hs96yv0awgi7ggpxp7k3n21jpv642sm0529b21hs9ib6kp4vs8s"; + rev = "v${version}"; + sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; - - checkType = "debug"; + cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y"; preCheck = '' substituteInPlace tests/command.rs \ - --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/debug" + --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + + # This is an FHS specific assert depending on glibc location + substituteInPlace src/dependencies.rs \ + --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 7eee52f8efa..459b9550b7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.20.5"; + version = "1.20.7.1"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1pg0yd1q9l5cx7pr0853yds1n3mh5b28zkw79gjqjzcmjwqkzwpj"; + sha256 = "sha256-Cq0t5of3l++OvavHuv0W3BSX8c4jvZFG+apz85alY28="; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix index e5da9a1d7b4..798601d1a5b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dDFc13IVD4f5UgiHXAcqRKoZEPTn/iBOogT3XfdstK0="; + sha256 = "sha256-vA+Y4j9Flcrizqh61+4X70FzF5/wK2WVHQRsAUQzKnU="; }; - cargoSha256 = "sha256-QsYOR7tk5cRCF0+xkpJ/F+Z3pjBPxTDFvA1gEi82AOQ="; + cargoSha256 = "sha256-zGdjMpB7h+/RdM+wXffUuAyHnks6umyJmzUrANmqAS8="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock index 9f1a24337b8..e631b63963c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock @@ -4,29 +4,35 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) dotenv (2.7.6) - faraday (1.0.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - licensee (9.14.1) + ruby2_keywords + faraday-net_http (1.0.1) + licensee (9.15.1) dotenv (~> 2.0) - octokit (~> 4.17) + octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.18.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) public_suffix (4.0.6) + racc (1.5.2) reverse_markdown (1.4.0) nokogiri + ruby2_keywords (0.0.4) rugged (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - thor (1.0.1) + thor (1.1.0) PLATFORMS ruby diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix index 281f9376e17..b9b11b465f6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix @@ -21,12 +21,22 @@ version = "2.7.6"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + type = "gem"; + }; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; version = "1.0.1"; @@ -37,20 +47,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5"; + sha256 = "1pvrz9fjvxzk3aq85zgh8dkw98kz54jmwi10k3shc8dqbrlvragy"; type = "gem"; }; - version = "9.14.1"; + version = "9.15.1"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; multipart-post = { groups = ["default"]; @@ -63,15 +73,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"]; @@ -79,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.18.0"; + version = "4.20.0"; }; public_suffix = { groups = ["default"]; @@ -94,6 +104,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; reverse_markdown = { dependencies = ["nokogiri"]; groups = ["default"]; @@ -105,6 +125,16 @@ }; version = "1.4.0"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; rugged = { groups = ["default"]; platforms = []; @@ -131,9 +161,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index bd19f30f1c1..f231e5e9bba 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro="; + sha256 = "sha256-B8bXZ5PjlZIly25jK23ODa+RYGDfxHR0Z2fpAjptgP8="; }; vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ="; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix index 41ce0967b2e..7b52f2585f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0hdvdjm467w37clkhbifn54hbdmnxlbk66cj88lwaz26j4s2ik5g"; }; + nativeBuildInputs = [ makeWrapper ]; + # coreutils, gnutar is actually needed by nix for bootstrap - buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ]; + buildInputs = [ nix coreutils gnutar gzip bzip2 ]; binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix index 0e4005022ff..4dc0098316c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix-pin/default.nix @@ -9,7 +9,8 @@ let self = stdenv.mkDerivation rec { rev = "version-${version}"; sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy"; }; - buildInputs = [ python3 mypy makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 mypy ]; checkPhase = '' mypy bin/* ''; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix index 9ab08007ec7..50eb8d1a47e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -22,7 +22,7 @@ common = , stateDir , confDir , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp - , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp + , withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic , name, suffix ? "", src , patches ? [ ] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix index 0dcbeb8abfe..16ecc7f11de 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nixops/default.nix @@ -63,7 +63,7 @@ in python2Packages.buildPythonApplication { meta = { homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/opkg/default.nix index c4fc804b80f..7f06cbbd3c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.4.4"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "06278gmb26b9nl8l328cc2c2mhfi0dhac65syws17kf09f2m596x"; + sha256 = "sha256-IhesxYuOsxMAYx66514iLrxwDJwc9kCAiHBdGaRyyDk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix index f87ce8258fa..d1d135c1579 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; + dontWrapQtApps = true; + meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/python2nix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/python2nix/default.nix index b6ffe9abc02..c36a488647a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/python2nix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/python2nix/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication { propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; meta = with lib; { - maintainers = [ maintainers.domenkozar ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix index 8993208e16e..5bccb233d20 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/aide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "aide"; - version = "0.17"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-T9iNHV3ccMaYxlGeu8BcjTLD9tgTe7/e/q66r9bbhns="; + sha256 = "sha256-pAHJUZOPEWnOrshozjWUc26JxciBV4wmPYqCSgawAC0="; }; buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/apg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/apg/default.nix index 579026f07ca..a185c09bda6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/apg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/apg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./apg.patch diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/brutespray/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/brutespray/default.nix index 25b9aecb8e0..d7f8e30e182 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/brutespray/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/brutespray/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, medusa }: +{ lib +, stdenv +, python3 +, fetchFromGitHub +, makeWrapper +, medusa +}: stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.6.8"; + version = "1.7.0"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; - rev = "brutespray-${version}"; - sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh"; + rev = "${pname}-${version}"; + sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3"; }; postPatch = '' @@ -33,7 +39,11 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/x90skysn3k/brutespray"; - description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services"; + description = "Tool to do brute-forcing from Nmap output"; + longDescription = '' + This tool automatically attempts default credentials on found services + directly from Nmap output. + ''; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/cryptomator/default.nix new file mode 100644 index 00000000000..c866a527768 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -0,0 +1,91 @@ +{ lib, stdenv, fetchFromGitHub +, autoPatchelfHook +, fuse, packer +, maven, jdk, jre, makeWrapper, glib, wrapGAppsHook +}: + +let + pname = "cryptomator"; + version = "1.5.13"; + + src = fetchFromGitHub { + owner = "cryptomator"; + repo = "cryptomator"; + rev = version; + sha256 = "1s9jl3nl6yfjzmilz9b8azk8592nd39xflzfdf38v6s4iiq86r8j"; + }; + + icons = fetchFromGitHub { + owner = "cryptomator"; + repo = "cryptomator-linux"; + rev = version; + sha256 = "1x6h6wp6yxnj576874xj3d2jm8jmb7918wprqvlz4sryxhlcssa7"; + }; + + # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) + deps = stdenv.mkDerivation { + name = "cryptomator-${version}-deps"; + inherit src; + + nativeBuildInputs = [ jdk maven ]; + + buildPhase = '' + cd main + while mvn -Prelease package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = '' + find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete + find $out/.m2 -type f -iname '*.pom' -exec sed -i -e 's/\r\+$//' {} \; + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "06q8bqdz3c4i84wxl9z5861zwdsw8jzcvsbgxqrnh8rwi7500sa7"; + }; + +in stdenv.mkDerivation rec { + inherit pname version src; + + buildPhase = '' + cd main + mvn -Prelease package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + ''; + + installPhase = '' + mkdir -p $out/bin/ $out/usr/share/cryptomator/libs/ + + cp buildkit/target/libs/* buildkit/target/linux-libs/* $out/usr/share/cryptomator/libs/ + + makeWrapper ${jre}/bin/java $out/bin/cryptomator \ + --add-flags "-classpath '$out/usr/share/cryptomator/libs/*'" \ + --add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \ + --add-flags "-Dcryptomator.ipcPortPath='~/.config/Cryptomator/ipcPort.bin'" \ + --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \ + --add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \ + --add-flags "-Djdk.gtk.version=3" \ + --add-flags "-Xss20m" \ + --add-flags "-Xmx512m" \ + --add-flags "org.cryptomator.launcher.Cryptomator" \ + --prefix PATH : "$out/usr/share/cryptomator/libs/:${lib.makeBinPath [ jre glib ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse ]}" \ + --set JAVA_HOME "${jre.home}" + + # install desktop entry and icons + cp -r ${icons}/resources/appimage/AppDir/usr $out/ + ''; + + nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ]; + buildInputs = [ fuse packer jre glib ]; + + meta = with lib; { + description = "Free client-side encryption for your cloud files"; + homepage = "https://cryptomator.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ bachp ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix index 1222ade4ad7..6c48dd380b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.22.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-Vx+f2IgCOdRxCVppkJNzVDBnsWjt4X96PyCJl9MmfWI="; + sha256 = "sha256-5IoWeFcIzhgWcYjT/BZfNQXsi9F/6WfOJLiv/5rP4Cs="; }; - vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; + vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix index 569b83feb9a..cd90342738e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ pkg-config makeWrapper ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; - buildInputs = [ perl nss nspr pam intltool makeWrapper ] + buildInputs = [ perl nss nspr pam intltool ] ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix index ecd12a2738d..bd558b7ab66 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { phases = [ "installPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/enpass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/enpass/default.nix index 7e2c0fcdb33..107bf56cf82 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -59,7 +59,8 @@ let maintainers = with maintainers; [ ewok ]; }; - buildInputs = [makeWrapper dpkg]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [dpkg]; phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/fprintd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/fprintd/default.nix index 72c0bc204f8..0ae04ddb30f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/fprintd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/fprintd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , pkg-config +, gobject-introspection , meson , ninja , perl @@ -11,9 +11,10 @@ , libxslt , docbook-xsl-nons , docbook_xml_dtd_412 +, fetchurl , glib +, gusb , dbus -, dbus-glib , polkit , nss , pam @@ -24,52 +25,41 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.90.1"; + version = "1.90.9"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; repo = pname; - rev = version; - sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"; + rev = "v${version}"; + sha256 = "rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; }; - patches = [ - # Fixes issue with ":" when there is multiple paths (might be the case on NixOS) - # https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch"; - sha256 = "0f88dhizai8jz7hpm5lpki1fx4593zcy89iwi4brsqbqc7jp9ls0"; - }) - - # Fix locating libpam_wrapper for tests - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch"; - sha256 = "0qqy090p93lzabavwjxzxaqidkcb3ifacl0d3yh1q7ms2a58yyz3"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch"; - sha256 = "1bc9g6kc95imlcdpvp8qgqjsnsxg6nipr6817c1pz5i407yvw1iy"; - }) - ]; - nativeBuildInputs = [ pkg-config meson ninja - perl + perl # for pod2man gettext gtk-doc libxslt - dbus + # TODO: apply this to D-Bus so that other packages can benefit. + # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202 + (dbus.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + ln -s ${fetchurl { + url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml"; + sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I="; + }} $out/share/xml/dbus-1/catalog.xml + ''; + })) docbook-xsl-nons docbook_xml_dtd_412 ]; buildInputs = [ glib - dbus-glib polkit nss pam @@ -78,11 +68,13 @@ stdenv.mkDerivation rec { ]; checkInputs = with python3.pkgs; [ + gobject-introspection # for setup hook python-dbusmock dbus-python pygobject3 pycairo pypamtest + gusb # Required by libfprint’s typelib ]; mesonFlags = [ @@ -103,13 +95,15 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' - patchShebangs po/check-translations.sh + patchShebangs \ + po/check-translations.sh \ + tests/unittest_inspector.py ''; meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar elyhaka ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/galer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/galer/default.nix new file mode 100644 index 00000000000..d64b47bfdaf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/galer/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "galer"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "dwisiswant0"; + repo = pname; + rev = "v${version}"; + sha256 = "1923071rk078mqk5mig45kcrr58ni02rby3r298myld7j9gfnylb"; + }; + + vendorSha256 = "0p5b6cp4ccvcjiy3g9brcwb08wxjbrpsza525fmx38wyyi0n0wns"; + + meta = with lib; { + description = "Tool to fetch URLs from HTML attributes"; + homepage = "https://github.com/dwisiswant0/galer"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix index 51ff5b0e81e..19e5f16924a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - buildPhase = ":"; + dontBuild = true; installPhase = let diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gitjacker/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gitjacker/default.nix index 0b8c087eccd..53350f01317 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/gitjacker/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gitjacker/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitjacker"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "liamg"; repo = "gitjacker"; rev = "v${version}"; - sha256 = "0fg95i2y8sj7dsvqj8mx0k5pps7d0h1i4a3lk85l8jjab4kxx8h9"; + sha256 = "sha256-cMjjVjHGTVT33bknAo2DVH/qPSeazVIIw3RpXGDxF5E="; }; vendorSha256 = null; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 98277461275..66d4c23defb 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -1,21 +1,25 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "gitleaks"; - version = "7.2.0"; + version = "7.2.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y"; + sha256 = "sha256-G/7Ezyfp9vkG1QHTG9Xg6mZ3qhQpx952i7rsSr3fFwY="; }; vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9"; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}") + ''; + meta = with lib; { description = "Scan git repos (or files) for secrets"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/default.nix index c208b44bfd6..0ffcad117f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.0"; + version = "1.12.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0y3dcikw6gl436mhza5j0b3lm49jzl590a9ry53rkmzrv2lqx9w6"; + sha256 = "0ickzq2swhabxqcg32n1i99bam6ip7c0mhhncgvmw332w6pzgvlb"; }; - vendorSha256 = "09lbkm7c361c2s87qi1wpfsqgpp3r862wcn98dzdg5j6pvpgwbag"; + vendorSha256 = "0i0dhipp1gdn0xdl4bpi13ksxf7dc9biz9riapm988bldcr5s1kr"; subPackages = [ "." ]; @@ -41,6 +41,7 @@ buildGoModule rec { ); postInstall = '' + HOME=$TMPDIR for shell in bash fish zsh; do $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell @@ -59,7 +60,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ andir rvolosatovs ]; changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; - platforms = platforms.unix; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/git-credential.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/git-credential.nix new file mode 100644 index 00000000000..fb0da2c1a09 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/git-credential.nix @@ -0,0 +1,41 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "git-credential-gopass"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA="; + }; + + vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + preBuild = '' + buildFlagsArray+=( + "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" + ) + ''; + + postFixup = '' + wrapProgram $out/bin/git-credential-gopass --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Manage git credentials using gopass"; + homepage = "https://github.com/gopasspw/git-credential-gopass"; + license = licenses.mit; + maintainers = with maintainers; [ benneti ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix new file mode 100644 index 00000000000..e060adbf5bc --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix @@ -0,0 +1,42 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, installShellFiles +, gopass +}: + +buildGoModule rec { + pname = "gopass-jsonapi"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "03xhza7n92xg12z83as9qdvvc0yx1qy6q0c7i4njvng594f9a8x2"; + }; + + vendorSha256 = "0d4fyppsdfzvmjb0qvpnfnw0vl6z256bly7hfb0whk6rldks60wr"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + preBuild = '' + buildFlagsArray+=( + "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" + ) + ''; + + postFixup = '' + wrapProgram $out/bin/gopass-jsonapi --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Enables communication with gopass via JSON messages"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ maxhbr ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/hashcat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/hashcat/default.nix index 20b5aed3932..173fdc8b18d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/hashcat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/hashcat/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { "USE_SYSTEM_XXHASH=1" ]; + preFixup = '' + for f in $out/share/hashcat/OpenCL/*.cl; do + sed "s|#include \"\(.*\)\"|#include \"$out/share/hashcat/OpenCL/\1\"|g" -i "$f" + done + ''; + postFixup = '' wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib ''; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/hcxtools/default.nix index a1ba32b35ed..20e28fa1253 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, curl, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, zlib }: stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.0.3"; + version = "6.1.5"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0s9l5mvzcv6hnj7h28piabnm66b09hk2l57vb85ny35w99hzpkc0"; + sha256 = "1xvr89r6287788bx5qbw9sr8jvmajps0rpc7fvh9bfzb6zw2rq6w"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl openssl zlib ]; makeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix index 081e26e34ab..62b335ef5c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/honggfuzz/default.nix @@ -5,13 +5,13 @@ let honggfuzz = stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; + sha256 = "sha256-sU5lmlfmvVWo4K96sI+xQsPfTMd1wsLbihcKI4aTj6g="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix index a5b0fe8d928..d1c56beb081 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; unpackCmd = "${dpkg}/bin/dpkg-deb -x $src ."; - buildInputs = [ makeWrapper jdk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; installPhase = '' mkdir -p $out/share diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/jwt-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/jwt-cli/default.nix index 6b4639a5307..0b3a94d816b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/jwt-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "09zi55ffkhsckvqj84xnxn9bgfkrj9wnzqbh9hfsxzbk4xy7fc2h"; + sha256 = "sha256-82Le0kdt/fnSQwsRRYHy4Jv9rsCPGf5dIWmoZE2cPxY="; }; - cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8"; + cargoSha256 = "sha256-nk4nrsePiUirVPoOPehCOf5ZoGVj3jy7PnSZENnpcaM="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix index 80e6e25518e..4e9b24818b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1jilsczz22fyqbgz43gl5ilz62gfqsahfk30gayj7q5bx9k35m4w"; + sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0="; }; - cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl"; + cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix index d0e260bb677..37af42e33cc 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/kpcli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/kwalletcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/kwalletcli/default.nix index c1849bdca39..d18d5c1ef8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/kwalletcli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/kwalletcli/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "kwalletcli"; - version = "3.02"; + version = "3.03"; src = fetchFromGitHub { owner = "MirBSD"; repo = pname; rev = "${pname}-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1gq45afb5nmmjfqxglv7wvcxcjd9822pc7nysq0350jmmmqwb474"; + sha256 = "sha256-DUtaQITzHhQrqA9QJd0U/5EDjH0IzY9/kal/7SYQ/Ck="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/libtpms/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/libtpms/default.nix new file mode 100644 index 00000000000..67228be6741 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/libtpms/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config, autoreconfHook +, openssl, perl +}: + +stdenv.mkDerivation rec { + pname = "libtpms"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "stefanberger"; + repo = "libtpms"; + rev = "v${version}"; + sha256 = "sha256-/zvMXdAOb4J3YaqdVJvTUI1/JFC0OKwgiYwYgYB62Y4="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl # needed for pod2man + ]; + buildInputs = [ openssl ]; + + outputs = [ "out" "man" "dev" ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-openssl" + "--with-tpm2" + ]; + + meta = with lib; { + description = "The libtpms library provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)"; + homepage = "https://github.com/stefanberger/libtpms"; + license = licenses.bsd3; + maintainers = [ maintainers.baloo ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/masscan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/masscan/default.nix index b58163630c6..891311ddaa0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/masscan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/masscan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 7ffbb5c0323..ff2d70f3924 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.29" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.31" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 926d955d2e8..60aa8ce9eb0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: f54a838fa686f495854a71cb32fadcb1853b6201 - ref: refs/tags/6.0.29 + revision: 56ef940a085620b127d61a516bc10241a795f92b + ref: refs/tags/6.0.31 specs: - metasploit-framework (6.0.29) + metasploit-framework (6.0.31) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -93,26 +93,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.4.5) + actionview (= 5.2.4.5) + activesupport (= 5.2.4.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.4.5) + activesupport (= 5.2.4.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.4.5) + activesupport (= 5.2.4.5) + activerecord (5.2.4.5) + activemodel (= 5.2.4.5) + activesupport (= 5.2.4.5) arel (>= 9.0) - activesupport (5.2.4.4) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -124,22 +124,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.424.0) + aws-partitions (1.428.0) aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.224.0) + aws-sdk-ec2 (1.225.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.47.0) + aws-sdk-iam (1.48.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.42.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.88.0) + aws-sdk-s3 (1.88.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -149,7 +149,7 @@ GEM bcrypt_pbkdf (1.1.0) bindata (2.4.8) bit-struct (0.16) - bson (4.11.1) + bson (4.12.0) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) @@ -168,7 +168,7 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.10.0) eventmachine (1.2.7) - faker (2.15.1) + faker (2.16.0) i18n (>= 1.6, < 2) faraday (1.3.0) faraday-net_http (~> 1.0) @@ -183,9 +183,9 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.8) + i18n (1.8.9) concurrent-ruby (~> 1.0) - io-console (0.5.7) + io-console (0.5.8) irb (1.3.3) reline (>= 0.1.5) jmespath (1.4.0) @@ -215,7 +215,7 @@ GEM activesupport (~> 5.2.2) railties (~> 5.2.2) metasploit-payloads (2.0.28) - metasploit_data_models (4.1.1) + metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) arel-helpers @@ -224,6 +224,7 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) + webrick metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) @@ -273,9 +274,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.4.5) + actionpack (= 5.2.4.5) + activesupport (= 5.2.4.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -294,17 +295,18 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.15) + rex-core (0.1.16) rex-encoder (0.1.5) metasm rex-arch rex-text - rex-exploitation (0.1.26) + rex-exploitation (0.1.27) jsobfu metasm rex-arch rex-encoder rex-text + rexml rex-java (0.1.6) rex-mime (0.1.6) rex-text @@ -325,7 +327,7 @@ GEM rex-text rex-socket (0.1.25) rex-core - rex-sslscan (0.1.5) + rex-sslscan (0.1.6) rex-core rex-socket rex-text @@ -333,6 +335,7 @@ GEM rex-text (0.2.31) rex-zip (0.1.4) rex-text + rexml (3.2.4) rkelly-remix (0.0.7) ruby-macho (2.5.0) ruby-rc4 (0.1.5) diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix index e11b1dd2990..a0fa76e9c7f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,16 +8,16 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.29"; + version = "6.0.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24="; + sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontPatchELF = true; # stay away from exploit executables diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index d33ca7ce03f..429e685b8f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0"; + sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6"; + sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m"; + sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03"; + sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; addressable = { groups = ["default"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp"; + sha256 = "13rvpllihvpksf1jqwa2i5vbv2hhb34viaidw4rkxr3dyygkdpj8"; type = "gem"; }; - version = "1.424.0"; + version = "1.428.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,20 +134,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; + sha256 = "1x2f3jp8p7ag9kw7glkiq60ypqq26ra79qnhms4apqz5www86d4d"; type = "gem"; }; - version = "1.224.0"; + version = "1.225.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; + sha256 = "02xsqb66r7a53a9nnwrhpvd5s9n7wdrvd51c56gs1hlb38j45y0j"; type = "gem"; }; - version = "1.47.0"; + version = "1.48.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; + sha256 = "01zlv2icx3m0pq94z9fcsp1r9ivdqhfpnpbrv63fpr6m7yqww24y"; type = "gem"; }; - version = "1.88.0"; + version = "1.88.1"; }; aws-sigv4 = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp"; + sha256 = "0gny4n34gwfc6x04x7vli5my6cdl90n4i0wsxm758q81hfmkqxd7"; type = "gem"; }; - version = "4.11.1"; + version = "4.12.0"; }; builder = { groups = ["default"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk"; + sha256 = "1jc6wffxnl7rbhg4hpj572f38fkxgrkgvv5imgzamrdmw55h206b"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.0"; }; faraday = { groups = ["default"]; @@ -424,20 +424,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.8"; + version = "1.8.9"; }; io-console = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l"; + sha256 = "0prpvq05wzp8n7vk44zcwmn53p1akn4r105n5py6bmbxsmmkvyhr"; type = "gem"; }; - version = "0.5.7"; + version = "0.5.8"; }; irb = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f54a838fa686f495854a71cb32fadcb1853b6201"; - sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20"; + rev = "56ef940a085620b127d61a516bc10241a795f92b"; + sha256 = "1lx8fl1hkas4hpkj3c976pv5ybfm2spzzwhs693n57hd5xwxbpn2"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.29"; + version = "6.0.31"; }; metasploit-model = { groups = ["default"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f"; + sha256 = "1kzlvq20ml4b5lr1qbrkmivdi37mxi8fasdqg4yla2libfbdz008"; type = "gem"; }; - version = "4.1.1"; + version = "4.1.2"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -886,10 +886,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9"; + sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; rake = { groups = ["default"]; @@ -966,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16"; + sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w"; type = "gem"; }; - version = "0.1.15"; + version = "0.1.16"; }; rex-encoder = { groups = ["default"]; @@ -986,10 +986,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc"; + sha256 = "1b10rcrw52nj2aswsn0kwv0s601rbn077k0r6n5lblip6fbrqz9i"; type = "gem"; }; - version = "0.1.26"; + version = "0.1.27"; }; rex-java = { groups = ["default"]; @@ -1086,10 +1086,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06gbx45q653ajcx099p0yxdqqxazfznbrqshd4nwiwg1p498lmyx"; + sha256 = "0r58n1ifbay1gq3kln9yg5iqjwp69l0pmb9sqakhqwhjlhzqx2kr"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-struct2 = { groups = ["default"]; @@ -1121,6 +1121,16 @@ }; version = "0.1.4"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; rkelly-remix = { groups = ["default"]; platforms = []; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/nmap-unfree/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/nmap-unfree/default.nix new file mode 100644 index 00000000000..1e6ed42bae4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/nmap-unfree/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchurl +, libpcap +, pkg-config +, openssl +, lua5_3 +, pcre +, liblinear +, libssh2 +, zlib +, withLua ? true +}: + +stdenv.mkDerivation rec { + pname = "nmap-unfree"; + version = "7.91"; + + src = fetchurl { + url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; + sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace libz/configure \ + --replace /usr/bin/libtool ar \ + --replace 'AR="libtool"' 'AR="ar"' \ + --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; + + configureFlags = [ + (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua") + ]; + + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "AR=${stdenv.cc.bintools.targetPrefix}ar" + "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" + "CC=${stdenv.cc.targetPrefix}gcc" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + pcre + liblinear + libssh2 + libpcap + openssl + zlib + ]; + + enableParallelBuilding = true; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Open source utility for network discovery and security auditing"; + homepage = "http://www.nmap.org"; + # Nmap Public Source License Version 0.93 + # https://github.com/nmap/nmap/blob/master/LICENSE + license = licenses.unfree; + maintainers = with maintainers; [ fab SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/nosqli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/nosqli/default.nix new file mode 100644 index 00000000000..3163d168371 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/nosqli/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "nosqli"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "Charlie-belmer"; + repo = pname; + rev = "v${version}"; + sha256 = "006z76v4a3pxzgnkj5nl0mrlsqmfgvg51w20dl118k2xa70zz63j"; + }; + + vendorSha256 = "01spdh2gbzp6yg2jbiwfnyhqb5s605hyfxhs0f9h4ps4qbi1h9cv"; + + meta = with lib; { + description = "NoSql Injection tool for finding vulnerable websites using MongoDB"; + homepage = "https://github.com/Charlie-belmer/nosqli"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/open-ecard/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/open-ecard/default.nix index c46d5b65cd8..5c07add9056 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/open-ecard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/open-ecard/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { phases = "installPhase"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; desktopItem = makeDesktopItem { name = appName; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix index 0fd14901d0d..11b4eecd14d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/extensions/import.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: let pythonEnv = pythonPackages.python.withPackages (p: [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix index b6547deb560..3b5aedf81a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "131jpcwyyzgzjn9lx4k1zn95pd68pjw4i41jfzcp9z9fnazyln5n"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/pcsclite/default.nix index 1d874a16da6..3d966c575cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/pcsclite/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pcsclite"; - version = "1.9.0"; + version = "1.9.1"; outputs = [ "bin" "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - sha256 = "1y9f9zipnrmgiw0mxrvcgky8vfrcmg6zh40gbln5a93i2c1x8j01"; + sha256 = "sha256-c8R4m3h2qDOnD0k82iFlXf6FaJ2bfilwHCQyduVeaDo="; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/default.nix index 3b1f21ac718..b52e7279fa9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/default.nix @@ -15,6 +15,8 @@ let nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace client/Makefile --replace '-ltermcap' ' ' substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 04def66d03c..2ae34439472 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 , readline , hardwarePlatform ? "PM3RDV4" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix index 3724637c604..d248fb19a27 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/rage/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc="; + sha256 = "sha256-oYCARqG5YwKO0b73aEMLr/xzXl6xBEMCvE1HMCtMq20="; }; - cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs="; + cargoSha256 = "sha256-vadXIdqfmol4thHIwpkQCn7HsXdxo0l+6CBm3QIJmeA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/rhash/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/rhash/default.nix index f4cc65f5d8e..c602ec622cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/rhash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "18zgr1bjzz8v6rckz2q2hx9f2ssbv8qfwclzpbyjaz0c1c9lqqar"; + sha256 = "sha256-kmi1FtJYPBUdMfJlzEsQkTwcYB99isP3yzH1EYlk54g="; }; nativeBuildInputs = [ which ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 57a92ef4b99..e2f1ab7cdb6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.27.1"; + version = "2.28.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2"; + sha256 = "sha256-2t1MytLjAxhVVsWyMYcQZ9c+ox+X2OszG5mLAv8c7xE="; }; runVend = true; - vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy"; + vendorSha256 = "sha256-8Kox01iyWhv/Fp7jHPeNXxc/K2TT1WPyWFieHZkqLho="; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/secretscanner/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/secretscanner/default.nix new file mode 100644 index 00000000000..93d440009f3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/secretscanner/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, hyperscan +, pkg-config +}: + +buildGoModule rec { + pname = "secretscanner"; + version = "20210214-${lib.strings.substring 0 7 rev}"; + rev = "42a38f9351352bf6240016b5b93d971be35cad46"; + + src = fetchFromGitHub { + owner = "deepfence"; + repo = "SecretScanner"; + inherit rev; + sha256 = "0yga71f7bx5a3hj5agr88pd7j8jnxbwqm241fhrvv8ic4sx0mawg"; + }; + + vendorSha256 = "0b7qa83iqnigihgwlqsxi28n7d9h0dk3wx1bqvhn4k01483cipsd"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ hyperscan ]; + + postInstall = '' + mv $out/bin/SecretScanner $out/bin/$pname + ''; + + meta = with lib; { + description = "Tool to find secrets and passwords in container images and file systems"; + homepage = "https://github.com/deepfence/SecretScanner"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/shhgit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/shhgit/default.nix new file mode 100644 index 00000000000..a05eba1282c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/shhgit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "shhgit"; + version = "0.4-${lib.strings.substring 0 7 rev}"; + rev = "7e55062d10d024f374882817692aa2afea02ff84"; + + src = fetchFromGitHub { + owner = "eth0izzle"; + repo = pname; + inherit rev; + sha256 = "1b7r4ivfplm4crlvx571nyz2rc6djy0xvl14nz7m0ngh6206df9k"; + }; + + vendorSha256 = "0isa9faaknm8c9mbyj5dvf1dfnyv44d1pjd2nbkyfi6b22hcci3d"; + + meta = with lib; { + description = "Tool to detect secrets in repositories"; + homepage = "https://github.com/eth0izzle/shhgit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ssb/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ssb/default.nix new file mode 100644 index 00000000000..d6305e4cf4a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ssb/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ssb"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "kitabisa"; + repo = pname; + rev = "v${version}"; + sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1"; + }; + + vendorSha256 = "1q3dxizyz9bcdfs5j2bzhl2aadhd00cvzhj202wlls0zrlb9pp4f"; + + meta = with lib; { + description = "Tool to bruteforce SSH server"; + homepage = "https://github.com/kitabisa/ssb"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix index 2fdc42e5280..a7ef677759f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-audit/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "jtesta"; repo = pname; rev = "v${version}"; - sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm"; + sha256 = "sha256-Xq1q/i43vZAv8BayVOdKuZ3+mJcQQ0x4Kc3WlASE6m8="; }; checkInputs = with python3Packages; [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix index 487cc44cdd7..fc07714b55b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-pgp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-pgp"; rev = version; - sha256 = "sha256-TDrpnWAez8muysMdmKFBDZfK8CyhGn1VqHB8+zD6jSk="; + sha256 = "sha256-5Wg0ItAkAb0zlhzcuDT9o0XIIbG9kqk4mIYb6hSJlsI="; }; - vendorSha256 = "sha256-ZF/WsmqmGHZIAGTPKJ70UhtmssNhiInEZfzrKxQLw9I="; + vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc="; checkInputs = [ gnupg ]; checkPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/sslscan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/sslscan/default.nix index fcf9c4c1ac2..b072b3b5574 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/stricat/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/stricat/default.nix index 460838965a0..bdd7d18923f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/stricat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/stricat/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/swtpm/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/swtpm/default.nix new file mode 100644 index 00000000000..2bd0326d4d9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libtasn1, openssl, fuse, glib, libseccomp +, libtpms +, unixtools, expect, socat +, gnutls +, perl +, python3, python3Packages +}: + +stdenv.mkDerivation rec { + pname = "swtpm"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "stefanberger"; + repo = "swtpm"; + rev = "v${version}"; + sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk="; + }; + + pythonPath = with python3Packages; requiredPythonModules [ + setuptools + cryptography + ]; + + patches = [ + # upstream looks for /usr directory in $prefix to check + # whether or not to proceed with installation of python + # tools (swtpm_setup utility). + ./python-installation.patch + ]; + + prePatch = '' + patchShebangs src/swtpm_setup/setup.py + patchShebangs samples/setup.py + ''; + + nativeBuildInputs = [ + pkg-config unixtools.netstat expect socat + perl # for pod2man + autoreconfHook + python3 + ]; + buildInputs = [ + libtpms + openssl libtasn1 libseccomp + fuse glib + gnutls + python3.pkgs.wrapPython + ]; + propagatedBuildInputs = pythonPath; + + configureFlags = [ + "--with-cuse" + ]; + + postInstall = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath" + ''; + + enableParallelBuilding = true; + + outputs = [ "out" "man" ]; + + meta = with lib; { + description = "Libtpms-based TPM emulator"; + homepage = "https://github.com/stefanberger/swtpm"; + license = licenses.bsd3; + maintainers = [ maintainers.baloo ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch b/infra/libkookie/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch new file mode 100644 index 00000000000..d2689f051c5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch @@ -0,0 +1,60 @@ +commit 353794feb596d95e3f8893e39b174c5a89d1013e +Author: Arthur Gautier +Date: Wed Feb 17 02:27:40 2021 +0000 + + python-install + + Signed-off-by: Arthur Gautier + +diff --git a/samples/Makefile.am b/samples/Makefile.am +index 7d69bf8..1803bb9 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -39,19 +39,9 @@ python-uninstall: + $(PIP3) uninstall -y $(PY_PACKAGE_NAME) + + if PYTHON_INSTALLATION +-install-exec-local: $(PY_PACKAGE) +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ +- else \ +- $(MAKE) python-install; \ +- fi ++install-exec-local: python-install + +-uninstall-local: +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Cleanup for distcheck build not implemented" ; \ +- else \ +- $(MAKE) python-uninstall; \ +- fi ++uninstall-local: python-uninstall + endif + + +diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am +index 529eefe..533b1b3 100644 +--- a/src/swtpm_setup/Makefile.am ++++ b/src/swtpm_setup/Makefile.am +@@ -29,19 +29,9 @@ python-uninstall: + $(PIP3) uninstall -y $(PY_PACKAGE_NAME) + + if PYTHON_INSTALLATION +-install-exec-local: $(PY_PACKAGE) +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ +- else \ +- $(MAKE) python-install; \ +- fi ++install-exec-local: python-install + +-uninstall-local: +- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ +- echo "Cleanup for distcheck build not implemented" ; \ +- else \ +- $(MAKE) python-uninstall; \ +- fi ++uninstall-local: python-uninstall + endif + + # for out-of-tree builds we need to clean up diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/teler/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/teler/default.nix index 4a971243ad1..e2a895f0747 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/teler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "teler"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3"; + sha256 = "sha256-6OeGlpimQtw4w26HRzw2wmd3wjASY199p8XXPD/JMy8="; }; - vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz"; + vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s="; # test require internet access doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/terrascan/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/terrascan/default.nix index b37273aeb1d..ab4a7197647 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RZFh9RVU8RwtLGIP7OWnf0yNsXfElqWSXieljqp8ahU="; + sha256 = "sha256-mPd4HsWbPUNJTUNjQ5zQztoXZy2b9iLksdGKAjp0A58="; }; - vendorSha256 = "sha256-Ya/33ocPhY5OSnCEyULsOIHaxwb1yNEle3JEYo/7/Yk="; + vendorSha256 = "sha256-eNQTJHqOCOTAPO+vil6rkV9bNWZIdXxGQPE4IpETFtA="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix index 8766e957aaf..f040b17f892 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.4.7"; + version = "0.4.5.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j"; + sha256 = "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2"; }; outputs = [ "out" "geoip" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index 6b33d1d4d59..73368f40476 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, lib -, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss +, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss, libuuid , abrmdSupport ? true, tpm2-abrmd ? null }: stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "4.1.3"; + version = "5.0"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0117r0zzdnblkibv81y71v3limixsw5m7g9xwf7lcx8fc8836pdv"; + sha256 = "sha256-4bkH/imHdigFLgithO68bD92RtKVBe1IYulhYqjJG6E="; }; nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; buildInputs = [ - curl openssl tpm2-tss + curl openssl tpm2-tss libuuid ]; preFixup = let diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix index 51261768550..0b6c95cafd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1g6fz6dl90cb5pnvvmkndqgncfjy50j9jw3xzn8s91yzvvld8ds7"; + sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9"; }; goPackagePath = "github.com/hashicorp/vault"; @@ -32,6 +32,6 @@ buildGoPackage rec { changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index b30f8d1af13..59082c89f7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.6.2"; + version = "1.6.3"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1vcxnky8qnn2ib33r9604cbjrgm939ddrhwqcjylbv217cmc9alf"; + sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0mcav36dcmvky8v4y65jvh837i72aqz7arv2ivjpajym3gf7qrq1"; + sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "1is7s445jc4ll2lyfxgjwwl89fly1l8kskqp2p8z179d8hhgd0ms"; + sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0i5d87a393464r68rjv83bjhg51yaysccqbwaaydmzk1m45icg7x"; + sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i"; }; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/security/wafw00f/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/security/wafw00f/default.nix new file mode 100644 index 00000000000..dae4f5a5ad0 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/security/wafw00f/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pluginbase +, requests +}: + +buildPythonApplication rec { + pname = "wafw00f"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "EnableSecurity"; + repo = pname; + rev = "v${version}"; + sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; + }; + + propagatedBuildInputs = [ + requests + pluginbase + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "wafw00f" ]; + + meta = with lib; { + description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; + homepage = "https://github.com/EnableSecurity/wafw00f"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix index b4bef5fc5e3..f86ac47fdde 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.5.3"; + version = "1.6.1"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M="; + sha256 = "sha256-oz3C1150CPfT0kkx1x7VIX/Rm06dkjyxeDPFCRJaWNc="; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch index 232ac780341..7f86f6eda0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch @@ -1,8 +1,17 @@ diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 482a544..d142013 100644 +index a685db8..1ca1ca1 100644 --- a/auto_cpufreq/core.py +++ b/auto_cpufreq/core.py -@@ -163,31 +163,13 @@ def get_current_gov(): +@@ -72,7 +72,7 @@ def app_version(): + print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) + else: + print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- else: ++ else: + # source code (auto-cpufreq-installer) + try: + print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) +@@ -179,31 +179,13 @@ def get_current_gov(): return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor") def cpufreqctl(): @@ -38,8 +47,8 @@ index 482a544..d142013 100644 def footer(l=79): print("\n" + "-" * l + "\n") -@@ -212,74 +194,12 @@ def remove_complete_msg(): - +@@ -233,74 +215,12 @@ def remove_complete_msg(): + footer() def deploy_daemon(): - print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") @@ -60,7 +69,7 @@ index 482a544..d142013 100644 - except: - print("\nERROR:\nWas unable to turn off bluetooth on boot") - -- auto_cpufreq_log_path.touch(exist_ok=True) +- auto_cpufreq_stats_path.touch(exist_ok=True) - - print("\n* Deploy auto-cpufreq install script") - shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") @@ -102,12 +111,12 @@ index 482a544..d142013 100644 - # remove auto-cpufreq-remove - os.remove("/usr/bin/auto-cpufreq-remove") - -- # delete log file -- if auto_cpufreq_log_path.exists(): -- if auto_cpufreq_log_file is not None: -- auto_cpufreq_log_file.close() +- # delete stats file +- if auto_cpufreq_stats_path.exists(): +- if auto_cpufreq_stats_file is not None: +- auto_cpufreq_stats_file.close() - -- auto_cpufreq_log_path.unlink() +- auto_cpufreq_stats_path.unlink() - - # restore original cpufrectl script - cpufreqctl_restore() @@ -116,6 +125,15 @@ index 482a544..d142013 100644 def gov_check(): for gov in get_avail_gov(): +@@ -331,7 +251,7 @@ def countdown(s): + if auto_cpufreq_stats_file is not None: + auto_cpufreq_stats_file.seek(0) + auto_cpufreq_stats_file.truncate(0) +- ++ + # execution timestamp + from datetime import datetime + now = datetime.now() diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh index 63a2b5b..e157efe 100755 --- a/scripts/cpufreqctl.sh diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix index 6754d0806b6..f10c3f628b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/bpytop/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.61"; + version = "1.0.63"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E6blMhDkZa3Wbdbsw7f8jdHwHFINOQ48XC5pQdkVPtQ="; + sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = with python3Packages; [ python psutil ]; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix index dbcbae6eaa9..9c5b54f554b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/clinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clinfo"; - version = "3.0.20.11.20"; + version = "3.0.21.02.21"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; rev = version; - sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422"; + sha256 = "sha256-0ijfbfv1F6mnt1uFH/A4yOADJoAFrPMa3yAOFJW53ek="; }; buildInputs = [ ocl-icd opencl-headers ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/consul-template/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/consul-template/default.nix index a285c720eaa..c04b6967580 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "1205rhv4mizpb1nbc2sry52n7wljcwb8xp7lpazh1r1cldfayr5b"; + sha256 = "sha256-r9/CxXFaeod48NgOFWhl+axiNqjaU+RIEHI71fmYzP8="; }; - vendorSha256 = "0hv4b6k8k7xkzkjgzcm5y8pqyiwyk790a1qw18gjslkwkyw5hjf2"; + vendorSha256 = "sha256-DLjaDj3fJYl5ICxJuaCLKdd/AfwfUIM8teJLs3a2MHo="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix index 58f8da3ce4f..13b19775dec 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/daemon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "daemon"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; - sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn"; + sha256 = "sha256-uh9tyHUyyFK/uPQ2F5zWYcNFj/iY9ndnxBQSMZhibf0="; }; makeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/freeipmi/default.nix index 9529ccad399..f7e041a849d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.6"; + version = "1.6.7"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg"; + sha256 = "1gyyx99q02p3v2nqm3h53mkjd33l0hrapwg4alg6qr9k74qik1dv"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/gdu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/gdu/default.nix index 0c63bf651ba..c6f4d5dc585 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -6,27 +7,35 @@ buildGoModule rec { pname = "gdu"; - version = "4.3.2"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m4J797bmQzKuyA01JgDLVlf+PbXDVXWtYbID/0QVLxE="; + sha256 = "sha256-HIVLerSx0XLMvRRJUUGT1M50DbSsFNutOSM5HTTV9mc="; }; - vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; - - buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ]; + vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}" + ]; + + postPatch = '' + substituteInPlace cmd/app/app_test.go --replace "development" "${version}" + ''; + postInstall = '' installManPage gdu.1 ''; - # tests fail if the version is set - doCheck = false; + doCheck = !(stdenv.isAarch64 || stdenv.isDarwin); meta = with lib; { description = "Disk usage analyzer with console interface"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/gptfdisk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/gptfdisk/default.nix index b5f7c369dfd..b3b084fbe71 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/gptfdisk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/gptfdisk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f"; + sha256 = "sha256-3cVR1kOlPwvURANF064yxJsEp5fpwBA26kYLa7QWjKg="; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix index b941c5f7275..1cceb5b009c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -31,7 +31,8 @@ in stdenv.mkDerivation rec { sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs="; }; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/logrotate/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/logrotate/default.nix index 513b48c6630..f8f3cabdb9c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/logrotate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/logrotate/default.nix @@ -4,37 +4,31 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "133k4y24p918v4dva6dh70bdfv13jvwl2vlhq0mybrs3ripvnh4h"; + sha256 = "sha256-OFGXwaTabyuIgeC2ON68m83rzVxomk8QL6xwyrVV654="; }; # Logrotate wants to access the 'mail' program; to be done. - patchPhase = '' - sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac - - ${lib.optionalString (mailutils != null) '' - sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac - ''} - ''; - - autoreconfPhase = '' - ./autogen.sh - ''; + configureFlags = [ + "--with-compress-command=${gzip}/bin/gzip" + "--with-uncompress-command=${gzip}/bin/gunzip" + ] ++ lib.optionals (mailutils != null) [ + "--with-default-mail-command=${mailutils}/bin/mail" + ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ]; - meta = { + meta = with lib; { homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix index 3460020618f..8a2a3406c3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/monit/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; license = lib.licenses.agpl3; - maintainers = with lib.maintainers; [ raskin wmertens ]; + maintainers = with lib.maintainers; [ raskin wmertens ryantm ]; platforms = with lib.platforms; linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix index e727734be6d..bd360a24261 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid -, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch +, curl, libcap, libuuid, lm_sensors, zlib , nixosTests , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.29.1"; + version = "1.29.3"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-Wmfqxjy0kCy8vsegoe+Jn5Az/XEZxeHZDRMLmOrp+Iw="; + sha256 = "sha256-GWIQZEC5agJ+Zw7l58IIAJhXP6dxirCmWVBJulzBO5Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -36,6 +36,8 @@ in stdenv.mkDerivation rec { ++ optionals withSsl [ openssl.dev ]; patches = [ + # required to prevent plugins from relying on /etc + # and /var ./no-files-in-etc-and-var.patch ]; @@ -77,7 +79,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/pciutils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/pciutils/default.nix index a89de032abd..8c017c42d7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, zlib, kmod, which +, hwdata , static ? stdenv.hostPlatform.isStatic -, darwin ? null +, IOKit }: stdenv.mkDerivation rec { @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib kmod which ] ++ - lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + lib.optional stdenv.hostPlatform.isDarwin IOKit; preConfigure = if stdenv.cc.isGNU then null else '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" @@ -30,8 +31,15 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-lib" ]; - # Get rid of update-pciids as it won't work. - postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; + postInstall = '' + # Remove update-pciids as it won't work on nixos + rm $out/sbin/update-pciids $out/man/man8/update-pciids.8 + + # use database from hwdata instead + # (we don't create a symbolic link because we do not want to pull in the + # full closure of hwdata) + cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids + ''; meta = with lib; { homepage = "http://mj.ucw.cz/pciutils.html"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix index 4a2e14edc91..f64a84c5509 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/rofi-systemd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 954c9eb4110..8d0539d118f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -6,11 +6,11 @@ let version = "7.2"; - dbrev = "5164"; + dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "1vj0sv3bgcd0lwk5x450brfyxksa5fn1mjgvmj994ab8spmicc43"; + sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn"; name = "smartmontools-drivedb.h"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix index 750a0954d3f..05c0b69c922 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/snooze/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Tool for waiting until a particular time and then running a command"; maintainers = with maintainers; [ kaction ]; license = licenses.cc0; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/stressapptest/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/stressapptest/default.nix new file mode 100644 index 00000000000..9b7eb0a6f3e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/stressapptest/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, libaio +}: + +stdenv.mkDerivation rec { + pname = "stressapptest"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1qzj6h6adx042rb9aiz916jna269whibvj5ys4p5nwdp17fqh922"; + }; + + buildInputs = [ libaio ]; + + meta = with lib; { + description = "Userspace memory and IO stress test tool"; + homepage = "https://github.com/stressapptest/stressapptest"; + license = with licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix index 638caa3c62b..f9e0e80478d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/tre-command/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tre-command"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "10c8mpqzpw7m3vrm2vl2rx678z3c37hxpqyh3fn83dlh9f4f0j87"; + sha256 = "0syvhpnw9c5csxv8c4gdfwif9a9vl4rjkwj4mfglgxk227k1y53q"; }; - cargoSha256 = "0jd6cfs2zi2n34kirpsy12l76whaqwm1pkqa57w1ms5z658z07wj"; + cargoSha256 = "056wlxz8hzky8315rnn65nh7dd2yhx5323y3hq64g6aqj52vd734"; nativeBuildInputs = [ installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/system/uroboros/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/system/uroboros/default.nix new file mode 100644 index 00000000000..7f25c70c297 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/system/uroboros/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "uroboros"; + version = "20210304-${lib.strings.substring 0 7 rev}"; + rev = "9bed95bb4cc44cfd043e8ac192e788df379c7a44"; + + src = fetchFromGitHub { + owner = "evilsocket"; + repo = pname; + inherit rev; + sha256 = "1a1bc2za2ppb7j7ibhykgxwivwmx7yq0593255jd55gl60r0l7i4"; + }; + + vendorSha256 = "1ml3x00zzkwj1f76a4wk2y8z4bxjhadf2p1li96qjpnc8fgfd50l"; + + meta = with lib; { + description = "Tool for monitoring and profiling single processes"; + homepage = "https://github.com/evilsocket/uroboros"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/boxes/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/boxes/default.nix index 3c58eda6501..f39349b2fbf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/boxes/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/boxes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 -t $out/bin src/boxes diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/dirdiff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/dirdiff/default.nix new file mode 100644 index 00000000000..b49df59b29e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/dirdiff/default.nix @@ -0,0 +1,59 @@ +{ copyDesktopItems, fetchurl, lib, makeDesktopItem, stdenv, tcl, tk }: + +stdenv.mkDerivation rec { + pname = "dirdiff"; + version = "2.1"; + + src = fetchurl { + url = "https://www.samba.org/ftp/paulus/${pname}-${version}.tar.gz"; + sha256 = "0lljd8av68j70733yshzzhxjr1lm0vgmbqsm8f02g03qsma3cdyb"; + }; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ tcl tk ]; + + # Some light path patching. + patches = [ ./dirdiff-2.1-vars.patch ]; + postPatch = '' + for file in dirdiff Makefile; do + substituteInPlace "$file" \ + --subst-var out \ + --subst-var-by tcl ${tcl} \ + --subst-var-by tk ${tk} + done + ''; + + # If we don't create the directories ourselves, then 'make install' creates + # files named 'bin' and 'lib'. + preInstall = '' + mkdir -p $out/bin $out/lib + ''; + + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "dirdiff"; + exec = "dirdiff"; + desktopName = "Dirdiff"; + genericName = "Directory Diff Viewer"; + comment = "Diff and merge directory trees"; + categories = "Development;"; + }) + ]; + + meta = with lib; { + description = "Graphical directory tree diff and merge tool"; + longDescription = '' + Dirdiff is a graphical tool for displaying the differences between + directory trees and for merging changes from one tree into another. + ''; + homepage = "https://www.samba.org/ftp/paulus/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ khumba ]; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch b/infra/libkookie/nixpkgs/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch new file mode 100644 index 00000000000..4e7aa025754 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch @@ -0,0 +1,32 @@ +diff '--color=auto' -ru dirdiff-2.1/dirdiff dirdiff-2.1-patched/dirdiff +--- dirdiff-2.1/dirdiff 2005-04-20 03:09:53.000000000 -0700 ++++ dirdiff-2.1-patched/dirdiff 2021-02-14 22:54:09.837692023 -0800 +@@ -1,6 +1,6 @@ + #!/bin/sh + # Tcl ignores the next line \ +-exec wish "$0" -- "${1+$@}" ++exec @tk@/bin/wish "$0" -- "${1+$@}" + + # Copyright (C) 1999-2004 Paul Mackerras. All rights reserved. + # This program is free software; it may be used, copied, modified +@@ -17,7 +17,7 @@ + set TclExe [info nameofexecutable] + set compound_ok [expr {$tcl_version >= 8.4}] + +-set nofilecmp [catch {load libfilecmp.so.0.0}] ++set nofilecmp [catch {load @out@/lib/libfilecmp.so.0.0}] + set rcsflag {} + set diffbflag {} + set diffBflag {} +diff '--color=auto' -ru dirdiff-2.1/Makefile dirdiff-2.1-patched/Makefile +--- dirdiff-2.1/Makefile 2005-04-19 03:22:01.000000000 -0700 ++++ dirdiff-2.1-patched/Makefile 2021-02-14 22:54:58.575400923 -0800 +@@ -7,7 +7,7 @@ + INSTALL=install + + # You may need to change the -I arguments depending on your system +-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl ++CFLAGS=-O3 -I@tcl@/include + + all: libfilecmp.so.0.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix index e700d7c486e..951f236d04a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/jsawk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr"; }; dontBuild = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin cp $src/jsawk $out/bin/ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix index fe2078222d2..b3f48085d1d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix @@ -4,21 +4,26 @@ with lib; let perlDeps = with perlPackages; [ - ConfigOnion DateCalc - FileBaseDir YAMLLibYAML - GetoptLongDescriptive DateTimeFormatStrptime + DateCalc + DateTimeFormatStrptime + enum + FileBaseDir + GetoptLongDescriptive + ListMoreUtils + RegexpCommon StringInterpolate + YAMLLibYAML ]; in stdenv.mkDerivation rec { pname = "ledger2beancount"; - version = "2.1"; + version = "2.5"; src = fetchFromGitHub { - owner = "zacchiro"; + owner = "beancount"; repo = "ledger2beancount"; rev = version; - sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; + sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; }; phases = [ @@ -50,7 +55,7 @@ in stdenv.mkDerivation rec { Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved. ''; - homepage = "https://github.com/zacchiro/ledger2beancount"; + homepage = "https://github.com/beancount/ledger2beancount"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pablovsky ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mark/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mark/default.nix index dbfb85fc583..5989750ea95 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "5.2"; + version = "5.2.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-bjDQwtIsY+Dvv270DACvyU+MNPyI7EZcob6F/aebVac="; + sha256 = "sha256-eRKUoRr0FPVNUZV5WenA7GlpYPAVRNKe0uRxOzFjhVE="; }; vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g="; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/markdown-pp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/markdown-pp/default.nix index 50ef560f6c3..c6e937eab27 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/markdown-pp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/markdown-pp/default.nix @@ -1,13 +1,15 @@ -{ fetchFromGitHub, pythonPackages, lib }: +{ lib +, fetchFromGitHub +, python3 +}: -with pythonPackages; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "MarkdownPP"; version = "1.5.1"; - propagatedBuildInputs = [ pillow watchdog ]; + propagatedBuildInputs = with python3.pkgs; [ pillow watchdog ]; checkPhase = '' cd test - PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py + PATH=$out/bin:$PATH ${python3}/bin/${python3.executable} test.py ''; src = fetchFromGitHub { owner = "jreese"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix index 98fb6e69be5..838cdf075bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-cS2fME3X8bFmEz6czoL+2ZFbflJP58+lIeC5SVleCNg="; + sha256 = "sha256-51S4I1YIbdgXkhuT7KnhJe71nGCQmr9JmuGtp7Bcxqo="; }; - cargoSha256 = "sha256-iuJyprLp6HofcdH0NgNK2Vl+1FtdAvZPcltPUb5B2XU="; + cargoSha256 = "sha256-2kBJcImytsSd7Q0kj1bsP/NXxyy2Pr8gHb8iNf6h3/4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/mpage/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/mpage/default.nix index 9bde7f388dc..99cfec97a70 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/mpage/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/mpage/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; - patchPhase = '' + postPatch = '' sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g" + substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc' ''; meta = { @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { license = "liberal"; # a non-copyleft license, see `Copyright' file homepage = "http://www.mesa.nl/pub/mpage/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/numdiff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/numdiff/default.nix index db27c1bfd0c..317d29003cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/numdiff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/numdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libintl }: stdenv.mkDerivation rec { @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; + + buildInputs = [ libintl ]; + meta = with lib; { description = '' A little program that can be used to compare putatively similar files @@ -18,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/podiff/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/podiff/default.nix index b44003a9f0d..8db0085a70e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/podiff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/podiff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "podiff"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.2.tar.gz"; - sha256 = "1l2b4hh53xlx28riigwarzkhxpv1pcz059xj1ka33ccvxc6c20k9"; + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.3.tar.gz"; + sha256 = "sha256-7fpix+GkXsfpRgnkHtk1iXF6ILHri7BtUhNPK6sDQFA="; }; patchPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix index 63d0c05e543..185b2a41c46 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/popfile/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/popfile/default.nix index ef945235a90..e2f5952077f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/popfile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/popfile/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ ## These are all taken from the popfile documentation as applicable to Linux ## http://getpopfile.org/docs/howtos:allplatformsrequireperl perl diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/reckon/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/reckon/default.nix index bbefa94637d..b37928fc7c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/reckon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/reckon/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = let env = bundlerEnv { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ripgrep/default.nix index 61e534fa732..8c9eef9cc3d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -1,9 +1,9 @@ { lib, stdenv -, nixosTests , fetchFromGitHub , rustPlatform , asciidoctor , installShellFiles +, pkg-config , Security , withPCRE2 ? true , pcre2 ? null @@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoctor installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ] + ++ lib.optional withPCRE2 pkg-config; buildInputs = (lib.optional withPCRE2 pcre2) - ++ (lib.optional stdenv.isDarwin Security); + ++ (lib.optional stdenv.isDarwin Security); preFixup = '' installManPage $releaseDir/build/ripgrep-*/out/rg.1 @@ -35,7 +36,15 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh complete/_rg ''; - passthru.tests = { inherit (nixosTests) ripgrep; }; + doInstallCheck = true; + installCheckPhase = '' + file="$(mktemp)" + echo "abc\nbcd\ncde" > "$file" + $out/bin/rg -N 'bcd' "$file" + $out/bin/rg -N 'cd' "$file" + '' + lib.optionalString withPCRE2 '' + echo '(a(aa)aa)' | $out/bin/rg -P '\((a*|(?R))*\)' + ''; meta = with lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix index 6f484bed8bc..c9e8b046986 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/rst2html5/default.nix @@ -3,12 +3,12 @@ let pname = "rst2html5"; version = "1.10.6"; -in python3Packages.buildPythonPackage { - inherit pname version; format = "wheel"; +in python3Packages.buildPythonPackage { + inherit pname version format; src = python3Packages.fetchPypi { - inherit pname version; + inherit pname version format; sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg="; }; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index bfbfd899316..935f593177b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "1cb76kzw34yr1r135lyd75ddm9v99m7i3lyirm353cdch8qspfmv"; + sha256 = "047ghk0zfmcsnbr4h2h5ar7g1sw2mnk8r2887v81dh3vf767rqg2"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/source-highlight/default.nix index c8eb43a51c9..6e1a7b24b59 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; + outputs = [ "out" "doc" "dev" ]; + meta = with lib; { description = "Source code renderer with syntax highlighting"; longDescription = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix index 83cb0e46388..5806723a043 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.1.0"; + version = "3.1.7"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l"; + sha256 = "sha256-nCpU4GBJ/4c/70hgVKfO1995XCyDRLVUeczsqnlkkFM="; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/uni2ascii/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/uni2ascii/default.nix index 19c95dcec63..e2bda04d13f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/uni2ascii/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/uni2ascii/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { similar ASCII characters, e.g. by stripping diacritics. ''; maintainers = with lib.maintainers; [ goibhniu ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/unoconv/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/unoconv/default.nix index 97a3b4d725e..9f3375c7e41 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/unoconv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/unoconv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr"; }; - buildInputs = [ asciidoc makeWrapper ]; + nativeBuildInputs = [ asciidoc makeWrapper ]; preBuild = '' makeFlags=prefix="$out" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/unrtf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/unrtf/default.nix index 57ffe95988d..3357404a7d3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/unrtf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/unrtf/default.nix @@ -1,22 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }: +{ lib, stdenv, fetchurl, autoconf, automake, libiconv }: stdenv.mkDerivation rec { pname = "unrtf"; - version = "0.21.9"; + version = "0.21.10"; src = fetchurl { - url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz"; - sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; + url = "https://ftp.gnu.org/gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1bil6z4niydz9gqm2j861dkxmqnpc8m7hvidsjbzz7x63whj17xl"; }; - patches = [ - (fetchpatch { - name = "CVE-2016-10091-0001-convert.c-Use-safe-buffer-size-and-snprintf.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849705;filename=0001-convert.c-Use-safe-buffer-size-and-snprintf.patch;msg=20"; - sha256 = "0s0fjvm3zdm9967sijlipfrwjs0h23n2n8fa6f40xxp8y5qq5a0b"; - }) - ]; - nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libiconv ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/yaml-merge/default.nix index d36522edb87..7c4ecc49df5 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/text/yaml-merge/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/yaml-merge/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Merge YAML data files"; homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix new file mode 100644 index 00000000000..839a5493374 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix @@ -0,0 +1,41 @@ +{ bash +, coreutils +, fetchurl +, gnugrep +, lib +, makeWrapper +, moreutils +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "zstxtns-utils"; + version = "0.0.3"; + + src = fetchurl { + url = "https://ytrizja.de/distfiles/zstxtns-utils-${version}.tar.gz"; + sha256 = "I/Gm7vHUr29NClYWQ1kwu8HrNZpdLXfE/nutTNoqcdU="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash coreutils gnugrep moreutils ]; + + installPhase = '' + runHook preInstall + install -D -t $out/bin zstxtns-merge zstxtns-unmerge + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/zstxtns-merge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep moreutils]}" + wrapProgram $out/bin/zstxtns-unmerge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep]}" + ''; + + meta = with lib; { + description = "utilities to deal with text based name service databases"; + homepage = "https://ytrizja.de/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index 61af8102f51..849da7e606c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,6 +147,8 @@ stdenv.mkDerivation rec { pname = "asciidoc"; version = "9.0.4"; + # Note: a substitution to improve reproducibility should be updated once 10.0.0 is + # released. See the comment in `patchPhase` for more information. src = fetchFromGitHub { owner = "asciidoc"; repo = "asciidoc-py3"; @@ -261,7 +263,15 @@ stdenv.mkDerivation rec { '') + '' patchShebangs . - sed -i -e "s,/etc/vim,,g" Makefile.in + # Note: this substitution will not work in the planned 10.0.0 release: + # + # https://github.com/asciidoc/asciidoc-py3/commit/dfffda23381014481cd13e8e9d8f131e1f93f08a + # + # Update this substitution to: + # + # --replace "python3 -m asciidoc.a2x" "python3 -m asciidoc.a2x -a revdate=01/01/1980" + substituteInPlace Makefile.in \ + --replace "python3 a2x.py" "python3 a2x.py -a revdate=01/01/1980" ''; preInstall = "mkdir -p $out/etc/vim"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix index 91d8f6f8d32..affa12c4019 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; - buildInputs = [ perlPackages.perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; installPhase = '' mkdir -p "$out/bin/" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix index fdfa05f20c1..4b9e571c0ad 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { # writes its output to stdout instead of creating a file. patches = [ ./db2x_texixml-to-stdout.patch ]; - buildInputs = [ texinfo groff libxml2 libxslt makeWrapper opensp libiconv ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ texinfo groff libxml2 libxslt opensp libiconv ] ++ (with perlPackages; [ perl XMLSAX XMLParser XMLNamespaceSupport ]); postConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/fop/default.nix index a572ce216ee..1c5e7b0079d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/fop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/fop/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { pname = "fop"; - version = "2.1"; + version = "2.6"; src = fetchurl { url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; - sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; + sha256 = "145qph3c0m4bmb342qxq1hwsg594lndmfs9ga1v7pk53s34sckq8"; }; buildInputs = [ ant jdk ]; - buildPhase = "ant"; + # build only the "package" target, which generates the fop command. + buildPhase = '' + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant -f fop/build.xml package + ''; installPhase = '' mkdir -p $out/bin $out/lib $out/share/doc/fop - - cp build/*.jar lib/*.jar $out/lib/ - cp -r README examples/ $out/share/doc/fop/ + cp fop/build/*.jar fop/lib/*.jar $out/lib/ + cp -r README fop/examples/ $out/share/doc/fop/ # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 805373e8ee6..1040532eb3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "28kwj053lm3510cq7pg4rqx6linv5zphhm2h6r9icigclfq7j9ybnd7vqbn2v4ay0r8ghac5cjbqab5zy8cjlgllwhwsxg0dnk75x2i"; + sha512 = "07xy6yjs24zkwrr06ly4ln5czvm3azw6iznx6m8gbrmzblkcp3gz1jcl9wclcyl8bs4xhgmyzkf5k67b95s0jndhyb9ap5zy6ixnias"; }; nativeBuildInputs = [ which ] diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix index 10f8525da08..755ac6bb32a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6"; }; - buildInputs = [ ocaml perl makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml perl ]; installPhase = '' mkdir -p $out/bin cp -p pdfsandwich $out/bin diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sile/default.nix index eef7768be8f..92062b8eac8 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.14"; + version = "0.10.15"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "100f6iangpiwlv8k55d134w856r0xwsgw90s1rkkmqa5syziwni5"; + sha256 = "0p1w3s6j34qi93aycqmqggfm277n90z90nlmm1j3qizxxwq5gda9"; }; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix index 07c972420ab..8a5b4811d77 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/sshlatex/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = let binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix index 937e3ffd7d7..07e89f9f8ed 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/ted/default.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; meta = with lib; { description = "An easy rich text processor"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index fd1815efa94..d2858a90885 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -270,8 +270,8 @@ dvipng = stdenv.mkDerivation { inherit (common) src; - nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + nativeBuildInputs = [ perl pkg-config makeWrapper ]; + buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript ]; preConfigure = '' cd texk/dvipng diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/vcsi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/vcsi/default.nix index 84e6c2e6d41..f4f3043f34f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/video/vcsi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/video/vcsi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "vcsi"; - version = "7.0.12"; + version = "7.0.13"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0dks0yr2a0cpr32vrwhdrhsb4qyj7rz1yv44fjbr8z8j8p84yjx5"; + sha256 = "01qwbb2l8gwf622zzhh0kzdzw3njvsdwmndwn01i9bn4qm5cas8r"; }; propagatedBuildInputs = with python3Packages; [ @@ -17,6 +17,9 @@ python3Packages.buildPythonApplication rec { parsedatetime ]; + doCheck = false; + pythonImportsCheck = [ "vcsi" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/video/yamdi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/video/yamdi/default.nix index 32620fe98c5..92737e27ee3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/video/yamdi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/video/yamdi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D {,$out/bin/}yamdi diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/aws/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/aws/default.nix index 4766be90a6d..d3a5cbf10e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/aws/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/aws/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, curl }: stdenv.mkDerivation { - name = "aws-1.75"; + name = "aws-2019.06.18"; src = fetchurl { - url = "https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws"; - sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; + url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws"; + sha256 = "02bym9wicqpdr7mdim13zw5ssh97xfswzab9q29rsbg7058ddbil"; }; buildInputs = [ perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index 796ea36eacf..1c9e8149232 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -92,5 +92,6 @@ in with localPython.pkgs; buildPythonApplication rec { description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 24ecb7f99c3..dfd3321b6b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -8,7 +8,6 @@ , requests , jsonschema , jsonpatch -, pytest , httpretty , dmidecode , pytestCheckHook @@ -17,11 +16,9 @@ , openssh }: -let version = "20.3"; - -in buildPythonApplication { +buildPythonApplication rec { pname = "cloud-init"; - inherit version; + version = "20.3"; namePrefix = ""; src = fetchFromGitHub { @@ -81,10 +78,10 @@ in buildPythonApplication { export TMPDIR=/tmp ''; - meta = { + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; - maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ madjar phile314 ]; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix index eafd740b065..00df6bd97e1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { version = "1.5.7"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; src = fetchurl { url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix index 8e3ab0d9f28..0c3aec2aadf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 02ad6af90da..b399b3d6917 100755 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -458,7 +458,9 @@ elsif ($action eq "run") { elsif ($action eq "show-ip") { my $s = read_file($confFile) or die; - $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m or die "$0: cannot get IP address\n"; + $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m + or $s =~ /^LOCAL_ADDRESS6=([0-9a-f:]+)(\/[0-9]+)?$/m + or die "$0: cannot get IP address\n"; print "$1\n"; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 511c61caf57..028d05e633b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.1.18"; + version = "0.2.9"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc="; + sha256 = "sha256-S2nH1E20frsJzW2RCn+eJ9ylVdhVbo4wesNwlQll9S4="; }; - vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w="; + vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/clipman/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/clipman/default.nix similarity index 86% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/clipman/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/clipman/default.nix index 80a0afe68d3..3a2c2ca6015 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/clipman/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/clipman/default.nix @@ -1,4 +1,9 @@ -{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }: +{ buildGoModule +, fetchFromGitHub +, lib +, wl-clipboard +, makeWrapper +}: buildGoModule rec { pname = "clipman"; @@ -24,9 +29,9 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/yory8/clipman"; - license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; description = "A simple clipboard manager for Wayland"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/kanshi/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/kanshi/default.nix similarity index 87% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/kanshi/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/kanshi/default.nix index 90ee2a3446b..c661c98a24b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/kanshi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/kanshi/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland +}: stdenv.mkDerivation rec { pname = "kanshi"; @@ -15,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { + homepage = "https://github.com/emersion/kanshi"; description = "Dynamic display configuration tool"; longDescription = '' kanshi allows you to define output profiles that are automatically enabled @@ -24,8 +33,6 @@ stdenv.mkDerivation rec { kanshi can be used on Wayland compositors supporting the wlr-output-management protocol. ''; - homepage = "https://github.com/emersion/kanshi"; - downloadPage = "https://github.com/emersion/kanshi"; license = licenses.mit; maintainers = with maintainers; [ balsoft ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/wayland/oguri/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/oguri/default.nix new file mode 100644 index 00000000000..458ea310a01 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/oguri/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, gdk-pixbuf +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "oguri"; + version = "unstable-2020-12-19"; + + src = fetchFromGitHub { + owner = "vilhalmer"; + repo = pname; + rev = "6937fee10a9b0ef3ad8f94f606c0e0d9e7dec564"; + sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + cairo + gdk-pixbuf + wayland + wayland-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/vilhalmer/oguri/"; + description = "A very nice animated wallpaper daemon for Wayland compositors"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/slurp/default.nix similarity index 86% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/slurp/default.nix index ed4bb0037fb..107ef68da56 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/slurp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/slurp/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, cairo, libxkbcommon, wayland, wayland-protocols +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, cairo +, libxkbcommon +, wayland +, wayland-protocols , buildDocs ? true, scdoc }: @@ -33,7 +41,7 @@ stdenv.mkDerivation rec { description = "Select a region in a Wayland compositor"; homepage = "https://github.com/emersion/slurp"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; + platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wev/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wev/default.nix similarity index 88% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/wev/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/wev/default.nix index c1debfd924d..83e4113f7ea 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/wev/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wev/default.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchurl -, pkg-config, scdoc, wayland -, wayland-protocols, libxkbcommon +{ lib +, stdenv +, fetchurl +, pkg-config +, scdoc +, wayland +, wayland-protocols +, libxkbcommon }: stdenv.mkDerivation rec { @@ -18,14 +23,14 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/wev"; description = "Wayland event viewer"; longDescription = '' This is a tool for debugging events on a Wayland window, analagous to the X11 tool xev. ''; - homepage = "https://git.sr.ht/~sircmpwn/wev"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix similarity index 75% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix index 676ff03ad9b..0bc195e9626 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, wayland, wayland-protocols }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { pname = "wl-clipboard"; @@ -16,10 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { - description = "Command-line copy/paste utilities for Wayland"; homepage = "https://github.com/bugaevc/wl-clipboard"; - license = licenses.gpl3; + description = "Command-line copy/paste utilities for Wayland"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; }; } +# TODO: is wayland-protocols a nativeBuildInput or a buildInput? diff --git a/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlogout/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlogout/default.nix new file mode 100644 index 00000000000..2625405808c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlogout/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, scdoc +, gtk3 +, libxkbcommon +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "wlogout"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "ArtsyMacaw"; + repo = "wlogout"; + rev = version; + sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + buildInputs = [ + gtk3 + libxkbcommon + wayland + wayland-protocols + ]; + + postPatch = '' + substituteInPlace style.css \ + --replace "/usr/share/wlogout" "$out/share/${pname}" + + substituteInPlace main.c \ + --replace "/etc/wlogout" "$out/etc/${pname}" + ''; + + mesonFlags = [ + "--datadir=${placeholder "out"}/share" + "--sysconfdir=${placeholder "out"}/etc" + ]; + + meta = with lib; { + homepage = "https://github.com/ArtsyMacaw/wlogout"; + description = "A wayland based logout menu"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: shell completions diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix similarity index 75% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix index b635316bf77..e2c941998a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +}: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -11,13 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; }; - nativeBuildInputs = [ meson ninja cmake pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ wayland ]; meta = with lib; { - license = licenses.mit; description = "An xrandr clone for wlroots compositors"; homepage = "https://github.com/emersion/wlr-randr"; + license = licenses.mit; maintainers = with maintainers; [ ma27 ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/wob/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wob/default.nix similarity index 87% rename from infra/libkookie/nixpkgs/pkgs/tools/misc/wob/default.nix rename to infra/libkookie/nixpkgs/pkgs/tools/wayland/wob/default.nix index e0622e5416a..3567ed6eea4 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/misc/wob/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner -, wayland-protocols, libseccomp +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, libseccomp +, wayland # wayland-scanner +, wayland-protocols }: stdenv.mkDerivation rec { @@ -21,15 +28,15 @@ stdenv.mkDerivation rec { mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { + inherit (src.meta) homepage; description = "A lightweight overlay bar for Wayland"; longDescription = '' A lightweight overlay volume/backlight/progress/anything bar for Wayland, inspired by xob. ''; - inherit (src.meta) homepage; changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix b/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix index e16cde6601e..f767f22c1f6 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/aliases.nix @@ -113,6 +113,15 @@ mapAliases ({ cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 + cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; @@ -157,9 +166,7 @@ mapAliases ({ emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 emacsPackagesNg = emacs.pkgs; # added 2019-08-07 - emacs26Packages = emacs26.pkgs; # added 2020-12-18 emacs27Packages = emacs27.pkgs; # added 2020-12-18 - emacs26WithPackages = emacs26.pkgs.withPackages; # added 2020-12-18 emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 emacsPackages = emacs.pkgs; # added 2020-12-18 @@ -277,6 +284,9 @@ mapAliases ({ icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 + imagemagick7_light = imagemagick_light; # added 2021-02-22 + imagemagick7 = imagemagick; # added 2021-02-22 + imagemagick7Big = imagemagickBig; # added 2021-02-22 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; @@ -330,6 +340,7 @@ mapAliases ({ liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblastfm = libsForQt5.liblastfm; # added 2020-06-14 liblrdf = lrdf; # added 2018-04-25 + libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 @@ -352,6 +363,7 @@ mapAliases ({ linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 @@ -564,6 +576,7 @@ mapAliases ({ retroshare06 = retroshare; gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 @@ -576,6 +589,8 @@ mapAliases ({ ruby_2_4 = throw "ruby_2_4 was deprecated in 2019-12: use a newer version of ruby"; ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby"; rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead"; + ruby_2_5 = throw "ruby_2_5 was deprecated in 2021-02: use a newer version of ruby"; + rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead"; rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; rubyMinimal = throw "rubyMinimal was removed due to being unused"; rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 @@ -588,6 +603,7 @@ mapAliases ({ urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 + s2n = s2n-tls; # added 2021-03-03 s6Dns = s6-dns; # added 2018-07-23 s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 @@ -602,6 +618,7 @@ mapAliases ({ saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now"; + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 @@ -665,6 +682,7 @@ mapAliases ({ surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 + swtpm-tpm2 = swtpm; # added 2021-02-26 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 @@ -756,6 +774,9 @@ mapAliases ({ xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" + "and is broken. Working alternatives are libinput and synaptics."); diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix index d0a3c3dee8d..3bec75450df 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/all-packages.nix @@ -158,6 +158,8 @@ in fishnet = callPackage ../servers/fishnet { }; + authy = callPackage ../applications/misc/authy { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; @@ -190,6 +192,8 @@ in castxml = callPackage ../development/tools/castxml { }; + cen64 = callPackage ../misc/emulators/cen64 { }; + cereal = callPackage ../development/libraries/cereal { }; checkov = callPackage ../development/tools/analysis/checkov {}; @@ -282,6 +286,7 @@ in grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { + go = buildPackages.go_1_15; writePython3 = buildPackages.writers.writePython3; }; @@ -512,7 +517,7 @@ in makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } + makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } ../build-support/setup-hooks/make-wrapper.sh; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: @@ -617,7 +622,7 @@ in _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../tools/security/1password-gui { }; + _1password-gui = callPackage ../applications/misc/1password-gui { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; @@ -748,6 +753,14 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + xtrt = callPackage ../tools/archivers/xtrt { }; + + yabridge = callPackage ../tools/audio/yabridge { + wine = wineWowPackages.minimal; + }; + + yabridgectl = callPackage ../tools/audio/yabridgectl { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -784,6 +797,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; + lifecycled = callPackage ../tools/misc/lifecycled { }; + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; @@ -1285,7 +1300,9 @@ in gaia = callPackage ../development/libraries/gaia { }; - galene = callPackage ../servers/web-apps/galene {}; + galene = callPackage ../servers/web-apps/galene { + buildGoModule = buildGo115Module; + }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1329,7 +1346,7 @@ in gucci = callPackage ../tools/text/gucci { }; - grc = callPackage ../tools/misc/grc { }; + grc = python3Packages.callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { SDL = SDL_sixel; @@ -1351,6 +1368,8 @@ in hime = callPackage ../tools/inputmethods/hime {}; + hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; + hostctl = callPackage ../tools/system/hostctl { }; hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; @@ -1397,6 +1416,10 @@ in gopass = callPackage ../tools/security/gopass { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gospider = callPackage ../tools/security/gospider { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -1671,7 +1694,6 @@ in else libtensorflow-bin; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { - inherit (linuxPackages) nvidia_x11; cudaSupport = config.cudaSupport or false; }; @@ -1743,6 +1765,8 @@ in bsod = callPackage ../misc/emulators/bsod { }; + py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + simh = callPackage ../misc/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -1962,7 +1986,33 @@ in chntpw = callPackage ../tools/security/chntpw { }; - clipman = callPackage ../tools/misc/clipman { }; + clipman = callPackage ../tools/wayland/clipman { }; + + kanshi = callPackage ../tools/wayland/kanshi { }; + + oguri = callPackage ../tools/wayland/oguri { }; + + slurp = callPackage ../tools/wayland/slurp { }; + + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + + wev = callPackage ../tools/wayland/wev { }; + + wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + + wlogout = callPackage ../tools/wayland/wlogout { }; + + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; + + wlsunset = callPackage ../tools/wayland/wlsunset { }; + + wob = callPackage ../tools/wayland/wob { }; + + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + + wtype = callPackage ../tools/wayland/wtype { }; + + ydotool = callPackage ../tools/wayland/ydotool { }; clipster = callPackage ../tools/misc/clipster { }; @@ -2217,6 +2267,8 @@ in enca = callPackage ../tools/text/enca { }; + enigma = callPackage ../games/enigma {}; + ent = callPackage ../tools/misc/ent { }; envconsul = callPackage ../tools/system/envconsul { }; @@ -2313,7 +2365,9 @@ in qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; - fwup = callPackage ../tools/misc/fwup { }; + fwup = callPackage ../tools/misc/fwup { + inherit (darwin.apple_sdk.frameworks) DiskArbitration; + }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; @@ -2494,6 +2548,8 @@ in klog = qt5.callPackage ../applications/radio/klog { }; + krapslog = callPackage ../tools/misc/krapslog { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -2504,6 +2560,8 @@ in lief = callPackage ../development/libraries/lief {}; + libnbd = callPackage ../development/libraries/libnbd { }; + libndtypes = callPackage ../development/libraries/libndtypes { }; libxnd = callPackage ../development/libraries/libxnd { }; @@ -2764,6 +2822,7 @@ in step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; + buildGoModule = buildGo115Module; }; step-cli = callPackage ../tools/security/step-cli { }; @@ -2861,6 +2920,8 @@ in mstflint = callPackage ../tools/misc/mstflint { }; + mslink = callPackage ../tools/misc/mslink { }; + mcelog = callPackage ../os-specific/linux/mcelog { util-linux = util-linuxMinimal; }; @@ -2950,6 +3011,26 @@ in pythonPackages = python3Packages; }; + beetsExternalPlugins = + let + pluginArgs = { + # This is a stripped down beets for testing of the external plugins. + beets = (beets.override { + enableAlternatives = false; + enableCopyArtifacts = false; + enableExtraFiles = false; + }).overrideAttrs (lib.const { + doInstallCheck = false; + }); + pythonPackages = python3Packages; + }; + in lib.recurseIntoAttrs { + alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; + check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs; + copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; + extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; + }; + bento4 = callPackage ../tools/video/bento4 { }; bepasty = callPackage ../tools/misc/bepasty { }; @@ -3015,6 +3096,8 @@ in anydesk = callPackage ../applications/networking/remote/anydesk { }; + anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; + atool = callPackage ../tools/archivers/atool { }; bash_unit = callPackage ../tools/misc/bash_unit { }; @@ -3090,6 +3173,8 @@ in checkinstall = callPackage ../tools/package-management/checkinstall { }; + checkmake = callPackage ../development/tools/checkmake { }; + chit = callPackage ../development/tools/chit { }; chkrootkit = callPackage ../tools/security/chkrootkit { }; @@ -3100,6 +3185,8 @@ in chunksync = callPackage ../tools/backup/chunksync { }; + cicero-tui = callPackage ../tools/misc/cicero-tui { }; + cipherscan = callPackage ../tools/security/cipherscan { openssl = if stdenv.hostPlatform.system == "x86_64-linux" then openssl-chacha @@ -3234,6 +3321,8 @@ in netevent = callPackage ../tools/inputmethods/netevent { }; + netplan = callPackage ../tools/admin/netplan { }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; @@ -3250,7 +3339,9 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { + go = go_1_15; + }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -3394,11 +3485,6 @@ in cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); inherit (cudaPackages) - cudatoolkit_6 - cudatoolkit_6_5 - cudatoolkit_7 - cudatoolkit_7_5 - cudatoolkit_8 cudatoolkit_9 cudatoolkit_9_0 cudatoolkit_9_1 @@ -3408,16 +3494,14 @@ in cudatoolkit_10_1 cudatoolkit_10_2 cudatoolkit_11 - cudatoolkit_11_0; + cudatoolkit_11_0 + cudatoolkit_11_1 + cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) - cudnn_cudatoolkit_7 - cudnn_cudatoolkit_7_5 - cudnn6_cudatoolkit_8 - cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 cudnn_cudatoolkit_9_0 cudnn_cudatoolkit_9_1 @@ -3427,7 +3511,9 @@ in cudnn_cudatoolkit_10_1 cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 - cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11_0 + cudnn_cudatoolkit_11_1 + cudnn_cudatoolkit_11_2; cudnn = cudnn_cudatoolkit_10; @@ -3473,7 +3559,15 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; + dbeaver = callPackage ../applications/misc/dbeaver { + jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15 + + # TODO: remove once maven uses JDK 11 + # error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 + maven = maven.override { + jdk = jdk11; + }; + }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -3598,6 +3692,11 @@ in inherit (pythonPackages) mutagen python wrapPython; }; + dirdiff = callPackage ../tools/text/dirdiff { + tcl = tcl-8_5; + tk = tk-8_5; + }; + picotts = callPackage ../tools/audio/picotts { }; wgetpaste = callPackage ../tools/text/wgetpaste { }; @@ -3839,24 +3938,12 @@ in utahfs = callPackage ../applications/networking/utahfs { }; - wallutils = callPackage ../tools/graphics/wallutils { }; - - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + wakeonlan = callPackage ../tools/networking/wakeonlan { }; - wev = callPackage ../tools/misc/wev { }; - - wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; - - wlsunset = callPackage ../tools/wayland/wlsunset { }; - - wob = callPackage ../tools/misc/wob { }; - - wtype = callPackage ../tools/wayland/wtype { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wrangler = callPackage ../development/tools/wrangler { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; - wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -4207,8 +4294,6 @@ in lp_solve = callPackage ../applications/science/math/lp_solve { }; - lprof = callPackage ../tools/graphics/lprof { }; - fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize {}; @@ -4237,6 +4322,8 @@ in python = python2; }; + fontfor = callPackage ../tools/misc/fontfor { }; + fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; python = python3; @@ -4645,7 +4732,6 @@ in gitui = callPackage ../applications/version-management/git-and-tools/gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; - inherit (pkgs) openssl perl; }; gogs = callPackage ../applications/version-management/gogs { }; @@ -5083,13 +5169,7 @@ in hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - hdfview = callPackage ../tools/misc/hdfview { - javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 - }; - - hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 - }; + hdfview = callPackage ../tools/misc/hdfview { }; hecate = callPackage ../applications/editors/hecate { }; @@ -5482,7 +5562,9 @@ in plugins = [ ]; # override with the list of desired plugins }; - kak-lsp = callPackage ../tools/misc/kak-lsp { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { + inherit (darwin.apple_sdk.frameworks) Security; + }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -5809,9 +5891,12 @@ in nodejs-slim = nodejs-slim-14_x; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + icu = icu67; + }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; + icu = icu67; }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { @@ -6494,7 +6579,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18 nextcloud19 nextcloud20; + nextcloud18 nextcloud19 nextcloud20 nextcloud21; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -6600,6 +6685,8 @@ in graphicalSupport = true; }; + nmap-unfree = callPackage ../tools/security/nmap-unfree { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -6749,6 +6836,8 @@ in opendylan-bootstrap = opendylan_bin; }; + ophis = python3Packages.callPackage ../development/compilers/ophis { }; + opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; open-ecard = callPackage ../tools/security/open-ecard { }; @@ -6984,7 +7073,9 @@ in pcimem = callPackage ../os-specific/linux/pcimem { }; - pciutils = callPackage ../tools/system/pciutils { }; + pciutils = callPackage ../tools/system/pciutils { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -7118,6 +7209,9 @@ in plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + inherit (callPackage ../servers/plik { }) + plik plikd; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; @@ -7207,6 +7301,8 @@ in prettyping = callPackage ../tools/networking/prettyping { }; + pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { }; + profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; @@ -7449,8 +7545,7 @@ in redir = callPackage ../tools/networking/redir { }; - # failed to build websocket-driver gem with ruby 2.6, so sticking to 2.5 for now - redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_5; }; + redmine = callPackage ../applications/version-management/redmine { }; redsocks = callPackage ../tools/networking/redsocks { }; @@ -7659,6 +7754,8 @@ in s4cmd = callPackage ../tools/networking/s4cmd { }; + s5cmd = callPackage ../tools/networking/s5cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6-dns = skawarePackages.s6-dns; @@ -7671,6 +7768,8 @@ in s6-portable-utils = skawarePackages.s6-portable-utils; + sacad = callPackage ../tools/misc/sacad { }; + safecopy = callPackage ../tools/system/safecopy { }; sacd = callPackage ../tools/cd-dvd/sacd { }; @@ -7804,7 +7903,7 @@ in shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; @@ -7954,6 +8053,8 @@ in spglib = callPackage ../development/libraries/spglib { }; + spicy = callPackage ../development/tools/spicy { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -8021,7 +8122,9 @@ in solaar = callPackage ../applications/misc/solaar {}; - solanum = callPackage ../servers/irc/solanum {}; + solanum = callPackage ../servers/irc/solanum { + autoreconfHook = buildPackages.autoreconfHook269; + }; sourceHighlight = callPackage ../tools/text/source-highlight { }; @@ -8093,6 +8196,8 @@ in svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + ssb = callPackage ../tools/security/ssb { }; + ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -8126,6 +8231,8 @@ in stress-ng = callPackage ../tools/system/stress-ng { }; + stressapptest = callPackage ../tools/system/stressapptest { }; + stoken = callPackage ../tools/security/stoken (config.stoken or {}); storeBackup = callPackage ../tools/backup/store-backup { }; @@ -8162,6 +8269,8 @@ in swec = callPackage ../tools/networking/swec { }; + swtpm = callPackage ../tools/security/swtpm { }; + svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { git = gitSVN; }; @@ -8617,7 +8726,9 @@ in uwsgi = callPackage ../servers/uwsgi { }; - v2ray = callPackage ../tools/networking/v2ray { }; + v2ray = callPackage ../tools/networking/v2ray { + buildGoModule = buildGo115Module; + }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; @@ -8704,6 +8815,8 @@ in vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; + vo-aacenc = callPackage ../development/libraries/vo-aacenc { }; + vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; @@ -8891,6 +9004,11 @@ in ttwatch = callPackage ../tools/misc/ttwatch { }; + turbovnc = callPackage ../tools/admin/turbovnc { + # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; + libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; + }; + udunits = callPackage ../development/libraries/udunits { }; uftp = callPackage ../servers/uftp {}; @@ -8913,6 +9031,11 @@ in withSystemd = true; }; + unbound-full = unbound.override { + withSystemd = true; + withDoH = true; + }; + unicorn = callPackage ../development/libraries/unicorn { }; units = callPackage ../tools/misc/units { @@ -8940,6 +9063,8 @@ in xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; + xkeysnail = callPackage ../tools/X11/xkeysnail { }; + xfstests = callPackage ../tools/misc/xfstests { }; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; @@ -9035,6 +9160,18 @@ in libpsl = null; }; + wget2 = callPackage ../tools/networking/wget2 { + # update breaks grub2 + gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + version = "20210208"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/gnulib.git"; + rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971"; + sha256 = "06bj9y8wcfh35h653yk8j044k7h5g82d2j3z3ib69rg0gy1xagzp"; + }; + }); + }; + wg-bond = callPackage ../applications/networking/wg-bond { }; which = callPackage ../tools/system/which { }; @@ -9137,8 +9274,6 @@ in w3m = w3m-batch; }; - xmpppy = pythonPackages.xmpppy; - xiccd = callPackage ../tools/misc/xiccd { }; xidlehook = callPackage ../tools/X11/xidlehook { @@ -9261,6 +9396,10 @@ in zinit = callPackage ../shells/zsh/zinit {} ; + zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { }; + + zstxtns-utils = callPackage ../tools/text/zstxtns-utils { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; @@ -9840,6 +9979,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if stdenv.isDarwin then null else if stdenv.targetPlatform.isRedox @@ -9856,6 +9998,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -9868,6 +10013,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -9959,7 +10107,7 @@ in profiledCompiler = false; }); - libgccjit = gcc9.cc.override { + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; langCC = false; @@ -10135,41 +10283,35 @@ in glslang = callPackage ../development/compilers/glslang { }; - go_bootstrap = if stdenv.isAarch64 then - srcOnly { - name = "go-1.8-linux-arm64-bootstrap"; - src = fetchurl { - url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; - sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; - }; - } - else - callPackage ../development/compilers/go/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; + }); + + go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_15; + go = go_1_16; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -10397,27 +10539,19 @@ in jwasm = callPackage ../development/compilers/jwasm { }; - knightos-genkfs = callPackage ../development/tools/knightos/genkfs { - asciidoc = asciidoc-full; - }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; knightos-kcc = callPackage ../development/tools/knightos/kcc { }; - knightos-kimg = callPackage ../development/tools/knightos/kimg { - asciidoc = asciidoc-full; - }; + knightos-kimg = callPackage ../development/tools/knightos/kimg { }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; - knightos-mkrom = callPackage ../development/tools/knightos/mkrom { - asciidoc = asciidoc-full; - }; + knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; - knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { - asciidoc = asciidoc-full; - }; + knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; knightos-scas = callPackage ../development/tools/knightos/scas { }; @@ -10776,6 +10910,7 @@ in cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10807,6 +10942,7 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10829,6 +10965,7 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10848,6 +10985,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { + inherit (darwin.apple_sdk.frameworks) Security; + }; + crate2nix = callPackage ../development/tools/rust/crate2nix { }; convco = callPackage ../development/tools/convco { @@ -10880,6 +11021,7 @@ in sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; + sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; @@ -11116,7 +11258,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackage ./dhall-packages.nix { }; + dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); duktape = callPackage ../development/interpreters/duktape { }; @@ -11278,6 +11420,8 @@ in overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; }; + octavePackages = recurseIntoAttrs octave.pkgs; + ocropus = callPackage ../applications/misc/ocropus { }; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -11287,9 +11431,10 @@ in # # Set default PHP interpreter, extensions and packages php = php74; - phpExtensions = php74Extensions; - phpPackages = php74Packages; + phpExtensions = php.extensions; + phpPackages = php.packages; + # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; @@ -11338,38 +11483,46 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override { self = pythonFull; + pythonAttr = "pythonFull"; x11Support = true; }; python2Full = python2.override { self = python2Full; + pythonAttr = "python2Full"; x11Support = true; }; python27Full = python27.override { self = python27Full; + pythonAttr = "python27Full"; x11Support = true; }; python3Full = python3.override { self = python3Full; + pythonAttr = "python3Full"; bluezSupport = true; x11Support = true; }; python36Full = python36.override { self = python36Full; + pythonAttr = "python36Full"; bluezSupport = true; x11Support = true; }; python37Full = python37.override { self = python37Full; + pythonAttr = "python37Full"; bluezSupport = true; x11Support = true; }; python38Full = python38.override { self = python38Full; + pythonAttr = "python38Full"; bluezSupport = true; x11Support = true; }; python39Full = python39.override { self = python39Full; + pythonAttr = "python39Full"; bluezSupport = true; x11Support = true; }; @@ -11489,14 +11642,12 @@ in autoreconfHook = buildPackages.autoreconfHook269; bison = buildPackages.bison_3_5; }) - ruby_2_5 ruby_2_6 ruby_2_7; ruby = ruby_2_6; rubyPackages = rubyPackages_2_6; - rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; @@ -11625,6 +11776,10 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + umr = callPackage ../development/misc/umr { + llvmPackages = llvmPackages_latest; + }; + srandrd = callPackage ../tools/X11/srandrd { }; srecord = callPackage ../development/tools/misc/srecord { }; @@ -11702,7 +11857,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11 electron_12; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -12026,8 +12181,7 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; ccls = callPackage ../development/tools/misc/ccls { - llvmPackages = llvmPackages_8; - stdenv = llvmPackages_8.stdenv; + llvmPackages = llvmPackages_latest; }; credstash = with python3Packages; toPythonApplication credstash; @@ -12042,6 +12196,10 @@ in csslint = callPackage ../development/web/csslint { }; + cvise = python3Packages.callPackage ../development/tools/misc/cvise { + inherit (llvmPackages_11) llvm clang-unwrapped; + }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -12302,6 +12460,8 @@ in gputils = callPackage ../development/tools/misc/gputils { }; + gpuvis = callPackage ../development/tools/misc/gpuvis { }; + gradleGen = callPackage ../development/tools/build-managers/gradle { java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -12407,6 +12567,8 @@ in augustus = callPackage ../games/augustus { }; + k2tf = callPackage ../development/tools/misc/k2tf { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; @@ -12446,6 +12608,8 @@ in kustomize = callPackage ../development/tools/kustomize { }; + kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { }; + ktlint = callPackage ../development/tools/ktlint { }; kythe = callPackage ../development/tools/kythe { }; @@ -12488,12 +12652,12 @@ in lttv = callPackage ../development/tools/misc/lttv { }; + luaformatter = callPackage ../development/tools/luaformatter { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -12648,6 +12812,8 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; + pqrs = callPackage ../development/tools/pqrs { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -12743,8 +12909,6 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; - scaff = callPackage ../development/tools/scaff { }; - sd-local = callPackage ../development/tools/sd-local { }; selenium-server-standalone = callPackage ../development/tools/selenium/server { }; @@ -12768,6 +12932,8 @@ in scss-lint = callPackage ../development/tools/scss-lint { }; + segger-ozone = callPackage ../development/tools/misc/segger-ozone { }; + shadowenv = callPackage ../tools/misc/shadowenv { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12778,7 +12944,7 @@ in inherit (callPackage ../development/tools/build-managers/shards { }) shards_0_11 - shards_0_12 + shards_0_13 shards; shellcheck = callPackage ../development/tools/shellcheck {}; @@ -13084,6 +13250,8 @@ in agg = callPackage ../development/libraries/agg { }; + alass = callPackage ../applications/video/alass { }; + allegro = allegro4; allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; @@ -13096,6 +13264,8 @@ in amrwb = callPackage ../development/libraries/amrwb { }; + ansi2html = with python3.pkgs; toPythonApplication ansi2html; + anttweakbar = callPackage ../development/libraries/AntTweakBar { }; appstream = callPackage ../development/libraries/appstream { }; @@ -13168,7 +13338,9 @@ in aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; - aws-c-io = callPackage ../development/libraries/aws-c-io { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { + inherit (darwin.apple_sdk.frameworks) Security; + }; aws-checksums = callPackage ../development/libraries/aws-checksums { }; @@ -13724,6 +13896,8 @@ in funambol = callPackage ../development/libraries/funambol { }; + galer = callPackage ../tools/security/galer { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; gamin = callPackage ../development/libraries/gamin { }; @@ -13731,6 +13905,11 @@ in ganv = callPackage ../development/libraries/ganv { }; + garble = callPackage ../build-support/go/garble.nix { + # https://github.com/burrowers/garble/issues/124 + buildGoModule = buildGo115Module; + }; + gcab = callPackage ../development/libraries/gcab { }; gcovr = with python3Packages; toPythonApplication gcovr; @@ -13839,6 +14018,8 @@ in libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; + libhsts = callPackage ../development/libraries/libhsts { }; + glbinding = callPackage ../development/libraries/glbinding { }; gle = callPackage ../development/libraries/gle { }; @@ -14336,8 +14517,13 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu68 = callPackage ../development/libraries/icu/68.nix ({ + nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu67; + icu = icu68; id3lib = callPackage ../development/libraries/id3lib { }; @@ -14375,6 +14561,8 @@ in indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; indilib = callPackage ../development/libraries/indilib { }; + indi-3rdparty = callPackage ../development/libraries/indilib/indi-3rdparty.nix { }; + indi-full = callPackage ../development/libraries/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; @@ -14591,7 +14779,7 @@ in libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_07) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; @@ -14916,7 +15104,9 @@ in liblscp = callPackage ../development/libraries/liblscp { }; - libe-book = callPackage ../development/libraries/libe-book {}; + libe-book = callPackage ../development/libraries/libe-book { + icu = icu67; + }; libechonest = callPackage ../development/libraries/libechonest { }; @@ -15131,6 +15321,8 @@ in libspectre = callPackage ../development/libraries/libspectre { }; + libspnav = callPackage ../development/libraries/libspnav { }; + libgsf = callPackage ../development/libraries/libgsf { }; # GNU libc provides libiconv so systems with glibc don't need to build @@ -15208,6 +15400,8 @@ in libmicrohttpd = libmicrohttpd_0_9_72; }; + libjwt = callPackage ../development/libraries/libjwt { }; + libkate = callPackage ../development/libraries/libkate { }; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; @@ -15352,8 +15546,6 @@ in libosmocore = callPackage ../applications/misc/libosmocore { }; - libosmpbf = callPackage ../development/libraries/libosmpbf {}; - libotr = callPackage ../development/libraries/libotr { }; libow = callPackage ../development/libraries/libow { }; @@ -15402,7 +15594,9 @@ in libpwquality = callPackage ../development/libraries/libpwquality { }; - libqalculate = callPackage ../development/libraries/libqalculate { }; + libqalculate = callPackage ../development/libraries/libqalculate { + readline = readline80; + }; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; @@ -15514,6 +15708,8 @@ in libtoxcore_0_1 libtoxcore_0_2; libtoxcore = libtoxcore_0_2; + libtpms = callPackage ../tools/security/libtpms { }; + libtap = callPackage ../development/libraries/libtap { }; libtgvoip = callPackage ../development/libraries/libtgvoip { }; @@ -15643,6 +15839,8 @@ in libx86 = callPackage ../development/libraries/libx86 {}; + libxcrypt = callPackage ../development/libraries/libxcrypt { }; + libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; libxkbcommon = libxkbcommon_8; @@ -15679,9 +15877,7 @@ in libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { - python = if stdenv.isDarwin then python2 else python3; - }; + libxslt = callPackage ../development/libraries/libxslt { }; libxsmm = callPackage ../development/libraries/libxsmm { }; @@ -15770,6 +15966,10 @@ in opencl-clang = callPackage ../development/libraries/opencl-clang { }; + mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + + mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; + mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; @@ -15778,6 +15978,8 @@ in matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn; + maxflow = callPackage ../development/libraries/maxflow { }; + mbedtls = callPackage ../development/libraries/mbedtls { }; mdctags = callPackage ../development/tools/misc/mdctags { }; @@ -15917,11 +16119,15 @@ in ndpi = callPackage ../development/libraries/ndpi { }; + nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; + nifticlib = callPackage ../development/libraries/science/biology/nifticlib { }; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - notcurses = callPackage ../development/libraries/notcurses { }; + notcurses = callPackage ../development/libraries/notcurses { + readline = readline80; + }; ncurses5 = ncurses.override { abiVersion = "5"; @@ -16138,7 +16344,6 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_0 libressl_3_1; # Please keep this pointed to the latest version. See also @@ -16231,8 +16436,6 @@ in polkit = callPackage ../development/libraries/polkit { }; - polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; @@ -16336,10 +16539,6 @@ in qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; - qt3 = callPackage ../development/libraries/qt-3 { - libpng = libpng12; - }; - qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { @@ -16493,6 +16692,8 @@ in readosm = callPackage ../development/libraries/readosm { }; + rinutils = callPackage ../development/libraries/rinutils { }; + kissfft = callPackage ../development/libraries/kissfft { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { @@ -16568,6 +16769,8 @@ in rubberband = callPackage ../development/libraries/rubberband { }; + s2geometry = callPackage ../development/libraries/s2geometry { }; + /* This package references ghc844, which we no longer have. Unfortunately, I have been unable to mark it as "broken" in a way that the ofBorg bot recognizes. Since I don't want to merge code into master that generates @@ -16643,13 +16846,15 @@ in sfsexp = callPackage ../development/libraries/sfsexp {}; + shhgit = callPackage ../tools/security/shhgit { }; + shhmsg = callPackage ../development/libraries/shhmsg { }; shhopt = callPackage ../development/libraries/shhopt { }; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - s2n = callPackage ../development/libraries/s2n { }; + s2n-tls = callPackage ../development/libraries/s2n-tls { }; simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; @@ -17016,7 +17221,9 @@ in tremor = callPackage ../development/libraries/tremor { }; - trillian = callPackage ../tools/misc/trillian { }; + trillian = callPackage ../tools/misc/trillian { + buildGoModule = buildGo115Module; + }; twolame = callPackage ../development/libraries/twolame { }; @@ -17308,8 +17515,6 @@ in yder = callPackage ../development/libraries/yder { }; - ydotool = callPackage ../tools/wayland/ydotool { }; - yojimbo = callPackage ../development/libraries/yojimbo { }; yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; @@ -17469,8 +17674,11 @@ in buildGo115Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_15; }; + buildGo116Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_16; + }; - buildGoPackage = buildGo115Package; + buildGoPackage = buildGo116Package; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; @@ -17478,8 +17686,11 @@ in buildGo115Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_15; }; + buildGo116Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_16; + }; - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -17681,6 +17892,7 @@ in bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; + dig = bind.dnsutils; inherit (callPackages ../servers/bird { }) bird bird6 bird2; @@ -17818,7 +18030,9 @@ in grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo115Module; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -17912,7 +18126,11 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; - mastodon = callPackage ../servers/mastodon { }; + mastodon = callPackage ../servers/mastodon { + # With nodejs v14 the streaming endpoint breaks. Need migrate to uWebSockets.js or similar. + # https://github.com/tootsuite/mastodon/issues/15184 + nodejs-slim = nodejs-slim-12_x; + }; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; @@ -18018,11 +18236,15 @@ in nix-tour = callPackage ../applications/misc/nix-tour {}; + nosqli = callPackage ../tools/security/nosqli { }; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); nsq = callPackage ../servers/nsq { }; - oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + oauth2_proxy = callPackage ../servers/oauth2_proxy { + buildGoModule = buildGo115Module; + }; openbgpd = callPackage ../servers/openbgpd { }; @@ -18300,7 +18522,9 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo115Package; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -18361,10 +18585,6 @@ in pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; - - pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { @@ -18409,13 +18629,11 @@ in # Fails to compile with boost >= 1.72 rippled = callPackage ../servers/rippled { - boost = boost171; + boost = boost17x; }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { - boost = boost167.override { - enableStatic = true; - }; + boost = boost17x; }; roon-server = callPackage ../servers/roon-server { }; @@ -18785,6 +19003,8 @@ in criu = callPackage ../os-specific/linux/criu { }; + cryptomator = callPackage ../tools/security/cryptomator { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; @@ -18831,6 +19051,8 @@ in fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; + fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { }; + fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; @@ -19129,14 +19351,14 @@ in ]; }; - linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -19151,6 +19373,14 @@ in ]; }; + linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -19401,15 +19631,15 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_10; + linuxPackages_latest = linuxPackages_5_11; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; + linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_10; + linuxPackages-rt_latest = linuxPackages-rt_5_11; linux-rt = linuxPackages-rt.kernel; linux-rt_latest = linuxPackages-rt_latest.kernel; @@ -19425,6 +19655,7 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); + linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -19632,6 +19863,9 @@ in musl = callPackage ../os-specific/linux/musl { }; + musl-fts = callPackage ../os-specific/linux/musl-fts { }; + musl-obstack = callPackage ../os-specific/linux/musl-obstack { }; + nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -19653,11 +19887,15 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + nvmet-cli = callPackage ../os-specific/linux/nvmet-cli { }; + system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; + air = callPackage ../development/tools/air { }; + delve = callPackage ../development/tools/delve { }; dep = callPackage ../development/tools/dep { }; @@ -19722,6 +19960,8 @@ in go-migrate = callPackage ../development/tools/go-migrate { }; + go-mockery = callPackage ../development/tools/go-mockery { }; + gomacro = callPackage ../development/tools/gomacro { }; gomodifytags = callPackage ../development/tools/gomodifytags { }; @@ -19730,6 +19970,8 @@ in gopls = callPackage ../development/tools/gopls { }; + gops = callPackage ../development/tools/gops { }; + gore = callPackage ../development/tools/gore { }; gotests = callPackage ../development/tools/gotests { }; @@ -20027,11 +20269,13 @@ in ubootClearfog ubootGuruplug ubootJetsonTK1 + ubootNanoPCT4 ubootNovena ubootOdroidC2 ubootOdroidXU3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 + ubootOrangePiZero ubootPcduino3Nano ubootPine64 ubootPine64LTS @@ -20681,6 +20925,8 @@ in orbitron = callPackage ../data/fonts/orbitron { }; + orchis = callPackage ../data/themes/orchis { }; + orion = callPackage ../data/themes/orion {}; overpass = callPackage ../data/fonts/overpass { }; @@ -20764,6 +21010,8 @@ in sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; + savepagenow = callPackage ../tools/misc/savepagenow { }; + scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; scowl = callPackage ../data/misc/scowl { }; @@ -21125,6 +21373,7 @@ in apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; + texlive = texlive.combined.scheme-medium; }; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; @@ -21320,6 +21569,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blflash = callPackage ../tools/misc/blflash { }; + blogc = callPackage ../applications/misc/blogc { }; bluefish = callPackage ../applications/editors/bluefish { @@ -21370,6 +21621,8 @@ in bviplus = callPackage ../applications/editors/bviplus { }; + caerbannog = callPackage ../applications/misc/caerbannog { }; + cage = callPackage ../applications/window-managers/cage { }; calf = callPackage ../applications/audio/calf { @@ -21457,8 +21710,9 @@ in claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; }; - claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail/gtk3.nix { + claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; + useGtk3 = true; }; clfswm = callPackage ../applications/window-managers/clfswm { }; @@ -21546,12 +21800,16 @@ in coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim { + buildGoPackage = buildGo115Package; + }; cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; + cqrlog = callPackage ../applications/radio/cqrlog { }; + crun = callPackage ../applications/virtualization/crun {}; csdp = callPackage ../applications/science/math/csdp { }; @@ -21742,6 +22000,8 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; + ebumeter = callPackage ../applications/audio/ebumeter { }; + echoip = callPackage ../servers/echoip { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { @@ -21785,7 +22045,6 @@ in Xaw3d = null; gconf = null; alsaLib = null; - imagemagick = null; acl = null; gpm = null; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; @@ -21798,25 +22057,6 @@ in withGTK3 = false; })); - emacs26 = callPackage ../applications/editors/emacs/26.nix { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; - }; - - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { - withX = false; - withNS = false; - withGTK2 = false; - withGTK3 = false; - })); - emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit @@ -21825,27 +22065,9 @@ in }; emacsPackagesFor = emacs: import ./emacs-packages.nix { - inherit lib newScope stdenv pkgs; - inherit fetchFromGitHub fetchurl; - inherit emacs texinfo makeWrapper runCommand writeText; - inherit (xorg) lndir; - - trivialBuild = callPackage ../build-support/emacs/trivial.nix { - inherit emacs; - }; - - melpaBuild = callPackage ../build-support/emacs/melpa.nix { - inherit emacs; - }; - - external = { - inherit (haskellPackages) - ghc-mod structured-haskell-mode Agda hindent; - inherit - autoconf automake editorconfig-core-c git libffi libpng pkg-config - poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq openssl ott; - }; + inherit (lib) makeScope makeOverridable; + inherit emacs; + pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; inherit (gnome3) empathy; @@ -21872,9 +22094,7 @@ in eq10q = callPackage ../applications/audio/eq10q { }; - errbot = callPackage ../applications/networking/errbot { - python = python3; - }; + errbot = python3Packages.callPackage ../applications/networking/errbot { }; espeak-classic = callPackage ../applications/audio/espeak { }; @@ -22308,6 +22528,10 @@ in formatter = callPackage ../applications/misc/formatter { }; + formiko = with python3Packages; callPackage ../applications/editors/formiko { + inherit buildPythonApplication; + }; + foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; @@ -22513,7 +22737,7 @@ in gitit = callPackage ../applications/misc/gitit {}; gkrellm = callPackage ../applications/misc/gkrellm { - inherit (darwin) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; glow = callPackage ../applications/editors/glow { }; @@ -22673,9 +22897,7 @@ in herbe = callPackage ../applications/misc/herbe { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { - asciidoc = asciidoc-full; - }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -22807,8 +23029,6 @@ in super-productivity = callPackage ../applications/networking/super-productivity { }; - wlr-randr = callPackage ../tools/misc/wlr-randr { }; - wlroots = callPackage ../development/libraries/wlroots { }; sway-unwrapped = callPackage ../applications/window-managers/sway { }; @@ -22923,7 +23143,7 @@ in imagej = callPackage ../applications/graphics/imagej { }; - imagemagick_light = imagemagick.override { + imagemagick6_light = imagemagick6.override { bzip2 = null; zlib = null; libX11 = null; @@ -22946,14 +23166,14 @@ in libde265 = null; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { + imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; ghostscript = null; }; - imagemagickBig = imagemagick.override { inherit ghostscript; }; + imagemagick6Big = imagemagick6.override { inherit ghostscript; }; - imagemagick7_light = lowPrio (imagemagick7.override { + imagemagick_light = lowPrio (imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -22975,11 +23195,11 @@ in libheif = null; }); - imagemagick7 = lowPrio (imagemagick7Big.override { + imagemagick = lowPrio (imagemagickBig.override { ghostscript = null; }); - imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { + imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }); @@ -23115,8 +23335,6 @@ in kanboard = callPackage ../applications/misc/kanboard { }; - kanshi = callPackage ../tools/misc/kanshi { }; - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -23215,6 +23433,8 @@ in kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; + kubeless = callPackage ../applications/networking/cluster/kubeless { }; kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; @@ -23223,6 +23443,8 @@ in popeye = callPackage ../applications/networking/cluster/popeye { }; + kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; @@ -23231,6 +23453,12 @@ in kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; + + kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; + + kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { @@ -23283,6 +23511,8 @@ in libowfat = callPackage ../development/libraries/libowfat { }; + libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; @@ -23411,6 +23641,8 @@ in ltc-tools = callPackage ../applications/audio/ltc-tools { }; + lscolors = callPackage ../applications/misc/lscolors { }; + lumail = callPackage ../applications/networking/mailreaders/lumail { lua = lua5_1; }; @@ -23450,7 +23682,7 @@ in mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; - magnetophonDSP = { + magnetophonDSP = lib.recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; @@ -23497,6 +23729,8 @@ in mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mbrola = callPackage ../applications/audio/mbrola { }; + mcomix3 = callPackage ../applications/graphics/mcomix3 {}; mcpp = callPackage ../development/compilers/mcpp { }; @@ -23695,6 +23929,8 @@ in ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + pragha = libsForQt5.callPackage ../applications/audio/pragha { }; + rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; rofi-calc = callPackage ../applications/science/math/rofi-calc { }; @@ -23823,7 +24059,9 @@ in ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = callPackage ../tools/misc/nncp { }; + nncp = callPackage ../tools/misc/nncp { + go = go_1_15; + }; notion = callPackage ../applications/window-managers/notion { }; @@ -23876,6 +24114,8 @@ in stdenv = stdenv_32bit; }; + pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; + polybar = callPackage ../applications/misc/polybar { }; polybarFull = callPackage ../applications/misc/polybar { @@ -23905,6 +24145,8 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; + qemacs = callPackage ../applications/editors/qemacs { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -23998,6 +24240,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; + muso = callPackage ../applications/audio/muso { }; + mystem = callPackage ../applications/misc/mystem { }; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; @@ -24397,6 +24641,8 @@ in plugin-torture = callPackage ../applications/audio/plugin-torture { }; + poke = callPackage ../applications/editors/poke { }; + polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; poezio = python3Packages.poezio; @@ -24411,6 +24657,8 @@ in ponymix = callPackage ../applications/audio/ponymix { }; + pothos = libsForQt5.callPackage ../applications/radio/pothos { }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; @@ -24464,6 +24712,8 @@ in puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; + pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; + pwdsafety = callPackage ../tools/security/pwdsafety { }; pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; @@ -24477,10 +24727,7 @@ in qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; - eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { - lua5 = lua5_1; - miniupnpc = miniupnpc_1; - }; + eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; @@ -24748,7 +24995,7 @@ in udevil = callPackage ../applications/misc/udevil {}; - udiskie = callPackage ../applications/misc/udiskie { }; + udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; sacc = callPackage ../applications/networking/gopher/sacc { }; @@ -24774,6 +25021,8 @@ in seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + secretscanner = callPackage ../tools/security/secretscanner { }; + sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; @@ -24814,8 +25063,6 @@ in slrn = callPackage ../applications/networking/newsreaders/slrn { }; - slurp = callPackage ../tools/misc/slurp { }; - sniproxy = callPackage ../applications/networking/sniproxy { }; sooperlooper = callPackage ../applications/audio/sooperlooper { }; @@ -24864,16 +25111,12 @@ in linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) - // (callPackage ../applications/misc/sweethome3d/editors.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - sweethome3dApp = sweethome3d.application; - }) - ); + sweethome3d = recurseIntoAttrs ( + (callPackage ../applications/misc/sweethome3d { }) // + (callPackage ../applications/misc/sweethome3d/editors.nix { + sweethome3dApp = sweethome3d.application; + }) + ); swingsane = callPackage ../applications/graphics/swingsane { }; @@ -24995,10 +25238,13 @@ in libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); - sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail { - jdk = jdk8; + sourcetrail = let llvmPackages = llvmPackages_10; + in libsForQt5.callPackage ../development/tools/sourcetrail { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + jdk = jdk8; pythonPackages = python3Packages; + inherit llvmPackages; }; spotifywm = callPackage ../applications/audio/spotifywm { }; @@ -25243,6 +25489,8 @@ in ticpp = callPackage ../development/libraries/ticpp { }; + ticker = callPackage ../applications/misc/ticker { }; + tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -25362,6 +25610,8 @@ in testssl = callPackage ../applications/networking/testssl { }; + lavalauncher = callPackage ../applications/misc/lavalauncher { }; + ulauncher = callPackage ../applications/misc/ulauncher { }; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; @@ -25399,6 +25649,8 @@ in urh = callPackage ../applications/radio/urh { }; + uroboros = callPackage ../tools/system/uroboros { }; + uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; uucp = callPackage ../tools/misc/uucp { }; @@ -25464,7 +25716,7 @@ in vimv = callPackage ../tools/misc/vimv/default.nix { }; - qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; @@ -25644,6 +25896,8 @@ in wad = python3Packages.callPackage ../tools/security/wad { }; + wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + waon = callPackage ../applications/audio/waon { }; w3m = callPackage ../applications/networking/browsers/w3m { }; @@ -26012,6 +26266,10 @@ in xdotool = callPackage ../tools/X11/xdotool { }; + xed-editor = callPackage ../applications/editors/xed-editor { + xapps = cinnamon.xapps; + }; + xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); xen = xenPackages.xen-vanilla; @@ -26114,6 +26372,13 @@ in xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; + + xplayer = callPackage ../applications/video/xplayer { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; + inherit (cinnamon) xapps; + }; + libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; + xrectsel = callPackage ../tools/X11/xrectsel { }; xrestop = callPackage ../tools/X11/xrestop { }; @@ -26484,10 +26749,16 @@ in lua = lua5; }; + black-hole-solver = callPackage ../games/black-hole-solver { + inherit (perlPackages) PathTiny; + }; + blackshades = callPackage ../games/blackshades { }; blobby = callPackage ../games/blobby { }; + blobwars = callPackage ../games/blobwars { }; + boohu = callPackage ../games/boohu { }; braincurses = callPackage ../games/braincurses { }; @@ -26508,6 +26779,8 @@ in cataclysm-dda-git = cataclysmDDA.git.tiles; + cbonsai = callPackage ../games/cbonsai { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; @@ -27240,6 +27513,10 @@ in typespeed = callPackage ../games/typespeed { }; + uchess = callPackage ../games/uchess { + buildGoModule = buildGo116Module; + }; + udig = callPackage ../applications/gis/udig { }; ufoai = callPackage ../games/ufoai { }; @@ -27299,6 +27576,8 @@ in libpng = libpng12; }; + wargus = callPackage ../games/wargus { }; + warmux = callPackage ../games/warmux { }; warsow-engine = callPackage ../games/warsow/engine.nix { }; @@ -27425,7 +27704,7 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; + arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; @@ -27464,6 +27743,7 @@ in mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; } // lib.optionalAttrs (config.allowAliases or false) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 + arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; @@ -28283,6 +28563,8 @@ in cudaSupport = config.cudaSupport or false; }; + dap = callPackage ../applications/science/math/dap { }; + ecm = callPackage ../applications/science/math/ecm { }; eukleides = callPackage ../applications/science/math/eukleides { @@ -29086,7 +29368,7 @@ in lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - lice = callPackage ../tools/misc/lice {}; + lice = python3Packages.callPackage ../tools/misc/lice {}; m33-linux = callPackage ../misc/drivers/m33-linux { }; @@ -29113,6 +29395,8 @@ in sndio = callPackage ../misc/sndio { }; + stork = callPackage ../applications/misc/stork { }; + oclgrind = callPackage ../development/tools/analysis/oclgrind { }; opkg = callPackage ../tools/package-management/opkg { }; @@ -29161,6 +29445,8 @@ in pyload = callPackage ../applications/networking/pyload {}; + pyupgrade = with python3Packages; toPythonApplication pyupgrade; + pwntools = with python3Packages; toPythonApplication pwntools; uae = callPackage ../misc/emulators/uae { }; @@ -29208,6 +29494,8 @@ in ricty = callPackage ../data/fonts/ricty { }; + rmfuse = callPackage ../tools/filesystems/rmfuse {}; + rmount = callPackage ../tools/filesystems/rmount {}; romdirfs = callPackage ../tools/filesystems/romdirfs {}; @@ -29270,6 +29558,8 @@ in sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); + senv = callPackage ../applications/misc/senv { }; + brlaser = callPackage ../misc/cups/drivers/brlaser { }; fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { }; @@ -29323,6 +29613,10 @@ in hasktags = haskellPackages.hasktags; }; + spacenavd = callPackage ../misc/drivers/spacenavd { }; + + spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { }; + splix = callPackage ../misc/cups/drivers/splix { }; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; @@ -29490,9 +29784,6 @@ in wasmer = callPackage ../development/interpreters/wasmer { }; wasm-pack = callPackage ../development/tools/wasm-pack { - # Wasm-pack depends on a version of rust-openssl which is incompatible with - # LibreSSL 3.1, so we explicitly opt for the older version. - libressl = libressl_3_0; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -29895,6 +30186,8 @@ in bemenu = callPackage ../applications/misc/bemenu { }; + _9menu = callPackage ../applications/misc/9menu { }; + dapper = callPackage ../development/tools/dapper { }; kube3d = callPackage ../applications/networking/cluster/kube3d {}; @@ -29903,6 +30196,8 @@ in zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + zrepl = callPackage ../tools/backup/zrepl { }; + runwayml = callPackage ../applications/graphics/runwayml {}; uhubctl = callPackage ../tools/misc/uhubctl {}; @@ -29917,6 +30212,8 @@ in nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + webwormhole = callPackage ../tools/networking/webwormhole { }; + wifi-password = callPackage ../os-specific/darwin/wifi-password {}; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {}; @@ -29963,7 +30260,10 @@ in zalgo = callPackage ../tools/misc/zalgo { }; - zettlr = callPackage ../applications/misc/zettlr { }; + zettlr = callPackage ../applications/misc/zettlr { + texlive = texlive.combined.scheme-medium; + inherit (haskellPackages) pandoc-citeproc; + }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/emacs-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/emacs-packages.nix index d0bb7c56d99..67f4d116dfd 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/emacs-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/emacs-packages.nix @@ -21,58 +21,42 @@ (package-initialize) */ -## FOR CONTRIBUTORS -# -# When adding a new package here please note that -# * please use `elpaBuild` for pre-built package.el packages and -# `melpaBuild` or `trivialBuild` if the package must actually -# be built from the source. -# * lib.licenses are `with`ed on top of the file here -# * both trivialBuild and melpaBuild will automatically derive a -# `meta` with `platforms` and `homepage` set to something you are -# unlikely to want to override for most packages - -{ lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText - -, emacs, texinfo, lndir, makeWrapper -, trivialBuild -, melpaBuild - -, external -, pkgs -}: +{ pkgs', makeScope, makeOverridable, emacs }: let - mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { - inherit lib stdenv texinfo; + mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/elpa-packages.nix { + inherit (pkgs) stdenv texinfo writeText; + inherit lib; }; # Contains both melpa stable & unstable - melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix { - inherit external lib pkgs; + melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs-modes/melpa-packages.nix { + inherit lib pkgs; }; - mkMelpaStablePackages = melpaGeneric "stable"; - mkMelpaPackages = melpaGeneric "unstable"; - mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { + mkOrgPackages = { lib }: import ../applications/editors/emacs-modes/org-packages.nix { inherit lib; }; - emacsWithPackages = import ../build-support/emacs/wrapper.nix { - inherit lib lndir makeWrapper runCommand; + mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/manual-packages.nix { + inherit lib pkgs; }; - mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix { - inherit external lib pkgs; + emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { + inherit (pkgs) makeWrapper runCommand; + inherit (pkgs.xorg) lndir; + inherit lib; }; -in lib.makeScope newScope (self: lib.makeOverridable ({ - elpaPackages ? mkElpaPackages self - , melpaStablePackages ? mkMelpaStablePackages self - , melpaPackages ? mkMelpaPackages self - , orgPackages ? mkOrgPackages self - , manualPackages ? mkManualPackages self +in makeScope pkgs'.newScope (self: makeOverridable ({ + pkgs ? pkgs' + , lib ? pkgs.lib + , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self + , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self + , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self + , orgPackages ? mkOrgPackages { inherit lib; } self + , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } // melpaStablePackages // { inherit melpaStablePackages; } @@ -80,8 +64,27 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // orgPackages // { inherit orgPackages; } // manualPackages // { inherit manualPackages; } // { - inherit emacs melpaBuild trivialBuild; - emacsWithPackages = emacsWithPackages self; - withPackages = emacsWithPackages self; + + inherit emacs; + + trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix { + inherit (self) emacs; + }; + + melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix { + inherit (self) emacs; + }; + + emacsWithPackages = emacsWithPackages { inherit pkgs lib; } self; + withPackages = emacsWithPackages { inherit pkgs lib; } self; + + }// { + + # Package specific priority overrides goes here + + # Telega uploads packages incompatible with stable tdlib to melpa + # Prefer the one from melpa stable + inherit (melpaStablePackages) telega; + }) ) {}) diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix index c0faba640a2..51dd6c257b2 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -82,6 +82,14 @@ let ca-certs = callPackage ../development/ocaml-modules/ca-certs { }; + carton = callPackage ../development/ocaml-modules/carton { }; + + carton-git = callPackage ../development/ocaml-modules/carton/git.nix { }; + + carton-lwt = callPackage ../development/ocaml-modules/carton/lwt.nix { + git-binary = pkgs.git; + }; + camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlp4 = @@ -234,6 +242,8 @@ let digestif = callPackage ../development/ocaml-modules/digestif { }; + directories = callPackage ../development/ocaml-modules/directories { }; + dispatch = callPackage ../development/ocaml-modules/dispatch { }; dns = callPackage ../development/ocaml-modules/dns { }; @@ -391,8 +401,6 @@ let imagelib = callPackage ../development/ocaml-modules/imagelib { }; - imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { }; - inotify = callPackage ../development/ocaml-modules/inotify { }; integers = callPackage ../development/ocaml-modules/integers { }; @@ -425,9 +433,13 @@ let git-binary = pkgs.git; }; - git-http = callPackage ../development/ocaml-modules/git-http { }; + git-cohttp = callPackage ../development/ocaml-modules/git/cohttp.nix { }; + + git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { }; - git-unix = callPackage ../development/ocaml-modules/git-unix { + git-cohttp-mirage = callPackage ../development/ocaml-modules/git/cohttp-mirage.nix { }; + + git-unix = callPackage ../development/ocaml-modules/git/unix.nix { git-binary = pkgs.git; }; @@ -464,6 +476,8 @@ let irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; + irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { }; + irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; @@ -472,7 +486,13 @@ let irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { }; - irmin-mem = callPackage ../development/ocaml-modules/irmin/mem.nix { }; + irmin-layers = callPackage ../development/ocaml-modules/irmin/layers.nix { }; + + irmin-mirage = callPackage ../development/ocaml-modules/irmin/mirage.nix { }; + + irmin-mirage-git = callPackage ../development/ocaml-modules/irmin/mirage-git.nix { }; + + irmin-mirage-graphql = callPackage ../development/ocaml-modules/irmin/mirage-graphql.nix { }; irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { }; @@ -899,6 +919,8 @@ let inherit (pkgs) postgresql; }; + ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; @@ -1057,6 +1079,8 @@ let semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; + sha = callPackage ../development/ocaml-modules/sha { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; @@ -1395,7 +1419,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { }); - ocamlPackages_latest = ocamlPackages_4_11; + ocamlPackages_latest = ocamlPackages_4_12; ocamlPackages = ocamlPackages_4_10; } diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/octave-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/octave-packages.nix new file mode 100644 index 00000000000..6278a7042e1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/top-level/octave-packages.nix @@ -0,0 +1,224 @@ +# This file contains the GNU Octave add-on packages set. +# Each attribute is an Octave library. +# Expressions for the Octave libraries are supposed to be in `pkgs/development/octave-modules//default.nix`. + +# When contributing a new package, if that package has a dependency on another +# octave package, then you DO NOT need to explicitly list it as such when +# performing the callPackage. It will be passed implicitly. +# In addition, try to use the same dependencies as the ones octave needs, which +# should ensure greater compatibility between Octave itself and its packages. + +# Like python-packages.nix, packages from top-level.nix are not in the scope +# of the `callPackage` used for packages here. So, when we do need packages +# from outside, we can `inherit` them from `pkgs`. +{ pkgs +, lib +, stdenv +, fetchurl +, newScope +, octave +}: + +with lib; + +makeScope newScope (self: + let + inherit (octave) blas lapack gfortran python texinfo gnuplot; + + callPackage = self.callPackage; + + buildOctavePackage = callPackage ../development/interpreters/octave/build-octave-package.nix { + inherit lib stdenv; + inherit octave; + inherit computeRequiredOctavePackages; + }; + + wrapOctave = callPackage ../development/interpreters/octave/wrap-octave.nix { + inherit octave; + inherit (pkgs) makeSetupHook makeWrapper; + }; + + # Given a list of required Octave package derivations, get a list of + # ALL required Octave packages needed for the ones specified to run. + computeRequiredOctavePackages = drvs: let + # Check whether a derivation is an octave package + hasOctavePackage = drv: drv?isOctavePackage; + packages = filter hasOctavePackage drvs; + in unique (packages ++ concatLists (catAttrs "requiredOctavePackages" packages)); + + in { + + inherit callPackage buildOctavePackage computeRequiredOctavePackages; + + inherit (callPackage ../development/interpreters/octave/hooks { }) + writeRequiredOctavePackagesHook; + + arduino = callPackage ../development/octave-modules/arduino { + inherit (pkgs) arduino; + }; + + audio = callPackage ../development/octave-modules/audio { }; + + bim = callPackage ../development/octave-modules/bim { }; + + bsltl = callPackage ../development/octave-modules/bsltl { }; + + cgi = callPackage ../development/octave-modules/cgi { }; + + communications = callPackage ../development/octave-modules/communications { }; + + control = callPackage ../development/octave-modules/control { }; + + data-smoothing = callPackage ../development/octave-modules/data-smoothing { }; + + database = callPackage ../development/octave-modules/database { }; + + dataframe = callPackage ../development/octave-modules/dataframe { }; + + dicom = callPackage ../development/octave-modules/dicom { }; + + divand = callPackage ../development/octave-modules/divand { }; + + doctest = callPackage ../development/octave-modules/doctest { }; + + econometrics = callPackage ../development/octave-modules/econometrics { }; + + fem-fenics = callPackage ../development/octave-modules/fem-fenics { + # PLACEHOLDER until KarlJoad gets dolfin packaged. + dolfin = null; + ffc = null; + }; + + fits = callPackage ../development/octave-modules/fits { }; + + financial = callPackage ../development/octave-modules/financial { }; + + fpl = callPackage ../development/octave-modules/fpl { }; + + fuzzy-logic-toolkit = callPackage ../development/octave-modules/fuzzy-logic-toolkit { }; + + ga = callPackage ../development/octave-modules/ga { }; + + general = callPackage ../development/octave-modules/general { + nettle = pkgs.nettle; + }; + + generate_html = callPackage ../development/octave-modules/generate_html { }; + + geometry = callPackage ../development/octave-modules/geometry { }; + + gsl = callPackage ../development/octave-modules/gsl { + inherit (pkgs) gsl; + }; + + image = callPackage ../development/octave-modules/image { }; + + image-acquisition = callPackage ../development/octave-modules/image-acquisition { }; + + instrument-control = callPackage ../development/octave-modules/instrument-control { }; + + io = callPackage ../development/octave-modules/io { + inherit (octave) enableJava; + }; + + interval = callPackage ../development/octave-modules/interval { }; + + level-set = callPackage ../development/octave-modules/level-set { }; + + linear-algebra = callPackage ../development/octave-modules/linear-algebra { }; + + lssa = callPackage ../development/octave-modules/lssa { }; + + ltfat = callPackage ../development/octave-modules/ltfat { + inherit (octave) fftw fftwSinglePrec portaudio jdk; + inherit (pkgs) fftwFloat fftwLongDouble; + }; + + mapping = callPackage ../development/octave-modules/mapping { }; + + matgeom = callPackage ../development/octave-modules/matgeom { }; + + miscellaneous = callPackage ../development/octave-modules/miscellaneous { }; + + msh = callPackage ../development/octave-modules/msh { + # PLACEHOLDER until KarlJoad gets dolfin packaged. + dolfin = null; + }; + + mvn = callPackage ../development/octave-modules/mvn { }; + + nan = callPackage ../development/octave-modules/nan { }; + + ncarray = callPackage ../development/octave-modules/ncarray { }; + + netcdf = callPackage ../development/octave-modules/netcdf { + inherit (pkgs) netcdf; + }; + + nurbs = callPackage ../development/octave-modules/nurbs { }; + + ocl = callPackage ../development/octave-modules/ocl { }; + + octclip = callPackage ../development/octave-modules/octclip { }; + + octproj = callPackage ../development/octave-modules/octproj { }; + + optics = callPackage ../development/octave-modules/optics { }; + + optim = callPackage ../development/octave-modules/optim { }; + + optiminterp = callPackage ../development/octave-modules/optiminterp { }; + + parallel = callPackage ../development/octave-modules/parallel { }; + + quaternion = callPackage ../development/octave-modules/quaternion { }; + + queueing = callPackage ../development/octave-modules/queueing { }; + + signal = callPackage ../development/octave-modules/signal { }; + + sockets = callPackage ../development/octave-modules/sockets { }; + + sparsersb = callPackage ../development/octave-modules/sparsersb { + librsb = null; + # TODO: Package the librsb library to build this package. + # http://librsb.sourceforge.net/ + }; + + stk = callPackage ../development/octave-modules/stk { }; + + splines = callPackage ../development/octave-modules/splines { }; + + statistics = callPackage ../development/octave-modules/statistics { }; + + strings = callPackage ../development/octave-modules/strings { }; + + struct = callPackage ../development/octave-modules/struct { }; + + symbolic = callPackage ../development/octave-modules/symbolic { + inherit (octave) python; + }; + + tisean = callPackage ../development/octave-modules/tisean { }; + + tsa = callPackage ../development/octave-modules/tsa { }; + + vibes = callPackage ../development/octave-modules/vibes { + vibes = null; + # TODO: Need to package vibes: + # https://github.com/ENSTABretagneRobotics/VIBES + }; + + video = callPackage ../development/octave-modules/video { }; + + vrml = callPackage ../development/octave-modules/vrml { + freewrl = null; + }; + + windows = callPackage ../development/octave-modules/windows { }; + + zeromq = callPackage ../development/octave-modules/zeromq { + inherit (pkgs) zeromq; + }; + + }) diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/packages-config.nix b/infra/libkookie/nixpkgs/pkgs/top-level/packages-config.nix index d0a71c43a96..84db6fa21ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/packages-config.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/packages-config.nix @@ -34,7 +34,6 @@ "nvidiaPackages" "sourceHanPackages" "atomPackages" - "emacs26.pkgs" "emacs27.pkgs" "steamPackages" "ut2004Packages" diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix index f0ca4bdbaec..2e42ce58bb5 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/perl-packages.nix @@ -6144,6 +6144,10 @@ let license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDifferences ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/* + ''; }; DevelOverloadInfo = buildPerlPackage { @@ -8449,6 +8453,20 @@ let doCheck = false; }; + FunctionParameters = buildPerlPackage { + pname = "Function-Parameters"; + version = "2.001003"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.001003.tar.gz"; + sha256 = "eaa22c6b43c02499ec7db0758c2dd218a3b2ab47a714b2bdf8010b5ee113c242"; + }; + buildInputs = [ DirSelf TestFatal ]; + meta = { + description = "Define functions and methods with parameter lists (\"subroutine signatures\")"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Furl = buildPerlModule { pname = "Furl"; version = "3.13"; @@ -8480,10 +8498,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.48"; + version = "0.49"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "077jnf5a07x0p30iqcw3kh53xh3dplhb0jyyyq9b4c79ira3ds6r"; + sha256 = "0cm7cgfjrqs7jazl0f9q6lgkhz6k8qbawin1z36nrwh2ywc94zjb"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; @@ -8723,7 +8741,6 @@ let sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk"; }; buildInputs = [ pkgs.glib ]; - doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl wrappers for the GLib utility and Object libraries"; @@ -8739,13 +8756,20 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; sha256 = "0mxg6pz8qfyipw0ypr54alij0c4adzg94f62702b2a6hkp5jhij6"; }; - checkInputs = [ pkgs.cairo ]; + checkInputs = [ pkgs.cairo CairoGObject ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete after the execution of the tests. + mkdir -p $out/lib + ln -s $PWD/build/*.so $out/lib/ + ''; + postCheck = '' + rm -r $out/lib + ''; meta = { - broken = true; # TODO: tests failing because "failed to load libregress.so" - # see https://github.com/NixOS/nixpkgs/pull/68115 - # and https://github.com/NixOS/nixpkgs/issues/68116 - # adding pkgs.gnome3.gjs does not fix it description = "Dynamically create Perl language bindings"; license = lib.licenses.lgpl2Plus; }; @@ -8896,6 +8920,20 @@ let }; }; + gotofile = buildPerlPackage { + pname = "goto-file"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/goto-file-0.005.tar.gz"; + sha256 = "c6cdd5ee4a6cdcbdbf314d92a4f9985dbcdf9e4258048cae76125c052aa31f77"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Stop parsing the current file and move on to a different one"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Graph = buildPerlPackage { pname = "Graph"; version = "0.9712"; @@ -8906,6 +8944,22 @@ let propagatedBuildInputs = [ HeapFibonacci ]; }; + GraphicsTIFF = buildPerlPackage { + pname = "Graphics-TIFF"; + version = "9"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz"; + sha256 = "1n1r9r7f6hp2s6l361pyvb1i1pm9xqy0w9n3z5ygm7j64160kz9a"; + }; + buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; + propagatedBuildInputs = [ Readonly ]; + checkInputs = [ TestRequires TestDeep pkgs.hexdump ]; + meta = { + description = "Perl extension for the libtiff library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphViz = buildPerlPackage { pname = "GraphViz"; version = "2.24"; @@ -9079,6 +9133,30 @@ let }; }; + Gtk3ImageView = buildPerlPackage { + pname = "Gtk3-ImageView"; + version = "6"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk3-ImageView-6.tar.gz"; + sha256 = "0krkif9i3hrgjdskw05pcks40fmb43d21lxf4h8aclv0g8z647f0"; + }; + buildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ Readonly Gtk3 ]; + # Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22. + # See https://github.com/carygravel/gtk3-imageview/issues/19 and + # https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659. + doCheck = false; + checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; + checkPhase = '' + ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + make test + ''; + meta = { + description = "Image viewer widget for Gtk3"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Gtk3SimpleList = buildPerlPackage { pname = "Gtk3-SimpleList"; version = "0.21"; @@ -9720,12 +9798,11 @@ let HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.12"; + version = "6.01"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.12.tar.gz"; - sha256 = "19hz9r6f1p406fk1pqyd99h96ipxsmknh4fh1xw0qrrq1k8vwiyz"; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; + sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; - buildInputs = [ CPANMetaCheck ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; @@ -10005,6 +10082,20 @@ let }; }; + ImagePNGLibpng = buildPerlPackage { + pname = "Image-PNG-Libpng"; + version = "0.56"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Image-PNG-Libpng-0.56.tar.gz"; + sha256 = "1nf7qcql7b2w98i859f76q1vb4b2zd0k0ypjbsw7ngs2zzmvzyzs"; + }; + buildInputs = [ pkgs.libpng ]; + meta = { + description = "Perl interface to the C library \"libpng\""; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Imager = buildPerlPackage { pname = "Imager"; version = "1.012"; @@ -11781,6 +11872,20 @@ let }; }; + LongJump = buildPerlPackage { + pname = "Long-Jump"; + version = "0.000001"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Long-Jump-0.000001.tar.gz"; + sha256 = "d5d6456d86992b559d8f66fc90960f919292cd3803c13403faac575762c77af4"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Mechanism for returning to a specific point from a deeply nested stack"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LWP = buildPerlPackage { pname = "libwww-perl"; version = "6.49"; @@ -13987,6 +14092,25 @@ let }; }; + TestPostgreSQL = buildPerlModule { + pname = "Test-PostgreSQL"; + version = "1.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TJ/TJC/Test-PostgreSQL-1.27.tar.gz"; + sha256 = "b1bd231693100cc40905fb0ba3173173201621de9c8301f21c5b593b0a46f907"; + }; + buildInputs = [ ModuleBuildTiny TestSharedFork pkgs.postgresql ]; + propagatedBuildInputs = [ DBDPg DBI FileWhich FunctionParameters Moo TieHashMethod TryTiny TypeTiny ]; + + makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}"; + + meta = { + homepage = https://github.com/TJC/Test-postgresql; + description = "PostgreSQL runner for tests"; + license = with lib.licenses; [ artistic2 ]; + }; + }; + TestUseAllModules = buildPerlPackage { pname = "Test-UseAllModules"; version = "0.17"; @@ -16370,6 +16494,21 @@ let }; }; + PDFBuilder = buildPerlPackage { + pname = "PDF-Builder"; + version = "3.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz"; + sha256 = "1hc22s5gdspr5nyfmix3cwdzcw7z66pcqxy422ksmbninbzv4z93"; + }; + checkInputs = [ TestException TestMemoryCycle ]; + propagatedBuildInputs = [ FontTTF ]; + meta = { + description = "Facilitates the creation and modification of PDF files"; + license = lib.licenses.lgpl21Plus; + }; + }; + PDL = buildPerlPackage rec { pname = "PDL"; version = "2.025"; @@ -16503,6 +16642,7 @@ let url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz"; sha256 = "1psaq3kwlk7g9rxvgsacfjk2mh6cscqf4xl7ggfkzfrnz91aabal"; }; + perlPreHook = "export LD=$CC"; meta = { description = "Querying your filehandle's capabilities"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -16604,19 +16744,18 @@ let }; }; - PerlMagick = buildPerlPackage { + PerlMagick = buildPerlPackage rec { pname = "PerlMagick"; - version = "6.89-1"; + version = "7.0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz"; - sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz"; + sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx"; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = '' sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL ''; - doCheck = false; }; PerlTidy = buildPerlPackage rec { @@ -16630,6 +16769,10 @@ let description = "Indent and reformat perl scripts"; license = lib.licenses.gpl2Plus; }; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/perltidy + ''; }; PHPSerialization = buildPerlPackage { @@ -19754,6 +19897,55 @@ let }; }; + Test2Harness = buildPerlPackage { + pname = "Test2-Harness"; + version = "1.000042"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz"; + sha256 = "aaf231a68af1a6ffd6a11188875fcf572e373e43c8285945227b9d687b43db2d"; + }; + + checkPhase = '' + patchShebangs ./t ./scripts/yath + ./scripts/yath test -j $NIX_BUILD_CORES + ''; + + propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ]; + meta = { + description = "A new and improved test harness with better Test2 integration"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Test2PluginMemUsage = buildPerlPackage { + pname = "Test2-Plugin-MemUsage"; + version = "0.002003"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-MemUsage-0.002003.tar.gz"; + sha256 = "5e0662d5a823ae081641f5ce82843111eec1831cd31f883a6c6de54afdf87c25"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Collect and display memory usage information"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Test2PluginUUID = buildPerlPackage { + pname = "Test2-Plugin-UUID"; + version = "0.002001"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-UUID-0.002001.tar.gz"; + sha256 = "4c6c8d484d7153d8779dc155a992b203095b5c5aa1cfb1ee8bcedcd0601878c9"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ DataUUID ]; + meta = { + description = "Use REAL UUIDs in Test2"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; version = "0.09"; @@ -21922,15 +22114,14 @@ let url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; }; - propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; + buildInputs = [ pkgs.glibcLocales ]; + propagatedBuildInputs = [ TextCharWidth ]; preConfigure = '' substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc.bin}/bin/locale' ''; meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; license = with lib.licenses; [ artistic1 gpl2 ]; - # bogus use of glibc, pretty sure, think this is what we have glibcLocales for? - broken = stdenv.hostPlatform.libc != "glibc"; }; }; @@ -22071,6 +22262,19 @@ let doCheck = false; /* test fails on some machines */ }; + TieHashMethod = buildPerlPackage { + pname = "Tie-Hash-Method"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz"; + sha256 = "d513fbb51413f7ca1e64a1bdce6194df7ec6076dea55066d67b950191eec32a9"; + }; + meta = { + description = "Tied hash with specific methods overriden by callbacks"; + license = with lib.licenses; [ artistic1 ]; + }; + }; + TieRefHash = buildPerlPackage { pname = "Tie-RefHash"; version = "1.40"; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix index 3df697d3d56..c9c4414f2fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/php-packages.nix @@ -29,7 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; { composer = callPackage ../development/php-packages/composer { }; - composer2 = callPackage ../development/php-packages/composer/2.0.nix { }; + composer1 = callPackage ../development/php-packages/composer/1.x.nix { }; php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix index cc0ab7e8c8f..451a198e7c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/python-packages.nix @@ -126,7 +126,13 @@ in { # helpers - wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; }; + # We use build packages because we are making a setup hook to be used as a + # native build input. The script itself references both the build-time + # (build) and run-time (host) python from the explicitly passed in `python` + # attribute, so the `buildPackages` doesn't effect that. + wrapPython = pkgs.buildPackages.callPackage ../development/interpreters/python/wrap-python.nix { + inherit python; + }; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions pythonPackages = self; @@ -168,6 +174,8 @@ in { adal = callPackage ../development/python-modules/adal { }; + adb-enhanced = callPackage ../development/python-modules/adb-enhanced { }; + adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; adb-shell = callPackage ../development/python-modules/adb-shell { }; @@ -202,10 +210,16 @@ in { agent-py = callPackage ../development/python-modules/agent-py { }; - aioamqp = callPackage ../development/python-modules/aioamqp { }; + aioambient = callPackage ../development/python-modules/aioambient { }; ailment = callPackage ../development/python-modules/ailment { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; + + aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; + + aiocache = callPackage ../development/python-modules/aiocache { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; @@ -268,6 +282,8 @@ in { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; aiomysql = callPackage ../development/python-modules/aiomysql { }; @@ -278,6 +294,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -410,6 +428,8 @@ in { apsw = callPackage ../development/python-modules/apsw { }; + aqualogic = callPackage ../development/python-modules/aqualogic { }; + arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; archinfo = callPackage ../development/python-modules/archinfo { }; @@ -544,6 +564,8 @@ in { augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + auroranoaa = callPackage ../development/python-modules/auroranoaa { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; @@ -868,7 +890,7 @@ in { bandit = callPackage ../development/python-modules/bandit { }; - bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_07.bap; }; + bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; }; baron = callPackage ../development/python-modules/baron { }; @@ -1271,6 +1293,8 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; + ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; @@ -1702,6 +1726,8 @@ in { deskcon = callPackage ../development/python-modules/deskcon { }; + desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; @@ -2031,6 +2057,8 @@ in { ed25519 = callPackage ../development/python-modules/ed25519 { }; + editdistance = callPackage ../development/python-modules/editdistance { }; + editorconfig = callPackage ../development/python-modules/editorconfig { }; edward = callPackage ../development/python-modules/edward { }; @@ -2049,6 +2077,8 @@ in { eliot = callPackage ../development/python-modules/eliot { }; + elmax = callPackage ../development/python-modules/elmax { }; + emailthreads = callPackage ../development/python-modules/emailthreads { }; email_validator = callPackage ../development/python-modules/email-validator { }; @@ -2137,6 +2167,8 @@ in { exifread = callPackage ../development/python-modules/exifread { }; + exrex = callPackage ../development/python-modules/exrex { }; + extras = callPackage ../development/python-modules/extras { }; eyeD3 = callPackage ../development/python-modules/eyed3 { }; @@ -2145,6 +2177,8 @@ in { Fabric = callPackage ../development/python-modules/Fabric { }; + faadelays = callPackage ../development/python-modules/faadelays { }; + fabulous = callPackage ../development/python-modules/fabulous { }; facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; @@ -2471,6 +2505,8 @@ in { futures = callPackage ../development/python-modules/futures { }; + fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { }; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; fx2 = callPackage ../development/python-modules/fx2 { }; @@ -2794,6 +2830,8 @@ in { graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + graphtage = callPackage ../development/python-modules/graphtage { }; + graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -2856,6 +2894,8 @@ in { else callPackage ../development/python-modules/gunicorn { }; + guppy3 = callPackage ../development/python-modules/guppy3 { }; + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } else if stdenv.hostPlatform.system == "x86_64-linux" then @@ -3279,8 +3319,6 @@ in { j2cli = callPackage ../development/python-modules/j2cli { }; - jabberbot = callPackage ../development/python-modules/jabberbot { }; - janus = callPackage ../development/python-modules/janus { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; @@ -3359,6 +3397,8 @@ in { jsmin = callPackage ../development/python-modules/jsmin { }; + json5 = callPackage ../development/python-modules/json5 { }; + jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; @@ -3381,12 +3421,16 @@ in { jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + jsonpath-ng = callPackage ../development/python-modules/jsonpath-ng { }; + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; jsonpointer = callPackage ../development/python-modules/jsonpointer { }; jsonref = callPackage ../development/python-modules/jsonref { }; + json-rpc = callPackage ../development/python-modules/json-rpc { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; @@ -3509,6 +3553,12 @@ in { kitchen = callPackage ../development/python-modules/kitchen { }; + kivy = callPackage ../development/python-modules/kivy { + inherit (pkgs) mesa; + }; + + kivy-garden = callPackage ../development/python-modules/kivy-garden { }; + kiwisolver = if isPy3k then callPackage ../development/python-modules/kiwisolver { } else @@ -3540,6 +3590,8 @@ in { labelbox = callPackage ../development/python-modules/labelbox { }; + labgrid = callPackage ../development/python-modules/labgrid { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; }; langcodes = callPackage ../development/python-modules/langcodes { }; @@ -3686,6 +3738,8 @@ in { librosa = callPackage ../development/python-modules/librosa { }; + librouteros = callPackage ../development/python-modules/librouteros { }; + libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); libsavitar = callPackage ../development/python-modules/libsavitar { }; @@ -3737,7 +3791,7 @@ in { libxslt = (toPythonModule (pkgs.libxslt.override { pythonSupport = true; - inherit python; + python3 = python; inherit (self) libxml2; })).py; @@ -3862,20 +3916,11 @@ in { macropy = callPackage ../development/python-modules/macropy { }; maestral = callPackage ../development/python-modules/maestral { - - # https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048 - survey = self.survey.overridePythonAttrs (old: rec { - version = "2.2.1"; - src = old.src.override { - inherit version; - sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0="; - }; - }); - watchdog = self.watchdog.overridePythonAttrs (old: rec { - version = "0.10.3"; + keyring = self.keyring.overridePythonAttrs (old: rec { + version = "22.0.1"; src = old.src.override { inherit version; - sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; + sha256 = "sha256-mss+FFLtu3VEgisS/SVFkHh2nlYPpR9Bi20Ar6pheN8="; }; }); }; @@ -3993,6 +4038,8 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; @@ -4023,6 +4070,8 @@ in { mesa = callPackage ../development/python-modules/mesa { }; + meshio = callPackage ../development/python-modules/meshio { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs @@ -4034,6 +4083,8 @@ in { metaphone = callPackage ../development/python-modules/metaphone { }; + metar = callPackage ../development/python-modules/metar { }; + mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; @@ -4210,6 +4261,8 @@ in { mt-940 = callPackage ../development/python-modules/mt-940 { }; + mullvad-api = callPackage ../development/python-modules/mullvad-api { }; + mulpyplexer = callPackage ../development/python-modules/mulpyplexer { }; multidict = callPackage ../development/python-modules/multidict { }; @@ -4261,6 +4314,8 @@ in { mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + myjwt = callPackage ../development/python-modules/myjwt { }; + mypy = callPackage ../development/python-modules/mypy { }; mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; @@ -4588,6 +4643,8 @@ in { openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { }; + opt-einsum = if isPy27 then callPackage ../development/python-modules/opt-einsum/2.nix { } else @@ -4627,8 +4684,6 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; }); - owslib = callPackage ../development/python-modules/owslib { }; oyaml = callPackage ../development/python-modules/oyaml { }; @@ -4877,9 +4932,14 @@ in { else callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libX11 libxcb; }; + pillow-simd = callPackage ../development/python-modules/pillow-simd { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + }; + pims = callPackage ../development/python-modules/pims { }; pinboard = callPackage ../development/python-modules/pinboard { }; @@ -4916,6 +4976,8 @@ in { pynuki = callPackage ../development/python-modules/pynuki { }; + pynws = callPackage ../development/python-modules/pynws { }; + pysbd = callPackage ../development/python-modules/pysbd { }; pyshark = callPackage ../development/python-modules/pyshark { }; @@ -5115,10 +5177,14 @@ in { protobuf = pkgs.protobuf; }; + protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; + prov = callPackage ../development/python-modules/prov { }; prox-tv = callPackage ../development/python-modules/prox-tv { }; + proxmoxer = callPackage ../development/python-modules/proxmoxer { }; + psautohint = callPackage ../development/python-modules/psautohint { }; psd-tools = callPackage ../development/python-modules/psd-tools { }; @@ -5207,6 +5273,8 @@ in { pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pyalmond = callPackage ../development/python-modules/pyalmond { }; + pyamf = callPackage ../development/python-modules/pyamf { }; pyamg = callPackage ../development/python-modules/pyamg { }; @@ -5287,8 +5355,12 @@ in { pycdio = callPackage ../development/python-modules/pycdio { }; + pycec = callPackage ../development/python-modules/pycec { }; + pycfdns = callPackage ../development/python-modules/pycfdns { }; + pychannels = callPackage ../development/python-modules/pychannels { }; + pychart = callPackage ../development/python-modules/pychart { }; pychef = callPackage ../development/python-modules/pychef { }; @@ -5317,6 +5389,8 @@ in { pycparser = callPackage ../development/python-modules/pycparser { }; + py-cid = callPackage ../development/python-modules/py-cid { }; + py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; pycrc = callPackage ../development/python-modules/pycrc { }; @@ -5344,6 +5418,8 @@ in { pycxx = callPackage ../development/python-modules/pycxx { }; + pydaikin = callPackage ../development/python-modules/pydaikin { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydbus = callPackage ../development/python-modules/pydbus { }; @@ -5384,6 +5460,8 @@ in { pyee = callPackage ../development/python-modules/pyee { }; + pyeight = callPackage ../development/python-modules/pyeight { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; pyemd = callPackage ../development/python-modules/pyemd { }; @@ -5430,6 +5508,10 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyflume = callPackage ../development/python-modules/pyflume { }; + + pyflunearyou = callPackage ../development/python-modules/pyflunearyou { }; + pyfma = callPackage ../development/python-modules/pyfma { }; pyfribidi = callPackage ../development/python-modules/pyfribidi { }; @@ -5570,6 +5652,8 @@ in { pykka = callPackage ../development/python-modules/pykka { }; + pykmtronic = callPackage ../development/python-modules/pykmtronic { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; pylacrosse = callPackage ../development/python-modules/pylacrosse { }; @@ -5646,12 +5730,16 @@ in { pymavlink = callPackage ../development/python-modules/pymavlink { }; + pymazda = callPackage ../development/python-modules/pymazda { }; + pymbolic = callPackage ../development/python-modules/pymbolic { }; pymc3 = callPackage ../development/python-modules/pymc3 { }; pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + pymediaroom = callPackage ../development/python-modules/pymediaroom { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymemoize = callPackage ../development/python-modules/pymemoize { }; @@ -5662,6 +5750,10 @@ in { pymetno = callPackage ../development/python-modules/pymetno { }; + pymitv = callPackage ../development/python-modules/pymitv { }; + + pymfy = callPackage ../development/python-modules/pymfy { }; + pymodbus = callPackage ../development/python-modules/pymodbus { }; pymongo = callPackage ../development/python-modules/pymongo { }; @@ -5672,6 +5764,10 @@ in { pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pymsteams = callPackage ../development/python-modules/pymsteams { }; + + py-multiaddr = callPackage ../development/python-modules/py-multiaddr { }; + py-multibase = callPackage ../development/python-modules/py-multibase { }; py-multicodec = callPackage ../development/python-modules/py-multicodec { }; @@ -5686,6 +5782,8 @@ in { pymyq = callPackage ../development/python-modules/pymyq { }; + pymysensors = callPackage ../development/python-modules/pymysensors { }; + pymysql = callPackage ../development/python-modules/pymysql { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; @@ -5794,6 +5892,8 @@ in { pypillowfight = callPackage ../development/python-modules/pypillowfight { }; + pyplaato = callPackage ../development/python-modules/pyplaato { }; + pyplatec = callPackage ../development/python-modules/pyplatec { }; pypoppler = callPackage ../development/python-modules/pypoppler { }; @@ -5882,6 +5982,10 @@ in { pyres = callPackage ../development/python-modules/pyres { }; + pyrisco = callPackage ../development/python-modules/pyrisco { }; + + pyrituals = callPackage ../development/python-modules/pyrituals { }; + pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; @@ -5959,6 +6063,8 @@ in { pysma = callPackage ../development/python-modules/pysma { }; + pysmappee = callPackage ../development/python-modules/pysmappee { }; + pysmb = callPackage ../development/python-modules/pysmb { }; pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; @@ -6033,6 +6139,8 @@ in { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; + pyswitchbot = callPackage ../development/python-modules/pyswitchbot { }; + pysychonaut = callPackage ../development/python-modules/pysychonaut { }; pysyncobj = callPackage ../development/python-modules/pysyncobj { }; @@ -6043,6 +6151,8 @@ in { pytaglib = callPackage ../development/python-modules/pytaglib { }; + pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { }; + pyte = callPackage ../development/python-modules/pyte { }; pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; @@ -6141,6 +6251,8 @@ in { pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { }; + pytest-httpx = callPackage ../development/python-modules/pytest-httpx { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; @@ -6249,6 +6361,8 @@ in { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-awair = callPackage ../development/python-modules/python-awair { }; + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; @@ -6289,6 +6403,8 @@ in { python-engineio = callPackage ../development/python-modules/python-engineio { }; + python-engineio_3 = callPackage ../development/python-modules/python-engineio/3.nix { }; + python-etcd = callPackage ../development/python-modules/python-etcd { }; python_fedora = callPackage ../development/python-modules/python_fedora { }; @@ -6299,6 +6415,8 @@ in { python-frontmatter = callPackage ../development/python-modules/python-frontmatter { }; + python-gammu = callPackage ../development/python-modules/python-gammu { }; + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; python-gnupg = callPackage ../development/python-modules/python-gnupg { }; @@ -6421,6 +6539,8 @@ in { python-slugify = callPackage ../development/python-modules/python-slugify { }; + python-smarttub = callPackage ../development/python-modules/python-smarttub { }; + python-snap7 = callPackage ../development/python-modules/python-snap7 { inherit (pkgs) snap7; }; @@ -6429,6 +6549,8 @@ in { python-socketio = callPackage ../development/python-modules/python-socketio { }; + python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python_statsd = callPackage ../development/python-modules/python_statsd { }; @@ -6441,6 +6563,8 @@ in { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; + python-twitter = callPackage ../development/python-modules/python-twitter { }; python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; @@ -6453,6 +6577,8 @@ in { python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + python-velbus = callPackage ../development/python-modules/python-velbus { }; + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; python-vlc = callPackage ../development/python-modules/python-vlc { }; @@ -6479,9 +6605,7 @@ in { pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; - pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { - inherit (pkgs.linuxPackages) nvidia_x11; - }; + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { }; pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; @@ -6491,6 +6615,8 @@ in { pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; + pytrends = callPackage ../development/python-modules/pytrends { }; pytricia = callPackage ../development/python-modules/pytricia { }; @@ -6522,6 +6648,8 @@ in { pyupdate = callPackage ../development/python-modules/pyupdate { }; + pyupgrade = callPackage ../development/python-modules/pyupgrade { }; + pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; pyutil = callPackage ../development/python-modules/pyutil { }; @@ -6542,8 +6670,12 @@ in { pyvex = callPackage ../development/python-modules/pyvex { }; + pyvicare = callPackage ../development/python-modules/pyvicare { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pyvizio = callPackage ../development/python-modules/pyvizio { }; + pyvips = callPackage ../development/python-modules/pyvips { inherit (pkgs) pkg-config vips glib; }; @@ -6552,6 +6684,8 @@ in { pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + pyvolumio = callPackage ../development/python-modules/pyvolumio { }; + pyvoro = callPackage ../development/python-modules/pyvoro { }; pywal = callPackage ../development/python-modules/pywal { }; @@ -6596,6 +6730,8 @@ in { pyxeoma = callPackage ../development/python-modules/pyxeoma { }; + pyxiaomigateway = callPackage ../development/python-modules/pyxiaomigateway { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); @@ -6663,6 +6799,8 @@ in { querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + questionary = callPackage ../development/python-modules/questionary { }; + queuelib = callPackage ../development/python-modules/queuelib { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; @@ -6675,6 +6813,8 @@ in { radio_beam = callPackage ../development/python-modules/radio_beam { }; + radiotherm = callPackage ../development/python-modules/radiotherm { }; + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; rainbowstream = callPackage ../development/python-modules/rainbowstream { }; @@ -6687,6 +6827,8 @@ in { rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + ratelimit = callPackage ../development/python-modules/ratelimit { }; + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; raven = callPackage ../development/python-modules/raven { }; @@ -6809,7 +6951,7 @@ in { retrying = callPackage ../development/python-modules/retrying { }; - retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); + retworkx = callPackage ../development/python-modules/retworkx { }; rfc3986 = callPackage ../development/python-modules/rfc3986 { }; @@ -6819,12 +6961,16 @@ in { rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + rfcat = callPackage ../development/python-modules/rfcat { }; + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); rich = callPackage ../development/python-modules/rich { }; rig = callPackage ../development/python-modules/rig { }; + ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; + ripser = callPackage ../development/python-modules/ripser { }; rising = callPackage ../development/python-modules/rising { }; @@ -6954,6 +7100,8 @@ in { safety = callPackage ../development/python-modules/safety { }; + sagemaker = callPackage ../development/python-modules/sagemaker { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; sane = callPackage ../development/python-modules/sane { @@ -7161,6 +7309,8 @@ in { sharedmem = callPackage ../development/python-modules/sharedmem { }; + sharkiqpy = callPackage ../development/python-modules/sharkiqpy { }; + sh = callPackage ../development/python-modules/sh { }; shellingham = callPackage ../development/python-modules/shellingham { }; @@ -7202,6 +7352,8 @@ in { simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + simplehound = callPackage ../development/python-modules/simplehound { }; + simplejson = callPackage ../development/python-modules/simplejson { }; simplekml = callPackage ../development/python-modules/simplekml { }; @@ -7234,6 +7386,10 @@ in { skorch = callPackage ../development/python-modules/skorch { }; + skybellpy = callPackage ../development/python-modules/skybellpy { }; + + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; + slackclient = callPackage ../development/python-modules/slackclient { }; sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; @@ -7264,6 +7420,8 @@ in { smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { }; @@ -7575,6 +7733,8 @@ in { sure = callPackage ../development/python-modules/sure { }; + surepy = callPackage ../development/python-modules/surepy { }; + survey = callPackage ../development/python-modules/survey { }; suseapi = callPackage ../development/python-modules/suseapi { }; @@ -7623,6 +7783,8 @@ in { tag-expressions = callPackage ../development/python-modules/tag-expressions { }; + tahoma-api = callPackage ../development/python-modules/tahoma-api { }; + tarman = callPackage ../development/python-modules/tarman { }; tasklib = callPackage ../development/python-modules/tasklib { }; @@ -7696,12 +7858,16 @@ in { tensorly = callPackage ../development/python-modules/tensorly { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; + termcolor = callPackage ../development/python-modules/termcolor { }; terminado = callPackage ../development/python-modules/terminado { }; terminaltables = callPackage ../development/python-modules/terminaltables { }; + termplotlib = callPackage ../development/python-modules/termplotlib { }; + termstyle = callPackage ../development/python-modules/termstyle { }; teslajsonpy = callPackage ../development/python-modules/teslajsonpy { }; @@ -7798,8 +7964,6 @@ in { tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; - tiros = callPackage ../development/python-modules/tiros { }; - tissue = callPackage ../development/python-modules/tissue { }; titlecase = callPackage ../development/python-modules/titlecase { }; @@ -7824,6 +7988,8 @@ in { tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + tokenize-rt = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenize-rt { })); + tokenlib = callPackage ../development/python-modules/tokenlib { }; tokenserver = callPackage ../development/python-modules/tokenserver { }; @@ -7862,6 +8028,8 @@ in { tox = callPackage ../development/python-modules/tox { }; + tpm2-pytss = callPackage ../development/python-modules/tpm2-pytss { }; + tqdm = callPackage ../development/python-modules/tqdm { }; traceback2 = callPackage ../development/python-modules/traceback2 { }; @@ -7893,6 +8061,8 @@ in { translationstring = callPackage ../development/python-modules/translationstring { }; + transmission-rpc = callPackage ../development/python-modules/transmission-rpc { }; + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; treq = callPackage ../development/python-modules/treq { }; @@ -7923,12 +8093,16 @@ in { tumpa = callPackage ../development/python-modules/tumpa { }; + tuyaha = callPackage ../development/python-modules/tuyaha { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = callPackage ../development/python-modules/tvnamer { }; tweepy = callPackage ../development/python-modules/tweepy { }; + twentemilieu = callPackage ../development/python-modules/twentemilieu { }; + twiggy = callPackage ../development/python-modules/twiggy { }; twilio = callPackage ../development/python-modules/twilio { }; @@ -7937,6 +8111,8 @@ in { twine = callPackage ../development/python-modules/twine { }; + twinkly-client = callPackage ../development/python-modules/twinkly-client { }; + twisted = callPackage ../development/python-modules/twisted { }; twitch-python = callPackage ../development/python-modules/twitch-python { }; @@ -7955,6 +8131,8 @@ in { twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; + twitterapi = callPackage ../development/python-modules/twitterapi { }; + twofish = callPackage ../development/python-modules/twofish { }; txaio = callPackage ../development/python-modules/txaio { }; @@ -8134,6 +8312,8 @@ in { vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + venstarcolortouch = callPackage ../development/python-modules/venstarcolortouch { }; + venusian = callPackage ../development/python-modules/venusian { }; verboselogs = callPackage ../development/python-modules/verboselogs { }; @@ -8250,6 +8430,8 @@ in { web = callPackage ../development/python-modules/web { }; + web-cache = callPackage ../development/python-modules/web-cache { }; + webcolors = callPackage ../development/python-modules/webcolors { }; webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; @@ -8296,6 +8478,8 @@ in { widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; + wiffi = callPackage ../development/python-modules/wiffi { }; + willow = callPackage ../development/python-modules/willow { }; winacl = callPackage ../development/python-modules/winacl { }; @@ -8322,6 +8506,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; @@ -8424,8 +8610,6 @@ in { xmodem = callPackage ../development/python-modules/xmodem { }; - xmpppy = callPackage ../development/python-modules/xmpppy { }; - xnd = callPackage ../development/python-modules/xnd { }; xpybutil = callPackage ../development/python-modules/xpybutil { }; @@ -8450,6 +8634,8 @@ in { yahooweather = callPackage ../development/python-modules/yahooweather { }; + yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { }; + yamale = callPackage ../development/python-modules/yamale { }; yamllint = callPackage ../development/python-modules/yamllint { }; @@ -8521,6 +8707,10 @@ in { zdaemon = callPackage ../development/python-modules/zdaemon { }; + zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override { + python3 = python; + })).py; + zeep = callPackage ../development/python-modules/zeep { }; zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/qt5-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/qt5-packages.nix index 223132217a5..336f58adf11 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -127,7 +127,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1 { }; poppler = callPackage ../development/libraries/poppler { lcms = pkgs.lcms2; diff --git a/infra/libkookie/nixpkgs/pkgs/top-level/wine-packages.nix b/infra/libkookie/nixpkgs/pkgs/top-level/wine-packages.nix index 88ea6a00f8c..923d2b80818 100644 --- a/infra/libkookie/nixpkgs/pkgs/top-level/wine-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/top-level/wine-packages.nix @@ -27,6 +27,7 @@ rec { xineramaSupport = true; xmlSupport = true; sdlSupport = true; + mingwSupport = true; }; full = base.override {