diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 1d3d51cda7..b68e8436fe 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -94,10 +94,6 @@ /pkgs/applications/science/math/R @peti /pkgs/development/r-modules @peti -# Ruby -/pkgs/development/interpreters/ruby @alyssais -/pkgs/development/ruby-modules @alyssais - # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq /pkgs/build-support/rust @andir @danieldk @zowoq diff --git a/third_party/nixpkgs/.github/workflows/labels.yml b/third_party/nixpkgs/.github/workflows/labels.yml index 1139807753..4232ceb623 100644 --- a/third_party/nixpkgs/.github/workflows/labels.yml +++ b/third_party/nixpkgs/.github/workflows/labels.yml @@ -2,6 +2,7 @@ name: "Label PR" on: pull_request_target: + types: [edited, opened, synchronize, reopened] jobs: labels: diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml index a75e840293..fa1f8fc691 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -15,11 +15,11 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v13 with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v8 + - uses: cachix/cachix-action@v9 with: # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml index 7596719d9b..192a4c6868 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -15,11 +15,11 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v13 with: # explicitly enable sandbox extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v8 + - uses: cachix/cachix-action@v9 with: # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. name: nixpkgs-ci diff --git a/third_party/nixpkgs/doc/builders/images.xml b/third_party/nixpkgs/doc/builders/images.xml index b72fe094db..d7d2502918 100644 --- a/third_party/nixpkgs/doc/builders/images.xml +++ b/third_party/nixpkgs/doc/builders/images.xml @@ -7,6 +7,6 @@ - + diff --git a/third_party/nixpkgs/doc/builders/images/ocitools.section.md b/third_party/nixpkgs/doc/builders/images/ocitools.section.md new file mode 100644 index 0000000000..d3dee57eba --- /dev/null +++ b/third_party/nixpkgs/doc/builders/images/ocitools.section.md @@ -0,0 +1,37 @@ +# pkgs.ociTools {#sec-pkgs-ociTools} + +`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that it makes no assumptions about the container runner you choose to use to run the created container. + +## buildContainer {#ssec-pkgs-ociTools-buildContainer} + +This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command. + +The parameters of `buildContainer` with an example value are described below: + +```nix +buildContainer { + args = [ + (with pkgs; + writeScript "run.sh" '' + #!${bash}/bin/bash + exec ${bash}/bin/bash + '').outPath + ]; + + mounts = { + "/data" = { + type = "none"; + source = "/var/lib/mydata"; + options = [ "bind" ]; + }; + }; + + readonly = false; +} +``` + +- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container + +- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) + +- `readonly` makes the container\'s rootfs read-only if it is set to true. The default value is false `false`. diff --git a/third_party/nixpkgs/doc/builders/images/ocitools.xml b/third_party/nixpkgs/doc/builders/images/ocitools.xml deleted file mode 100644 index f26ed86442..0000000000 --- a/third_party/nixpkgs/doc/builders/images/ocitools.xml +++ /dev/null @@ -1,61 +0,0 @@ -
- pkgs.ociTools - - - pkgs.ociTools is a set of functions for creating containers according to the OCI container specification v1.0.0. Beyond that it makes no assumptions about the container runner you choose to use to run the created container. - - -
- buildContainer - - - This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a config.json and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command. - - - - The parameters of buildContainer with an example value are described below: - - - - Build Container - -buildContainer { - args = [ (with pkgs; writeScript "run.sh" '' - #!${bash}/bin/bash - exec ${bash}/bin/bash - '').outPath ]; - - mounts = { - "/data" = { - type = "none"; - source = "/var/lib/mydata"; - options = [ "bind" ]; - }; - }; - - readonly = false; -} - - - - - args specifies a set of arguments to run inside the container. This is the only required argument for buildContainer. All referenced packages inside the derivation will be made available inside the container - - - - - mounts specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) - - - - - readonly makes the container's rootfs read-only if it is set to true. The default value is false false. - - - - -
-
diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.section.md b/third_party/nixpkgs/doc/builders/packages/citrix.section.md new file mode 100644 index 0000000000..b25ecb0bde --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/citrix.section.md @@ -0,0 +1,32 @@ +# Citrix Workspace {#sec-citrix} + +The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a remote desktop viewer which provides access to [XenDesktop](https://www.citrix.com/products/xenapp-xendesktop/) installations. + +## Basic usage {#sec-citrix-base} + +The tarball archive needs to be downloaded manually as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store the package can be built and installed with Nix. + +## Citrix Selfservice {#sec-citrix-selfservice} + +The [selfservice](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions. + +In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that you can configure the `selfservice` like this: + +```ShellSession +$ storebrowse -C ~/Downloads/receiverconfig.cr +$ selfservice +``` + +## Custom certificates {#sec-citrix-custom-certs} + +The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: + +```nix +with import { config.allowUnfree = true; }; +let + extraCerts = [ + ./custom-cert-1.pem + ./custom-cert-2.pem # ... + ]; +in citrix_workspace.override { inherit extraCerts; } +``` diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.xml b/third_party/nixpkgs/doc/builders/packages/citrix.xml deleted file mode 100644 index 7a16b79f23..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/citrix.xml +++ /dev/null @@ -1,48 +0,0 @@ -
- Citrix Workspace - - - The Citrix Workspace App is a remote desktop viewer which provides access to XenDesktop installations. - - -
- Basic usage - - - The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Workspace needs to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. - -
- -
- Citrix Selfservice - - - The selfservice is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions. - - - - In order to set this up, you first have to download the .cr file from the Netscaler Gateway. After that you can configure the selfservice like this: - -$ storebrowse -C ~/Downloads/receiverconfig.cr -$ selfservice - - -
- -
- Custom certificates - - - The Citrix Workspace App in nixpkgs trusts several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: - - { config.allowUnfree = true; }; -let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_workspace.override { - inherit extraCerts; -}]]> - - -
-
diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index 9653bae472..a2bcd43153 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -5,7 +5,7 @@ This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org. - + diff --git a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md index f57b194a72..30a266502b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md @@ -3,7 +3,7 @@ ## How to use Agda Agda can be installed from `agda`: -``` +```ShellSession $ nix-env -iA agda ``` @@ -15,13 +15,13 @@ To use Agda with libraries, the `agda.withPackages` function can be used. This f For example, suppose we wanted a version of Agda which has access to the standard library. This can be obtained with the expressions: -``` +```nix agda.withPackages [ agdaPackages.standard-library ] ``` or -``` +```nix agda.withPackages (p: [ p.standard-library ]) ``` @@ -32,7 +32,7 @@ If you want to use a library in your home directory (for instance if it is a dev Agda will not by default use these libraries. To tell Agda to use the library we have some options: * Call `agda` with the library flag: -``` +```ShellSession $ agda -l standard-library -i . MyFile.agda ``` * Write a `my-library.agda-lib` file for the project you are working on which may look like: @@ -49,7 +49,7 @@ More information can be found in the [official Agda documentation on library man Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag. This can be overridden by a different version of `ghc` as follows: -``` +```nix agda.withPackages { pkgs = [ ... ]; ghc = haskell.compiler.ghcHEAD; @@ -80,12 +80,12 @@ By default, Agda sources are files ending on `.agda`, or literate Agda files end ## Adding Agda packages to Nixpkgs To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: -``` +```nix { mkDerivation, standard-library, fetchFromGitHub }: ``` and `mkDerivation` should be called instead of `agdaPackages.mkDerivation`. Here is an example skeleton derivation for iowa-stdlib: -``` +```nix mkDerivation { version = "1.5.0"; pname = "iowa-stdlib"; diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index c394704249..36369fd4e6 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -4,7 +4,7 @@ For local development, it's recommended to use nix-shell to create a dotnet environment: -``` +```nix # shell.nix with import {}; @@ -20,7 +20,7 @@ mkShell { It's very likely that more than one sdk will be needed on a given project. Dotnet provides several different frameworks (E.g dotnetcore, aspnetcore, etc.) as well as many versions for a given framework. Normally, dotnet is able to fetch a framework and install it relative to the executable. However, this would mean writing to the nix store in nixpkgs, which is read-only. To support the many-sdk use case, one can compose an environment using `dotnetCorePackages.combinePackages`: -``` +```nix with import {}; mkShell { @@ -37,7 +37,7 @@ mkShell { This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: -``` +```ShellSesssion $ dotnet --info .NET Core SDK (reflecting any global.json): Version: 3.1.101 diff --git a/third_party/nixpkgs/doc/languages-frameworks/idris.section.md b/third_party/nixpkgs/doc/languages-frameworks/idris.section.md index 41e4f7ec31..000e3627d7 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/idris.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/idris.section.md @@ -4,7 +4,7 @@ The easiest way to get a working idris version is to install the `idris` attribute: -``` +```ShellSesssion $ # On NixOS $ nix-env -i nixos.idris $ # On non-NixOS @@ -21,7 +21,7 @@ self: super: { And then: -``` +```ShellSesssion $ # On NixOS $ nix-env -iA nixos.myIdris $ # On non-NixOS @@ -29,7 +29,7 @@ $ nix-env -iA nixpkgs.myIdris ``` To see all available Idris packages: -``` +```ShellSesssion $ # On NixOS $ nix-env -qaPA nixos.idrisPackages $ # On non-NixOS @@ -37,7 +37,7 @@ $ nix-env -qaPA nixpkgs.idrisPackages ``` Similarly, entering a `nix-shell`: -``` +```ShellSesssion $ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])' ``` @@ -45,14 +45,14 @@ $ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruvi To have access to these libraries in idris, call it with an argument `-p ` for each library: -``` +```ShellSesssion $ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])' [nix-shell:~]$ idris -p contrib -p pruviloj ``` A listing of all available packages the Idris binary has access to is available via `--listlibs`: -``` +```ShellSesssion $ idris --listlibs 00prelude-idx.ibc pruviloj @@ -105,7 +105,7 @@ build-idris-package { Assuming this file is saved as `yaml.nix`, it's buildable using -``` +```ShellSesssion $ nix-build -E '(import {}).idrisPackages.callPackage ./yaml.nix {}' ``` @@ -121,7 +121,7 @@ with import {}; in another file (say `default.nix`) to be able to build it with -``` +```ShellSesssion $ nix-build -A yaml ``` @@ -133,7 +133,7 @@ Specifically, you can set `idrisBuildOptions`, `idrisTestOptions`, `idrisInstall For example you could set -``` +```nix build-idris-package { idrisBuildOptions = [ "--log" "1" "--verbose" ] diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index f6d87b14be..96ac61ab54 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -7,8 +7,9 @@ #### Overview Several versions of the Python interpreter are available on Nix, as well as a -high amount of packages. The attribute `python` refers to the default -interpreter, which is currently CPython 2.7. It is also possible to refer to +high amount of packages. The attribute `python3` refers to the default +interpreter, which is currently CPython 3.8. The attribute `python` refers to +CPython 2.7 for backwards-compatibility. It is also possible to refer to specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to the default PyPy interpreter. @@ -78,7 +79,7 @@ $ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' By default `nix-shell` will start a `bash` session with this interpreter in our `PATH`, so if we then run: -``` +```Python console [nix-shell:~/src/nixpkgs]$ python3 Python 3.8.1 (default, Dec 18 2019, 19:06:26) [GCC 9.2.0] on linux @@ -89,7 +90,7 @@ Type "help", "copyright", "credits" or "license" for more information. Note that no other modules are in scope, even if they were imperatively installed into our user environment as a dependency of a Python application: -``` +```Python console >>> import requests Traceback (most recent call last): File "", line 1, in @@ -145,8 +146,8 @@ print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") Executing this script requires a `python3` that has `numpy`. Using what we learned in the previous section, we could startup a shell and just run it like so: -``` -nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' +```ShellSesssion +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' The dot product of [1 2] and [3 4] is: 11 ``` @@ -762,10 +763,10 @@ and in this case the `python38` interpreter is automatically used. Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as respectively `python27`, `python36`, `python37`, `python38` and `python39`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python38`. The default interpreter, `python`, maps to `python2`. The PyPy -interpreters compatible with Python 2.7 and 3 are available as `pypy27` and -`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. -The Nix expressions for the interpreters can be found in +`python39`. The attribute `python` maps to `python2`. The PyPy interpreters +compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with +aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. The Nix +expressions for the interpreters can be found in `pkgs/development/interpreters/python`. All packages depending on any Python interpreter get appended @@ -788,6 +789,23 @@ Each interpreter has the following attributes: - `executable`. Name of the interpreter executable, e.g. `python3.8`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. +### Optimizations + +The Python interpreters are by default not build with optimizations enabled, because +the builds are in that case not reproducible. To enable optimizations, override the +interpreter of interest, e.g using + +``` +let + pkgs = import ./. {}; + mypython = pkgs.python3.override { + enableOptimizations = true; + reproducibleBuild = false; + self = mypython; + }; +in mypython +``` + ### Building packages and applications Python libraries and applications that use `setuptools` or diff --git a/third_party/nixpkgs/doc/languages-frameworks/qt.section.md b/third_party/nixpkgs/doc/languages-frameworks/qt.section.md index 9747c1037a..6f8c9626e6 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/qt.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/qt.section.md @@ -103,7 +103,7 @@ supported Qt version. ### Example adding a Qt library {#qt-library-all-packages-nix} The following represents the contents of `qt5-packages.nix`. -``` +```nix { # ... @@ -133,7 +133,7 @@ to select the Qt 5 version used for the application. ### Example adding a Qt application {#qt-application-all-packages-nix} The following represents the contents of `qt5-packages.nix`. -``` +```nix { # ... @@ -144,7 +144,7 @@ The following represents the contents of `qt5-packages.nix`. ``` The following represents the contents of `all-packages.nix`. -``` +```nix { # ... diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 8121d03e04..d1a6a56677 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -2,13 +2,14 @@ To install the rust compiler and cargo put -``` -rustc -cargo +```nix +environment.systemPackages = [ + rustc + cargo +]; ``` -into the `environment.systemPackages` or bring them into -scope with `nix-shell -p rustc cargo`. +into your `configuration.nix` or bring them into scope with `nix-shell -p rustc cargo`. For other versions such as daily builds (beta and nightly), use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), @@ -18,7 +19,7 @@ or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay). Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: -``` +```nix { lib, rustPlatform }: rustPlatform.buildRustPackage rec { @@ -49,7 +50,7 @@ package. `cargoHash256` is used for traditional Nix SHA-256 hashes, such as the one in the example above. `cargoHash` should instead be used for [SRI](https://www.w3.org/TR/SRI/) hashes. For example: -``` +```nix cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; ``` @@ -59,13 +60,13 @@ expression and building the package once. The correct checksum can then be taken from the failed build. A fake hash can be used for `cargoSha256` as follows: -``` +```nix cargoSha256 = lib.fakeSha256; ``` For `cargoHash` you can use: -``` +```nix cargoHash = lib.fakeHash; ``` @@ -262,7 +263,7 @@ Otherwise, some steps may fail because of the modified directory structure of `t source code in a reproducible way. If it is missing or out-of-date one can use the `cargoPatches` attribute to update or add it. -``` +```nix rustPlatform.buildRustPackage rec { (...) cargoPatches = [ @@ -489,7 +490,7 @@ an example for a minimal `hello` crate: Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: -``` +```nix # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone { stdenv, buildRustCrate, fetchgit }: let kernel = stdenv.buildPlatform.parsed.kernel.name; @@ -518,7 +519,7 @@ dependencies, for instance by adding a single line `libc="*"` to our `Cargo.lock`. Then, `carnix` needs to be run again, and produces the following nix file: -``` +```nix # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone { stdenv, buildRustCrate, fetchgit }: let kernel = stdenv.buildPlatform.parsed.kernel.name; @@ -573,7 +574,7 @@ Some crates require external libraries. For crates from Starting from that file, one can add more overrides, to add features or build inputs by overriding the hello crate in a seperate file. -``` +```nix with import {}; ((import ./hello.nix).hello {}).override { crateOverrides = defaultCrateOverrides // { @@ -593,7 +594,7 @@ derivation depend on the crate's version, the `attrs` argument of the override above can be read, as in the following example, which patches the derivation: -``` +```nix with import {}; ((import ./hello.nix).hello {}).override { crateOverrides = defaultCrateOverrides // { @@ -614,7 +615,7 @@ dependencies. For instance, to override the build inputs for crate `libc` in the example above, where `libc` is a dependency of the main crate, we could do: -``` +```nix with import {}; ((import hello.nix).hello {}).override { crateOverrides = defaultCrateOverrides // { @@ -630,27 +631,27 @@ general. A number of other parameters can be overridden: - The version of rustc used to compile the crate: - ``` + ```nix (hello {}).override { rust = pkgs.rust; }; ``` - Whether to build in release mode or debug mode (release mode by default): - ``` + ```nix (hello {}).override { release = false; }; ``` - Whether to print the commands sent to rustc when building (equivalent to `--verbose` in cargo: - ``` + ```nix (hello {}).override { verbose = false; }; ``` - Extra arguments to be passed to `rustc`: - ``` + ```nix (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; }; ``` @@ -662,7 +663,7 @@ general. A number of other parameters can be overridden: `postInstall`. As an example, here is how to create a new module before running the build script: - ``` + ```nix (hello {}).override { preConfigure = '' echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" @@ -676,7 +677,7 @@ One can also supply features switches. For example, if we want to compile `diesel_cli` only with the `postgres` feature, and no default features, we would write: -``` +```nix (callPackage ./diesel.nix {}).diesel { default = false; postgres = true; @@ -699,7 +700,7 @@ Using the example `hello` project above, we want to do the following: A typical `shell.nix` might look like: -``` +```nix with import {}; stdenv.mkDerivation { @@ -721,7 +722,7 @@ stdenv.mkDerivation { ``` You should now be able to run the following: -``` +```ShellSesssion $ nix-shell --pure $ cargo build $ cargo test @@ -731,7 +732,7 @@ $ cargo test To control your rust version (i.e. use nightly) from within `shell.nix` (or other nix expressions) you can use the following `shell.nix` -``` +```nix # Latest Nightly with import {}; let src = fetchFromGitHub { @@ -759,7 +760,7 @@ stdenv.mkDerivation { ``` Now run: -``` +```ShellSession $ rustc --version rustc 1.26.0-nightly (188e693b3 2018-03-26) ``` @@ -794,7 +795,7 @@ in the `~/.config/nixpkgs/overlays` directory. Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: -``` +```nix { pkgs ? import { overlays = [ (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)) diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index 155dacc237..22b5e6f301 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -156,7 +156,7 @@ assuming that "using latest version" is ok most of the time. First create a vim-scripts file having one plugin name per line. Example: -``` +```vim "tlib" {'name': 'vim-addon-sql'} {'filetype_regex': '\%(vim)$', 'names': ['reload', 'vim-dev-plugin']} @@ -197,7 +197,7 @@ nix-shell -p vimUtils.vim_with_vim2nix --command "vim -c 'source generate.vim'" You should get a Vim buffer with the nix derivations (output1) and vam.pluginDictionaries (output2). You can add your Vim to your system's configuration file like this and start it by "vim-my": -``` +```nix my-vim = let plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in { copy paste output1 here @@ -217,7 +217,7 @@ my-vim = Sample output1: -``` +```nix "reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "reload"; src = fetchgit { @@ -248,7 +248,7 @@ Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: -``` +```nix deoplete-fish = super.deoplete-fish.overrideAttrs(old: { dependencies = with super; [ deoplete-nvim vim-fish ]; }); diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md index ee090c8211..9664142662 100644 --- a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md @@ -190,7 +190,7 @@ If one imagines the saturating self references at the end being replaced with in ``` (native..., native, native, native, foreign, foreign, foreign...) ``` -On can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host". +One can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host". ::: note diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index 501a23599f..c8144db50a 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -307,4 +307,28 @@ rec { ${expr "" v} ''; + /* Translate a simple Nix expression to Dhall notation. + * Note that integers are translated to Integer and never + * the Natural type. + */ + toDhall = { }@args: v: + with builtins; + let concatItems = lib.strings.concatStringsSep ", "; + in if isAttrs v then + "{ ${ + concatItems (lib.attrsets.mapAttrsToList + (key: value: "${key} = ${toDhall args value}") v) + } }" + else if isList v then + "[ ${concatItems (map (toDhall args) v)} ]" + else if isInt v then + "${if v < 0 then "" else "+"}${toString v}" + else if isBool v then + (if v then "True" else "False") + else if isFunction v then + abort "generators.toDhall: cannot convert a function to Dhall" + else if isNull v then + abort "generators.toDhall: cannot convert a null to Dhall" + else + builtins.toJSON v; } diff --git a/third_party/nixpkgs/lib/trivial.nix b/third_party/nixpkgs/lib/trivial.nix index 268f39d321..be6d0115f5 100644 --- a/third_party/nixpkgs/lib/trivial.nix +++ b/third_party/nixpkgs/lib/trivial.nix @@ -158,7 +158,7 @@ rec { seq deepSeq genericClosure; - ## nixpks version strings + ## nixpkgs version strings /* Returns the current full nixpkgs version number. */ version = release + versionSuffix; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index fc41ce36bc..d7747768cd 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -984,6 +984,16 @@ githubId = 12128029; name = "babariviere"; }; + babbaj = { + name = "babbaj"; + email = "babbaj45@gmail.com"; + github = "babbaj"; + githubId = 12820770; + keys = [{ + longkeyid = "rsa4096/0xF044309848A07CAC"; + fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; + }]; + }; bachp = { email = "pascal.bach@nextrem.ch"; github = "bachp"; @@ -1106,6 +1116,12 @@ githubId = 14111; name = "Brandon Dimcheff"; }; + beardhatcode = { + name = "Robbert Gurdeep Singh"; + email = "nixpkgs@beardhatcode.be"; + github = "beardhatcode"; + githubId = 662538; + }; bendlas = { email = "herwig@bendlas.net"; github = "bendlas"; @@ -1284,6 +1300,12 @@ githubId = 50839; name = "Brian Jones"; }; + bootstrap-prime = { + email = "bootstrap.prime@gmail.com"; + github = "bootstrap-prime"; + githubId = 68566724; + name = "bootstrap-prime"; + }; commandodev = { email = "ben@perurbis.com"; github = "commandodev"; @@ -2349,6 +2371,12 @@ githubId = 15774340; name = "Thomas Depierre"; }; + diegolelis = { + email = "diego.o.lelis@gmail.com"; + github = "diegolelis"; + githubId = 8404455; + name = "Diego Lelis"; + }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; @@ -2391,6 +2419,12 @@ githubId = 10913120; name = "Dje4321"; }; + djwf = { + email = "dave@weller-fahy.com"; + github = "djwf"; + githubId = 73162; + name = "David J. Weller-Fahy"; + }; dkabot = { email = "dkabot@dkabot.com"; github = "dkabot"; @@ -3609,6 +3643,12 @@ githubId = 76716; name = "Graham Christensen"; }; + gravndal = { + email = "gaute.ravndal+nixos@gmail.com"; + github = "gravndal"; + githubId = 4656860; + name = "Gaute Ravndal"; + }; grburst = { email = "GRBurst@protonmail.com"; github = "GRBurst"; @@ -4978,6 +5018,12 @@ githubId = 16481032; name = "Kiba Fox"; }; + kidd = { + email = "raimonster@gmail.com"; + github = "kidd"; + githubId = 25607; + name = "Raimon Grau"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -5048,6 +5094,12 @@ fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; }]; }; + kiyengar = { + email = "hello@kiyengar.net"; + github = "karthikiyengar"; + githubId = 8260207; + name = "Karthik Iyengar"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -6186,6 +6238,12 @@ github = "meutraa"; githubId = 68550871; }; + mephistophiles = { + email = "mussitantesmortem@gmail.com"; + name = "Maxim Zhukov"; + github = "Mephistophiles"; + githubId = 4850908; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; @@ -7473,6 +7531,12 @@ githubId = 627831; name = "Hoang Xuan Phu"; }; + piegames = { + name = "piegames"; + email = "nix@piegames.de"; + github = "piegamesde"; + githubId = 14054505; + }; pierrechevalier83 = { email = "pierrechevalier83@gmail.com"; github = "pierrechevalier83"; @@ -9187,6 +9251,12 @@ githubId = 65870; name = "Сухарик"; }; + sumnerevans = { + email = "me@sumnerevans.com"; + github = "sumnerevans"; + githubId = 16734772; + name = "Sumner Evans"; + }; superbo = { email = "supernbo@gmail.com"; github = "SuperBo"; @@ -9779,6 +9849,12 @@ githubId = 27586264; name = "Tobias Schmidt"; }; + totoroot = { + name = "Matthias Thym"; + email = "git@thym.at"; + github = "totoroot"; + githubId = 39650930; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; @@ -10374,6 +10450,12 @@ githubId = 1322287; name = "William O'Hanley"; }; + woky = { + email = "pampu.andrei@pm.me"; + github = "andreisergiu98"; + githubId = 11740700; + name = "Andrei Pampu"; + }; wolfangaukang = { email = "liquid.query960@4wrd.cc"; github = "wolfangaukang"; @@ -10434,6 +10516,12 @@ githubId = 13489144; name = "Calle Rosenquist"; }; + xdhampus = { + name = "Hampus"; + email = "16954508+xdHampus@users.noreply.github.com"; + github = "xdHampus"; + githubId = 16954508; + }; xe = { email = "me@christine.website"; github = "Xe"; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index a6cff1a8fa..49446afdea 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -1017,6 +1017,14 @@ systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; will have changed. + + + The syntax of the PostgreSQL configuration file is now checked at build + time. If your configuration includes a file inaccessible inside the build + sandbox, set services.postgresql.checkConfig to + false. + + The rkt module has been removed, it was archived by upstream. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index b7947293c0..ba42601096 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -23,6 +23,9 @@ Support is planned until the end of December 2021, handing over to 21.11. + + The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. + GNOME desktop environment was upgraded to 3.38, see its release notes. @@ -67,6 +70,12 @@ for the motivation). + + + Python optimizations were disabled again. Builds with optimizations enabled + are not reproducible. Optimizations can now be enabled with an option. + + Kodi has been updated to version 19.0 "Matrix". See @@ -235,7 +244,7 @@ - xfsprogs was update from 4.19 to 5.10. It now enables reflink support by default on filesystem creation. + xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation. Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16. If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them with mkfs.xfs -m reflink=0. @@ -579,6 +588,11 @@ self: super: no longer uses the deprecated cirrus and vesa device dependent X drivers by default. It also enables both amdgpu and nouveau drivers by default now. + + + The kindlegen package is gone, because it is no longer supported or hosted by Amazon. Sadly, its replacement, Kindle Previewer, has no Linux support. However, there are other ways to generate MOBI files. See the discussion for more info. + + The apacheKafka packages are now built with @@ -625,6 +639,15 @@ environment.systemPackages = [ + + + now includes the nano package. + If pkgs.nano is not added to the list, + make sure another editor is installed and the EDITOR + environment variable is set to it. + Environment variables can be set using . + + @@ -883,6 +906,14 @@ environment.systemPackages = [ Please test your setup and container images with containerd prior to upgrading. + + + The GitLab module now has support for automatic backups. A + schedule can be set with the + services.gitlab.backup.startAt + option. + + diff --git a/third_party/nixpkgs/nixos/modules/config/system-path.nix b/third_party/nixpkgs/nixos/modules/config/system-path.nix index aee7a041d0..1292c3008c 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-path.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-path.nix @@ -29,7 +29,6 @@ let pkgs.xz pkgs.less pkgs.libcap - pkgs.nano pkgs.ncurses pkgs.netcat config.programs.ssh.package @@ -43,7 +42,8 @@ let ]; defaultPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) - [ pkgs.perl + [ pkgs.nano + pkgs.perl pkgs.rsync pkgs.strace ]; @@ -75,13 +75,21 @@ in default = defaultPackages; example = literalExample "[]"; description = '' - Set of packages users expect from a minimal linux istall. - Like systemPackages, they appear in - /run/current-system/sw. These packages are + Set of default packages that aren't strictly neccessary + for a running system, entries can be removed for a more + minimal NixOS installation. + + Note: If pkgs.nano is removed from this list, + make sure another editor is installed and the + EDITOR environment variable is set to it. + Environment variables can be set using + . + + Like with systemPackages, packages are installed to + /run/current-system/sw. They are automatically available to all users, and are automatically updated every time you rebuild the system configuration. - If you want a more minimal system, set it to an empty list. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 1a530b9f01..5ed1f568f4 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -593,8 +593,8 @@ in { # password or an SSH authorized key. Privileged accounts are # root and users in the wheel group. assertion = !cfg.mutableUsers -> - any id ((mapAttrsToList (name: cfg: - (name == "root" + any id ((mapAttrsToList (_: cfg: + (cfg.name == "root" || cfg.group == "wheel" || elem "wheel" cfg.extraGroups) && @@ -615,16 +615,16 @@ in { assertion = (user.hashedPassword != null) -> (builtins.match ".*:.*" user.hashedPassword == null); message = '' - The password hash of user "${name}" contains a ":" character. + The password hash of user "${user.name}" contains a ":" character. This is invalid and would break the login system because the fields of /etc/shadow (file where hashes are stored) are colon-separated. - Please check the value of option `users.users."${name}".hashedPassword`.''; + Please check the value of option `users.users."${user.name}".hashedPassword`.''; } ); warnings = builtins.filter (x: x != null) ( - flip mapAttrsToList cfg.users (name: user: + flip mapAttrsToList cfg.users (_: user: # This regex matches a subset of the Modular Crypto Format (MCF)[1] # informal standard. Since this depends largely on the OS or the # specific implementation of crypt(3) we only support the (sane) @@ -647,9 +647,9 @@ in { && user.hashedPassword != "" # login without password && builtins.match mcf user.hashedPassword == null) then '' - The password hash of user "${name}" may be invalid. You must set a + The password hash of user "${user.name}" may be invalid. You must set a valid hash or the user will be locked out of their account. Please - check the value of option `users.users."${name}".hashedPassword`.'' + check the value of option `users.users."${user.name}".hashedPassword`.'' else null )); diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index 8cf3e5633d..3e88a4c20a 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -49,7 +49,7 @@ in { rt5677-firmware rtl8723bs-firmware rtl8761b-firmware - rtlwifi_new-firmware + rtw88-firmware zd1211fw alsa-firmware sof-firmware diff --git a/third_party/nixpkgs/nixos/modules/hardware/sata.nix b/third_party/nixpkgs/nixos/modules/hardware/sata.nix new file mode 100644 index 0000000000..541897527a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/sata.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkEnableOption mkIf mkOption types; + + cfg = config.hardware.sata.timeout; + + buildRule = d: + lib.concatStringsSep ", " [ + ''ACTION=="add"'' + ''SUBSYSTEM=="block"'' + ''ENV{ID_${lib.toUpper d.idBy}}=="${d.name}"'' + ''TAG+="systemd"'' + ''ENV{SYSTEMD_WANTS}="${unitName d}"'' + ]; + + devicePath = device: + "/dev/disk/by-${device.idBy}/${device.name}"; + + unitName = device: + "sata-timeout-${lib.strings.sanitizeDerivationName device.name}"; + + startScript = + pkgs.writeShellScript "sata-timeout.sh" '' + set -eEuo pipefail + + device="$1" + + ${pkgs.smartmontools}/bin/smartctl \ + -l scterc,${toString cfg.deciSeconds},${toString cfg.deciSeconds} \ + --quietmode errorsonly \ + "$device" + ''; + +in +{ + meta.maintainers = with lib.maintainers; [ peterhoeg ]; + + options.hardware.sata.timeout = { + enable = mkEnableOption "SATA drive timeouts"; + + deciSeconds = mkOption { + example = "70"; + type = types.int; + description = '' + Set SCT Error Recovery Control timeout in deciseconds for use in RAID configurations. + + Values are as follows: + 0 = disable SCT ERT + 70 = default in consumer drives (7 seconds) + + Maximum is disk dependant but probably 60 seconds. + ''; + }; + + drives = mkOption { + description = "List of drives for which to configure the timeout."; + type = types.listOf + (types.submodule { + options = { + name = mkOption { + description = "Drive name without the full path."; + type = types.str; + }; + + idBy = mkOption { + description = "The method to identify the drive."; + type = types.enum [ "path" "wwn" ]; + default = "path"; + }; + }; + }); + }; + }; + + config = mkIf cfg.enable { + services.udev.extraRules = lib.concatMapStringsSep "\n" buildRule cfg.drives; + + systemd.services = lib.listToAttrs (map + (e: + lib.nameValuePair (unitName e) { + description = "SATA timeout for ${e.name}"; + wantedBy = [ "sata-timeout.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${startScript} '${devicePath e}'"; + PrivateTmp = true; + PrivateNetwork = true; + ProtectHome = "tmpfs"; + ProtectSystem = "strict"; + }; + } + ) + cfg.drives); + + systemd.targets.sata-timeout = { + description = "SATA timeout"; + wantedBy = [ "multi-user.target" ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix b/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix new file mode 100644 index 0000000000..637fddfb37 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.ubertooth; + + ubertoothPkg = pkgs.ubertooth.override { + udevGroup = cfg.group; + }; +in { + options.hardware.ubertooth = { + enable = mkEnableOption "Enable the Ubertooth software and its udev rules."; + + group = mkOption { + type = types.str; + default = "ubertooth"; + example = "wheel"; + description = "Group for Ubertooth's udev rules."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ ubertoothPkg ]; + + services.udev.packages = [ ubertoothPkg ]; + users.groups.${cfg.group} = {}; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index ca7898687b..e113322123 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -67,9 +67,11 @@ ./hardware/steam-hardware.nix ./hardware/system-76.nix ./hardware/tuxedo-keyboard.nix + ./hardware/ubertooth.nix ./hardware/usb-wwan.nix ./hardware/onlykey.nix ./hardware/opentabletdriver.nix + ./hardware/sata.nix ./hardware/wooting.nix ./hardware/uinput.nix ./hardware/video/amdgpu.nix @@ -231,6 +233,7 @@ ./services/audio/alsa.nix ./services/audio/jack.nix ./services/audio/icecast.nix + ./services/audio/jmusicbot.nix ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mpdscribble.nix @@ -498,6 +501,7 @@ ./services/misc/lifecycled.nix ./services/misc/mame.nix ./services/misc/matrix-appservice-discord.nix + ./services/misc/matrix-appservice-irc.nix ./services/misc/matrix-synapse.nix ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix @@ -513,6 +517,7 @@ ./services/misc/nzbget.nix ./services/misc/nzbhydra2.nix ./services/misc/octoprint.nix + ./services/misc/ombi.nix ./services/misc/osrm.nix ./services/misc/packagekit.nix ./services/misc/paperless.nix @@ -888,6 +893,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/bookstack.nix + ./services/web-apps/calibre-web.nix ./services/web-apps/convos.nix ./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix @@ -948,6 +954,7 @@ ./services/web-servers/nginx/default.nix ./services/web-servers/nginx/gitweb.nix ./services/web-servers/phpfpm/default.nix + ./services/web-servers/pomerium.nix ./services/web-servers/unit/default.nix ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/mininet.nix b/third_party/nixpkgs/nixos/modules/programs/mininet.nix index ecc924325e..6e90e7669a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mininet.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mininet.nix @@ -8,7 +8,7 @@ let cfg = config.programs.mininet; generatedPath = with pkgs; makeSearchPath "bin" [ - iperf ethtool iproute socat + iperf ethtool iproute2 socat ]; pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix new file mode 100644 index 0000000000..f573bd2ab8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.jmusicbot; +in +{ + options = { + services.jmusicbot = { + enable = mkEnableOption "jmusicbot, a Discord music bot that's easy to set up and run yourself"; + + stateDir = mkOption { + type = types.path; + description = '' + The directory where config.txt and serversettings.json is saved. + If left as the default value this directory will automatically be created before JMusicBot starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions. + Untouched by the value of this option config.txt needs to be placed manually into this directory. + ''; + default = "/var/lib/jmusicbot/"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.jmusicbot = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + description = "Discord music bot that's easy to set up and run yourself!"; + serviceConfig = mkMerge [{ + ExecStart = "${pkgs.jmusicbot}/bin/JMusicBot"; + WorkingDirectory = cfg.stateDir; + Restart = "always"; + RestartSec = 20; + DynamicUser = true; + } + (mkIf (cfg.stateDir == "/var/lib/jmusicbot") { StateDirectory = "jmusicbot"; })]; + }; + }; + + meta.maintainers = with maintainers; [ SuperSandro2000 ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index f582b05927..900185fbbd 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -18,7 +18,12 @@ let else toString value; # The main PostgreSQL configuration file. - configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings)); + configFile = pkgs.writeTextDir "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings)); + + configFileCheck = pkgs.runCommand "postgresql-configfile-check" {} '' + ${cfg.package}/bin/postgres -D${configFile} -C config_file >/dev/null + touch $out + ''; groupAccessAvailable = versionAtLeast postgresql.version "11.0"; @@ -53,6 +58,12 @@ in ''; }; + checkConfig = mkOption { + type = types.bool; + default = true; + description = "Check the syntax of the configuration file at compile time"; + }; + dataDir = mkOption { type = types.path; defaultText = "/var/lib/postgresql/\${config.services.postgresql.package.psqlSchema}"; @@ -314,6 +325,8 @@ in "/share/postgresql" ]; + system.extraDependencies = lib.optional (cfg.checkConfig && pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) configFileCheck; + systemd.services.postgresql = { description = "PostgreSQL Server"; @@ -337,7 +350,7 @@ in touch "${cfg.dataDir}/.first_startup" fi - ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf" + ln -sfn "${configFile}/postgresql.conf" "${cfg.dataDir}/postgresql.conf" ${optionalString (cfg.recoveryConfig != null) '' ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \ "${cfg.dataDir}/recovery.conf" diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 539a4cf446..17a2d49bb1 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -4,6 +4,7 @@ with lib; let + json = pkgs.formats.json {}; cfg = config.services.pipewire.media-session; enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 @@ -17,24 +18,13 @@ let media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json)); v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json)); }; - # Helpers for generating the pipewire JSON config file - mkSPAValueString = v: - if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]" - else if lib.types.attrs.check v then - "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}" - else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\"" - else lib.generators.mkValueStringDefault { } v; - mkSPAKeyValue = attrs: map (def: def.content) ( - lib.sortProperties - ( - lib.mapAttrsToList - (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ":" ] k} = ${mkSPAValueString (v._content or v)}") - attrs - ) - ); - - toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs); + configs = { + alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor; + bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor; + media-session = recursiveUpdate defaults.media-session cfg.config.media-session; + v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor; + }; in { meta = { @@ -62,7 +52,7 @@ in { config = { media-session = mkOption { - type = types.attrs; + type = json.type; description = '' Configuration for the media session core. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf @@ -71,7 +61,7 @@ in { }; alsa-monitor = mkOption { - type = types.attrs; + type = json.type; description = '' Configuration for the alsa monitor. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf @@ -80,7 +70,7 @@ in { }; bluez-monitor = mkOption { - type = types.attrs; + type = json.type; description = '' Configuration for the bluez5 monitor. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf @@ -89,7 +79,7 @@ in { }; v4l2-monitor = mkOption { - type = types.attrs; + type = json.type; description = '' Configuration for the V4L2 monitor. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf @@ -106,15 +96,34 @@ in { systemd.packages = [ cfg.package ]; systemd.user.services.pipewire-media-session.wantedBy = [ "pipewire.service" ]; - environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON (recursiveUpdate defaults.media-session cfg.config.media-session); }; - environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON (recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor); }; + environment.etc."pipewire/media-session.d/media-session.conf" = { + source = json.generate "media-session.conf" configs.media-session; + }; + environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { + source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor; + }; - environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = ""; }; - environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON (recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor); }; + environment.etc."pipewire/media-session.d/with-alsa" = + mkIf config.services.pipewire.alsa.enable { + text = ""; + }; + environment.etc."pipewire/media-session.d/alsa-monitor.conf" = + mkIf config.services.pipewire.alsa.enable { + source = json.generate "alsa-monitor.conf" configs.alsa-monitor; + }; - environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf config.services.pipewire.pulse.enable { text = ""; }; - environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON (recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor); }; + environment.etc."pipewire/media-session.d/with-pulseaudio" = + mkIf config.services.pipewire.pulse.enable { + text = ""; + }; + environment.etc."pipewire/media-session.d/bluez-monitor.conf" = + mkIf config.services.pipewire.pulse.enable { + source = json.generate "bluez-monitor.conf" configs.bluez-monitor; + }; - environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { text = ""; }; + environment.etc."pipewire/media-session.d/with-jack" = + mkIf config.services.pipewire.jack.enable { + text = ""; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index 7cf19706a6..dbd6c5d87e 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -4,6 +4,7 @@ with lib; let + json = pkgs.formats.json {}; cfg = config.services.pipewire; enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 @@ -29,24 +30,13 @@ let pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); }; - # Helpers for generating the pipewire JSON config file - mkSPAValueString = v: - if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]" - else if lib.types.attrs.check v then - "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}" - else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\"" - else lib.generators.mkValueStringDefault { } v; - - mkSPAKeyValue = attrs: map (def: def.content) ( - lib.sortProperties - ( - lib.mapAttrsToList - (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ] k} = ${mkSPAValueString (v._content or v)}") - attrs - ) - ); - - toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs); + configs = { + client = recursiveUpdate defaults.client cfg.config.client; + client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt; + jack = recursiveUpdate defaults.jack cfg.config.jack; + pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire; + pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; + }; in { meta = { @@ -78,7 +68,7 @@ in { config = { client = mkOption { - type = types.attrs; + type = json.type; default = {}; description = '' Configuration for pipewire clients. For details see @@ -87,7 +77,7 @@ in { }; client-rt = mkOption { - type = types.attrs; + type = json.type; default = {}; description = '' Configuration for realtime pipewire clients. For details see @@ -96,7 +86,7 @@ in { }; jack = mkOption { - type = types.attrs; + type = json.type; default = {}; description = '' Configuration for the pipewire daemon's jack module. For details see @@ -105,7 +95,7 @@ in { }; pipewire = mkOption { - type = types.attrs; + type = json.type; default = {}; description = '' Configuration for the pipewire daemon. For details see @@ -114,7 +104,7 @@ in { }; pipewire-pulse = mkOption { - type = types.attrs; + type = json.type; default = {}; description = '' Configuration for the pipewire-pulse daemon. For details see @@ -187,11 +177,21 @@ in { source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf"; }; - environment.etc."pipewire/client.conf" = { text = toSPAJSON (recursiveUpdate defaults.client cfg.config.client); }; - environment.etc."pipewire/client-rt.conf" = { text = toSPAJSON (recursiveUpdate defaults.client-rt cfg.config.client-rt); }; - environment.etc."pipewire/jack.conf" = { text = toSPAJSON (recursiveUpdate defaults.jack cfg.config.jack); }; - environment.etc."pipewire/pipewire.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire cfg.config.pipewire); }; - environment.etc."pipewire/pipewire-pulse.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse); }; + environment.etc."pipewire/client.conf" = { + source = json.generate "client.conf" configs.client; + }; + environment.etc."pipewire/client-rt.conf" = { + source = json.generate "client-rt.conf" configs.client-rt; + }; + environment.etc."pipewire/jack.conf" = { + source = json.generate "jack.conf" configs.jack; + }; + environment.etc."pipewire/pipewire.conf" = { + source = json.generate "pipewire.conf" configs.pipewire; + }; + environment.etc."pipewire/pipewire-pulse.conf" = { + source = json.generate "pipewire-pulse.conf" configs.pipewire-pulse; + }; environment.sessionVariables.LD_LIBRARY_PATH = lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix index 29e5fbaee6..e5a01a8a27 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix @@ -30,7 +30,7 @@ let }; backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; - saneConfig = pkgs.mkSaneConfig { paths = backends; }; + saneConfig = pkgs.mkSaneConfig { paths = backends; inherit (config.hardware.sane) disabledDefaultBackends; }; enabled = config.hardware.sane.enable || config.services.saned.enable; @@ -73,6 +73,16 @@ in example = literalExample "[ pkgs.hplipWithPlugin ]"; }; + hardware.sane.disabledDefaultBackends = mkOption { + type = types.listOf types.str; + default = []; + example = [ "v4l" ]; + description = '' + Names of backends which are enabled by default but should be disabled. + See $SANE_CONFIG_DIR/dll.conf for the list of possible names. + ''; + }; + hardware.sane.configDir = mkOption { type = types.str; internal = true; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix index 7afae76cc4..cecc4d6f02 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix @@ -13,7 +13,7 @@ in { }; config = mkIf cfg.enable { - systemd.user.services.spacenavd = { + systemd.services.spacenavd = { description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion"; after = [ "syslog.target" ]; wantedBy = [ "graphical.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix index a4fc315d08..7a2f568161 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix @@ -159,10 +159,9 @@ in ###### implementation config = mkIf cfg.enable { - systemd.services.logstash = with pkgs; { + systemd.services.logstash = { description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; - environment = { JAVA_HOME = jre; }; path = [ pkgs.bash ]; serviceConfig = { ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix index a7c54ad75f..be36b2a41b 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix @@ -3,7 +3,8 @@ with lib; let cfg = config.services.vector; -in { +in +{ options.services.vector = { enable = mkEnableOption "Vector"; @@ -37,25 +38,27 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; requires = [ "network-online.target" ]; - serviceConfig = let - format = pkgs.formats.toml { }; - conf = format.generate "vector.toml" cfg.settings; - validateConfig = file: - pkgs.runCommand "validate-vector-conf" { } '' - ${pkgs.vector}/bin/vector validate --no-topology --no-environment "${file}" - ln -s "${file}" "$out" - ''; - in { - ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; - User = "vector"; - Group = "vector"; - Restart = "no"; - StateDirectory = "vector"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - # This group is required for accessing journald. - SupplementaryGroups = mkIf cfg.journaldAccess "systemd-journal"; - }; + serviceConfig = + let + format = pkgs.formats.toml { }; + conf = format.generate "vector.toml" cfg.settings; + validateConfig = file: + pkgs.runCommand "validate-vector-conf" { } '' + ${pkgs.vector}/bin/vector validate --no-environment "${file}" + ln -s "${file}" "$out" + ''; + in + { + ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; + User = "vector"; + Group = "vector"; + Restart = "no"; + StateDirectory = "vector"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + # This group is required for accessing journald. + SupplementaryGroups = mkIf cfg.journaldAccess "systemd-journal"; + }; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix index d9d12698d7..31e0952b5b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix @@ -8,31 +8,28 @@ let pythonEnv = pkgs.python3.withPackages (ps: with ps; [ etebase-server daphne ]); - dbConfig = { - sqlite3 = '' - engine = django.db.backends.sqlite3 - name = ${cfg.dataDir}/db.sqlite3 - ''; - }; + iniFmt = pkgs.formats.ini {}; - defaultConfigIni = toString (pkgs.writeText "etebase-server.ini" '' - [global] - debug = false - secret_file = ${if cfg.secretFile != null then cfg.secretFile else ""} - media_root = ${cfg.dataDir}/media - - [allowed_hosts] - allowed_host1 = ${cfg.host} - - [database] - ${dbConfig."${cfg.database.type}"} - ''); - - configIni = if cfg.customIni != null then cfg.customIni else defaultConfigIni; + configIni = iniFmt.generate "etebase-server.ini" cfg.settings; defaultUser = "etebase-server"; in { + imports = [ + (mkRemovedOptionModule + [ "services" "etebase-server" "customIni" ] + "Set the option `services.etebase-server.settings' instead.") + (mkRemovedOptionModule + [ "services" "etebase-server" "database" ] + "Set the option `services.etebase-server.settings.database' instead.") + (mkRenamedOptionModule + [ "services" "etebase-server" "secretFile" ] + [ "services" "etebase-server" "settings" "secret_file" ]) + (mkRenamedOptionModule + [ "services" "etebase-server" "host" ] + [ "services" "etebase-server" "settings" "allowed_hosts" "allowed_host1" ]) + ]; + options = { services.etebase-server = { enable = mkOption { @@ -42,21 +39,13 @@ in description = '' Whether to enable the Etebase server. - Once enabled you need to create an admin user using the - shell command etebase-server createsuperuser. + Once enabled you need to create an admin user by invoking the + shell command etebase-server createsuperuser with + the user specified by the user option or a superuser. Then you can login and create accounts on your-etebase-server.com/admin ''; }; - secretFile = mkOption { - default = null; - type = with types; nullOr str; - description = '' - The path to a file containing the secret - used as django's SECRET_KEY. - ''; - }; - dataDir = mkOption { type = types.str; default = "/var/lib/etebase-server"; @@ -77,15 +66,6 @@ in ''; }; - host = mkOption { - type = types.str; - default = "0.0.0.0"; - example = "localhost"; - description = '' - Host to listen on. - ''; - }; - unixSocket = mkOption { type = with types; nullOr str; default = null; @@ -93,42 +73,81 @@ in example = "/run/etebase-server/etebase-server.sock"; }; - database = { - type = mkOption { - type = types.enum [ "sqlite3" ]; - default = "sqlite3"; - description = '' - Database engine to use. - Currently only sqlite3 is supported. - Other options can be configured using extraConfig. - ''; + settings = mkOption { + type = lib.types.submodule { + freeformType = iniFmt.type; + + options = { + global = { + debug = mkOption { + type = types.bool; + default = false; + description = '' + Whether to set django's DEBUG flag. + ''; + }; + secret_file = mkOption { + type = with types; nullOr str; + default = null; + description = '' + The path to a file containing the secret + used as django's SECRET_KEY. + ''; + }; + static_root = mkOption { + type = types.str; + default = "${cfg.dataDir}/static"; + defaultText = "\${config.services.etebase-server.dataDir}/static"; + description = "The directory for static files."; + }; + media_root = mkOption { + type = types.str; + default = "${cfg.dataDir}/media"; + defaultText = "\${config.services.etebase-server.dataDir}/media"; + description = "The media directory."; + }; + }; + allowed_hosts = { + allowed_host1 = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "localhost"; + description = '' + The main host that is allowed access. + ''; + }; + }; + database = { + engine = mkOption { + type = types.enum [ "django.db.backends.sqlite3" "django.db.backends.postgresql" ]; + default = "django.db.backends.sqlite3"; + description = "The database engine to use."; + }; + name = mkOption { + type = types.str; + default = "${cfg.dataDir}/db.sqlite3"; + defaultText = "\${config.services.etebase-server.dataDir}/db.sqlite3"; + description = "The database name."; + }; + }; + }; }; - }; - - customIni = mkOption { - type = with types; nullOr str; - default = null; + default = {}; description = '' - Custom etebase-server.ini. - - See etebase-src/etebase-server.ini.example for available options. - - Setting this option overrides the default config which is generated from the options - secretFile, host and database. - ''; - example = literalExample '' - [global] - debug = false - secret_file = /path/to/secret - media_root = /path/to/media - - [allowed_hosts] - allowed_host1 = example.com - - [database] - engine = django.db.backends.sqlite3 - name = db.sqlite3 + Configuration for etebase-server. Refer to + + and + for details on supported values. ''; + example = { + global = { + debug = true; + media_root = "/path/to/media"; + }; + allowed_hosts = { + allowed_host2 = "localhost"; + }; + }; }; user = mkOption { @@ -166,14 +185,15 @@ in WorkingDirectory = cfg.dataDir; }; environment = { - PYTHONPATH="${pythonEnv}/${pkgs.python3.sitePackages}"; - ETEBASE_EASY_CONFIG_PATH="${configIni}"; + PYTHONPATH = "${pythonEnv}/${pkgs.python3.sitePackages}"; + ETEBASE_EASY_CONFIG_PATH = configIni; }; preStart = '' # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then ${pythonEnv}/bin/etebase-server migrate + ${pythonEnv}/bin/etebase-server collectstatic echo ${pkgs.etebase-server} > "$versionFile" fi ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index c9dd10ec55..b8bb4059dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -116,7 +116,11 @@ let omniauth.enabled = false; shared.path = "${cfg.statePath}/shared"; gitaly.client_path = "${cfg.packages.gitaly}/bin"; - backup.path = "${cfg.backupPath}"; + backup = { + path = cfg.backup.path; + keep_time = cfg.backup.keepTime; + upload = cfg.backup.uploadOptions; + }; gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; hooks_path = "${cfg.statePath}/shell/hooks"; @@ -207,6 +211,7 @@ in { imports = [ (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) + (mkRenamedOptionModule [ "services" "gitlab" "backupPath" ] [ "services" "gitlab" "backup" "path" ]) (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") ]; @@ -260,7 +265,7 @@ in { type = types.str; default = "/var/gitlab/state"; description = '' - Gitlab state directory. Configuration, repositories and + GitLab state directory. Configuration, repositories and logs, among other things, are stored here. The directory will be created automatically if it doesn't @@ -270,17 +275,108 @@ in { ''; }; - backupPath = mkOption { + backup.startAt = mkOption { + type = with types; either str (listOf str); + default = []; + example = "03:00"; + description = '' + The time(s) to run automatic backup of GitLab + state. Specified in systemd's time format; see + systemd.time + 7. + ''; + }; + + backup.path = mkOption { type = types.str; default = cfg.statePath + "/backup"; - description = "Gitlab path for backups."; + description = "GitLab path for backups."; + }; + + backup.keepTime = mkOption { + type = types.int; + default = 0; + example = 48; + apply = x: x * 60 * 60; + description = '' + How long to keep the backups around, in + hours. 0 means keep + forever. + ''; + }; + + backup.skip = mkOption { + type = with types; + let value = enum [ + "db" + "uploads" + "builds" + "artifacts" + "lfs" + "registry" + "pages" + "repositories" + "tar" + ]; + in + either value (listOf value); + default = []; + example = [ "artifacts" "lfs" ]; + apply = x: if isString x then x else concatStringsSep "," x; + description = '' + Directories to exclude from the backup. The example excludes + CI artifacts and LFS objects from the backups. The + tar option skips the creation of a tar + file. + + Refer to + for more information. + ''; + }; + + backup.uploadOptions = mkOption { + type = types.attrs; + default = {}; + example = literalExample '' + { + # Fog storage connection settings, see http://fog.io/storage/ + connection = { + provider = "AWS"; + region = "eu-north-1"; + aws_access_key_id = "AKIAXXXXXXXXXXXXXXXX"; + aws_secret_access_key = { _secret = config.deployment.keys.aws_access_key.path; }; + }; + + # The remote 'directory' to store your backups in. + # For S3, this would be the bucket name. + remote_directory = "my-gitlab-backups"; + + # Use multipart uploads when file size reaches 100MB, see + # http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html + multipart_chunk_size = 104857600; + + # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional + encryption = "AES256"; + + # Specifies Amazon S3 storage class to use for backups, this is optional + storage_class = "STANDARD"; + }; + ''; + description = '' + GitLab automatic upload specification. Tells GitLab to + upload the backup to a remote location when done. + + Attributes specified here are added under + production -> backup -> upload in + config/gitlab.yml. + ''; }; databaseHost = mkOption { type = types.str; default = ""; description = '' - Gitlab database hostname. An empty string means use + GitLab database hostname. An empty string means use local unix socket connection. ''; }; @@ -289,7 +385,7 @@ in { type = with types; nullOr path; default = null; description = '' - File containing the Gitlab database user password. + File containing the GitLab database user password. This should be a string, not a nix path, since nix paths are copied into the world-readable nix store. @@ -310,13 +406,13 @@ in { databaseName = mkOption { type = types.str; default = "gitlab"; - description = "Gitlab database name."; + description = "GitLab database name."; }; databaseUsername = mkOption { type = types.str; default = "gitlab"; - description = "Gitlab database user."; + description = "GitLab database user."; }; databasePool = mkOption { @@ -360,14 +456,14 @@ in { host = mkOption { type = types.str; default = config.networking.hostName; - description = "Gitlab host name. Used e.g. for copy-paste URLs."; + description = "GitLab host name. Used e.g. for copy-paste URLs."; }; port = mkOption { type = types.int; default = 8080; description = '' - Gitlab server port for copy-paste URLs, e.g. 80 or 443 if you're + GitLab server port for copy-paste URLs, e.g. 80 or 443 if you're service over https. ''; }; @@ -420,26 +516,26 @@ in { address = mkOption { type = types.str; default = "localhost"; - description = "Address of the SMTP server for Gitlab."; + description = "Address of the SMTP server for GitLab."; }; port = mkOption { type = types.int; default = 25; - description = "Port of the SMTP server for Gitlab."; + description = "Port of the SMTP server for GitLab."; }; username = mkOption { type = with types; nullOr str; default = null; - description = "Username of the SMTP server for Gitlab."; + description = "Username of the SMTP server for GitLab."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; description = '' - File containing the password of the SMTP server for Gitlab. + File containing the password of the SMTP server for GitLab. This should be a string, not a nix path, since nix paths are copied into the world-readable nix store. @@ -720,7 +816,7 @@ in { "d /run/gitlab 0755 ${cfg.user} ${cfg.group} -" "d ${gitlabEnv.HOME} 0750 ${cfg.user} ${cfg.group} -" "z ${gitlabEnv.HOME}/.ssh/authorized_keys 0600 ${cfg.user} ${cfg.group} -" - "d ${cfg.backupPath} 0750 ${cfg.user} ${cfg.group} -" + "d ${cfg.backup.path} 0750 ${cfg.user} ${cfg.group} -" "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} -" @@ -1053,6 +1149,23 @@ in { }; + systemd.services.gitlab-backup = { + after = [ "gitlab.service" ]; + bindsTo = [ "gitlab.service" ]; + startAt = cfg.backup.startAt; + environment = { + RAILS_ENV = "production"; + CRON = "1"; + } // optionalAttrs (stringLength cfg.backup.skip > 0) { + SKIP = cfg.backup.skip; + }; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${gitlab-rake}/bin/gitlab-rake gitlab:backup:create"; + }; + }; + }; meta.doc = ./gitlab.xml; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml index 19a3df0a5f..40424c5039 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml @@ -3,15 +3,15 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-gitlab"> - Gitlab + GitLab - Gitlab is a feature-rich git hosting service. + GitLab is a feature-rich git hosting service.
Prerequisites - The gitlab service exposes only an Unix socket at + The gitlab service exposes only an Unix socket at /run/gitlab/gitlab-workhorse.socket. You need to configure a webserver to proxy HTTP requests to the socket. @@ -39,7 +39,7 @@ Configuring - Gitlab depends on both PostgreSQL and Redis and will automatically enable + GitLab depends on both PostgreSQL and Redis and will automatically enable both services. In the case of PostgreSQL, a database and a role will be created. @@ -85,20 +85,20 @@ services.gitlab = { - If you're setting up a new Gitlab instance, generate new + If you're setting up a new GitLab instance, generate new secrets. You for instance use tr -dc A-Za-z0-9 < /dev/urandom | head -c 128 > /var/keys/gitlab/db to generate a new db secret. Make sure the files can be read by, and only by, the user specified by services.gitlab.user. Gitlab + linkend="opt-services.gitlab.user">services.gitlab.user. GitLab encrypts sensitive data stored in the database. If you're restoring - an existing Gitlab instance, you must specify the secrets secret - from config/secrets.yml located in your Gitlab + an existing GitLab instance, you must specify the secrets secret + from config/secrets.yml located in your GitLab state folder. - When icoming_mail.enabled is set to true + When incoming_mail.enabled is set to true in extraConfig an additional service called gitlab-mailroom is enabled for fetching incoming mail. @@ -112,21 +112,40 @@ services.gitlab = {
Maintenance - - You can run Gitlab's rake tasks with gitlab-rake which - will be available on the system when gitlab is enabled. You will have to run - the command as the user that you configured to run gitlab with. - +
+ Backups + + Backups can be configured with the options in services.gitlab.backup. Use + the services.gitlab.backup.startAt + option to configure regular backups. + - - For example, to backup a Gitlab instance: + + To run a manual backup, start the gitlab-backup service: -$ sudo -u git -H gitlab-rake gitlab:backup:create +$ systemctl start gitlab-backup.service - A list of all availabe rake tasks can be obtained by running: + +
+ +
+ Rake tasks + + + You can run GitLab's rake tasks with gitlab-rake + which will be available on the system when GitLab is enabled. You + will have to run the command as the user that you configured to run + GitLab with. + + + + A list of all availabe rake tasks can be obtained by running: $ sudo -u git -H gitlab-rake -T - + +
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix index f53c49a1ee..35a6e29963 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -183,12 +183,12 @@ in { }; package = mkOption { - default = pkgs.home-assistant.overrideAttrs (oldAttrs: { - doInstallCheck = false; + default = pkgs.home-assistant.overridePythonAttrs (oldAttrs: { + doCheck = false; }); defaultText = literalExample '' - pkgs.home-assistant.overrideAttrs (oldAttrs: { - doInstallCheck = false; + pkgs.home-assistant.overridePythonAttrs (oldAttrs: { + doCheck = false; }) ''; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix index c5d5e9e483..34a471ea4f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix @@ -53,7 +53,7 @@ in description = "MAME TUN/TAP Ethernet interface"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix new file mode 100644 index 0000000000..63dc313ad1 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix @@ -0,0 +1,228 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.matrix-appservice-irc; + + pkg = pkgs.matrix-appservice-irc; + bin = "${pkg}/bin/matrix-appservice-irc"; + + jsonType = (pkgs.formats.json {}).type; + + configFile = pkgs.runCommandNoCC "matrix-appservice-irc.yml" { + # Because this program will be run at build time, we need `nativeBuildInputs` + nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ]; + preferLocalBuild = true; + + config = builtins.toJSON cfg.settings; + passAsFile = [ "config" ]; + } '' + # The schema is given as yaml, we need to convert it to json + python -c 'import json; import yaml; import sys; json.dump(yaml.safe_load(sys.stdin), sys.stdout)' \ + < ${pkg}/lib/node_modules/matrix-appservice-irc/config.schema.yml \ + > config.schema.json + python -m jsonschema config.schema.json -i $configPath + cp "$configPath" "$out" + ''; + registrationFile = "/var/lib/matrix-appservice-irc/registration.yml"; +in { + options.services.matrix-appservice-irc = with types; { + enable = mkEnableOption "the Matrix/IRC bridge"; + + port = mkOption { + type = port; + description = "The port to listen on"; + default = 8009; + }; + + needBindingCap = mkOption { + type = bool; + description = "Whether the daemon needs to bind to ports below 1024 (e.g. for the ident service)"; + default = false; + }; + + passwordEncryptionKeyLength = mkOption { + type = ints.unsigned; + description = "Length of the key to encrypt IRC passwords with"; + default = 4096; + example = 8192; + }; + + registrationUrl = mkOption { + type = str; + description = '' + The URL where the application service is listening for homeserver requests, + from the Matrix homeserver perspective. + ''; + example = "http://localhost:8009"; + }; + + localpart = mkOption { + type = str; + description = "The user_id localpart to assign to the appservice"; + default = "appservice-irc"; + }; + + settings = mkOption { + description = '' + Configuration for the appservice, see + + for supported values + ''; + default = {}; + type = submodule { + freeformType = jsonType; + + options = { + homeserver = mkOption { + description = "Homeserver configuration"; + default = {}; + type = submodule { + freeformType = jsonType; + + options = { + url = mkOption { + type = str; + description = "The URL to the home server for client-server API calls"; + }; + + domain = mkOption { + type = str; + description = '' + The 'domain' part for user IDs on this home server. Usually + (but not always) is the "domain name" part of the homeserver URL. + ''; + }; + }; + }; + }; + + database = mkOption { + default = {}; + description = "Configuration for the database"; + type = submodule { + freeformType = jsonType; + + options = { + engine = mkOption { + type = str; + description = "Which database engine to use"; + default = "nedb"; + example = "postgres"; + }; + + connectionString = mkOption { + type = str; + description = "The database connection string"; + default = "nedb://var/lib/matrix-appservice-irc/data"; + example = "postgres://username:password@host:port/databasename"; + }; + }; + }; + }; + + ircService = mkOption { + default = {}; + description = "IRC bridge configuration"; + type = submodule { + freeformType = jsonType; + + options = { + passwordEncryptionKeyPath = mkOption { + type = str; + description = '' + Location of the key with which IRC passwords are encrypted + for storage. Will be generated on first run if not present. + ''; + default = "/var/lib/matrix-appservice-irc/passkey.pem"; + }; + + servers = mkOption { + type = submodule { freeformType = jsonType; }; + description = "IRC servers to connect to"; + }; + }; + }; + }; + }; + }; + }; + }; + config = mkIf cfg.enable { + systemd.services.matrix-appservice-irc = { + description = "Matrix-IRC bridge"; + before = [ "matrix-synapse.service" ]; # So the registration can be used by Synapse + wantedBy = [ "multi-user.target" ]; + + preStart = '' + umask 077 + # Generate key for crypting passwords + if ! [ -f "${cfg.settings.ircService.passwordEncryptionKeyPath}" ]; then + ${pkgs.openssl}/bin/openssl genpkey \ + -out "${cfg.settings.ircService.passwordEncryptionKeyPath}" \ + -outform PEM \ + -algorithm RSA \ + -pkeyopt "rsa_keygen_bits:${toString cfg.passwordEncryptionKeyLength}" + fi + # Generate registration file + if ! [ -f "${registrationFile}" ]; then + # The easy case: the file has not been generated yet + ${bin} --generate-registration --file ${registrationFile} --config ${configFile} --url ${cfg.registrationUrl} --localpart ${cfg.localpart} + else + # The tricky case: we already have a generation file. Because the NixOS configuration might have changed, we need to + # regenerate it. But this would give the service a new random ID and tokens, so we need to back up and restore them. + # 1. Backup + id=$(grep "^id:.*$" ${registrationFile}) + hs_token=$(grep "^hs_token:.*$" ${registrationFile}) + as_token=$(grep "^as_token:.*$" ${registrationFile}) + # 2. Regenerate + ${bin} --generate-registration --file ${registrationFile} --config ${configFile} --url ${cfg.registrationUrl} --localpart ${cfg.localpart} + # 3. Restore + sed -i "s/^id:.*$/$id/g" ${registrationFile} + sed -i "s/^hs_token:.*$/$hs_token/g" ${registrationFile} + sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile} + fi + # Allow synapse access to the registration + if ${getBin pkgs.glibc}/bin/getent group matrix-synapse > /dev/null; then + chgrp matrix-synapse ${registrationFile} + chmod g+r ${registrationFile} + fi + ''; + + serviceConfig = rec { + Type = "simple"; + ExecStart = "${bin} --config ${configFile} --file ${registrationFile} --port ${toString cfg.port}"; + + ProtectHome = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + StateDirectory = "matrix-appservice-irc"; + StateDirectoryMode = "755"; + + User = "matrix-appservice-irc"; + Group = "matrix-appservice-irc"; + + CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.needBindingCap) "CAP_NET_BIND_SERVICE"; + AmbientCapabilities = CapabilityBoundingSet; + NoNewPrivileges = true; + + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap"; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_INET AF_INET6"; + }; + }; + + users.groups.matrix-appservice-irc = {}; + users.users.matrix-appservice-irc = { + description = "Service user for the Matrix-IRC bridge"; + group = "matrix-appservice-irc"; + isSystemUser = true; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix b/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix new file mode 100644 index 0000000000..83f433e0be --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix @@ -0,0 +1,80 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let cfg = config.services.ombi; + +in { + options = { + services.ombi = { + enable = mkEnableOption '' + Ombi. + Optionally see + on how to set up a reverse proxy + ''; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/ombi"; + description = "The directory where Ombi stores its data files."; + }; + + port = mkOption { + type = types.port; + default = 5000; + description = "The port for the Ombi web interface."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the Ombi web interface."; + }; + + user = mkOption { + type = types.str; + default = "ombi"; + description = "User account under which Ombi runs."; + }; + + group = mkOption { + type = types.str; + default = "ombi"; + description = "Group under which Ombi runs."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -" + ]; + + systemd.services.ombi = { + description = "Ombi"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.ombi}/bin/Ombi --storage '${cfg.dataDir}' --host 'http://*:${toString cfg.port}'"; + Restart = "on-failure"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + + users.users = mkIf (cfg.user == "ombi") { + ombi = { + group = cfg.group; + home = cfg.dataDir; + }; + }; + + users.groups = mkIf (cfg.group == "ombi") { ombi = { }; }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix index d97565f15d..b25a53435d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix @@ -225,7 +225,7 @@ in { }; }; config = mkIf cfg.enable { - environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute ]; + environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute2 ]; users.users.datadog = { description = "Datadog Agent User"; @@ -239,7 +239,7 @@ in { systemd.services = let makeService = attrs: recursiveUpdate { - path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute ]; + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute2 ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "datadog"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index 88727e70ee..86e306ab40 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -15,6 +15,7 @@ let SERVER_PROTOCOL = cfg.protocol; SERVER_HTTP_ADDR = cfg.addr; SERVER_HTTP_PORT = cfg.port; + SERVER_SOCKET = cfg.socket; SERVER_DOMAIN = cfg.domain; SERVER_ROOT_URL = cfg.rootUrl; SERVER_STATIC_ROOT_PATH = cfg.staticRootPath; @@ -291,6 +292,12 @@ in { type = types.int; }; + socket = mkOption { + description = "Listening socket."; + default = "/run/grafana/grafana.sock"; + type = types.str; + }; + domain = mkOption { description = "The public facing domain name used to access grafana from a browser."; default = "localhost"; @@ -622,6 +629,8 @@ in { serviceConfig = { WorkingDirectory = cfg.dataDir; User = "grafana"; + RuntimeDirectory = "grafana"; + RuntimeDirectoryMode = "0755"; }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index d5b679097b..007024c04c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -123,9 +123,20 @@ in { "error log" = "syslog"; }; ''; - }; + }; + + enableAnalyticsReporting = mkOption { + type = types.bool; + default = false; + description = '' + Enable reporting of anonymous usage statistics to Netdata Inc. via either + Google Analytics (in versions prior to 1.29.4), or Netdata Inc.'s + self-hosted PostHog (in versions 1.29.4 and later). + See: + ''; }; }; + }; config = mkIf cfg.enable { assertions = @@ -140,8 +151,12 @@ in { wantedBy = [ "multi-user.target" ]; path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages); + environment = { + PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules"; + } // lib.optionalAttrs (!cfg.enableAnalyticsReporting) { + DO_NOT_TRACK = "1"; + }; serviceConfig = { - Environment="PYTHONPATH=${cfg.package}/libexec/netdata/python.d/python_modules"; ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; TimeoutStopSec = 60; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 5811cda112..0b65b4865b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -28,6 +28,7 @@ let "blackbox" "collectd" "dnsmasq" + "domain" "dovecot" "fritzbox" "json" @@ -43,6 +44,7 @@ let "nginx" "nginxlog" "node" + "openldap" "openvpn" "postfix" "postgres" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix new file mode 100644 index 0000000000..61e2fc80af --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.domain; +in +{ + port = 9222; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-domain-exporter}/bin/domain_exporter \ + --bind ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix new file mode 100644 index 0000000000..888611ee6f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.prometheus.exporters.openldap; +in { + port = 9330; + extraOpts = { + ldapCredentialFile = mkOption { + type = types.path; + example = "/run/keys/ldap_pass"; + description = '' + Environment file to contain the credentials to authenticate against + openldap. + + The file should look like this: + + --- + ldapUser: "cn=monitoring,cn=Monitor" + ldapPass: "secret" + + ''; + }; + protocol = mkOption { + default = "tcp"; + example = "udp"; + type = types.str; + description = '' + Which protocol to use to connect against openldap. + ''; + }; + ldapAddr = mkOption { + default = "localhost:389"; + type = types.str; + description = '' + Address of the openldap-instance. + ''; + }; + metricsPath = mkOption { + default = "/metrics"; + type = types.str; + description = '' + URL path where metrics should be exposed. + ''; + }; + interval = mkOption { + default = "30s"; + type = types.str; + example = "1m"; + description = '' + Scrape interval of the exporter. + ''; + }; + }; + serviceOpts.serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-openldap-exporter}/bin/openldap_exporter \ + --promAddr ${cfg.listenAddress}:${toString cfg.port} \ + --metrPath ${cfg.metricsPath} \ + --ldapNet ${cfg.protocol} \ + --interval ${cfg.interval} \ + --config ${cfg.ldapCredentialFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix index 6f13ce889c..ef535585e9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix @@ -113,7 +113,7 @@ in { description = "scollector metrics collector (part of Bosun)"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.coreutils pkgs.iproute ]; + path = [ pkgs.coreutils pkgs.iproute2 ]; serviceConfig = { User = cfg.user; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix index bfaea4e167..ae7998913e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix @@ -191,7 +191,7 @@ in ExecStop = "${cfg.package}/bin/consul leave"; }); - path = with pkgs; [ iproute gnugrep gawk consul ]; + path = with pkgs; [ iproute2 gnugrep gawk consul ]; preStart = '' mkdir -m 0700 -p ${dataDir} chown -R consul ${dataDir} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix index 0781159b6e..1f5636e4e3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -10,7 +10,7 @@ let name = "ircd-hybrid-service"; scripts = [ "=>/bin" ./control.in ]; substFiles = [ "=>/conf" ./ircd.conf ]; - inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps; + inherit (pkgs) ircdHybrid coreutils su iproute2 gnugrep procps; ipv6Enabled = boolToString config.networking.enableIPv6; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix index 280158b89f..7a25769e06 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.libreswan pkgs.iproute ]; + environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ]; systemd.services.ipsec = { description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 2e680544ec..119bd09e2f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -465,7 +465,7 @@ in { restartTriggers = [ configFile overrideNameserversScript ]; # useful binaries for user-specified hooks - path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ]; + path = [ pkgs.iproute2 pkgs.util-linux pkgs.coreutils ]; aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix index 650f9c84ac..b4c2c944b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix @@ -63,7 +63,7 @@ let wantedBy = optional cfg.autoStart "multi-user.target"; after = [ "network.target" ]; - path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; + path = [ pkgs.iptables pkgs.iproute2 pkgs.nettools ]; serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.Restart = "always"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix index 4c2740d201..abe96f60f8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix @@ -132,7 +132,7 @@ in { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } ]; in { - path = [ pkgs.iptables pkgs.iproute pkgs.procps ]; + path = [ pkgs.iptables pkgs.iproute2 pkgs.procps ]; preStart = '' # Cleanup old iptables entries which might be still there diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix index f67eedac29..6e619f2254 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -63,7 +63,7 @@ in { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; - path = with pkgs; [ kmod iproute iptables util-linux ]; + path = with pkgs; [ kmod iproute2 iptables util-linux ]; environment = { STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix index f6170b8136..401f7be402 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix @@ -152,7 +152,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux + path = with pkgs; [ kmod iproute2 iptables util-linux ]; # XXX Linux after = [ "network-online.target" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix index 9f76f7f7cd..34c8693453 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix @@ -63,7 +63,7 @@ let preSetup = mkOption { example = literalExample '' - ${pkgs.iproute}/bin/ip netns add foo + ${pkgs.iproute2}/bin/ip netns add foo ''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; @@ -278,7 +278,7 @@ let wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; environment.DEVICE = interfaceName; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; - path = with pkgs; [ iproute wireguard-tools ]; + path = with pkgs; [ iproute2 wireguard-tools ]; serviceConfig = { Type = "oneshot"; @@ -333,7 +333,7 @@ let after = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; - path = with pkgs; [ kmod iproute wireguard-tools ]; + path = with pkgs; [ kmod iproute2 wireguard-tools ]; serviceConfig = { Type = "oneshot"; diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index cf0d72d5c5..b901b19cf3 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -243,7 +243,7 @@ in restartTriggers = [ fail2banConf jailConf pathsConf ]; reloadIfChanged = true; - path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; + path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ]; unitConfig.Documentation = "man:fail2ban(1)"; diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix index c2988858e5..f7b40089a9 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -57,6 +57,26 @@ in services.privacyidea = { enable = mkEnableOption "PrivacyIDEA"; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/root/privacyidea.env"; + description = '' + File to load as environment file. Environment variables + from this file will be interpolated into the config file + using envsubst which is helpful for specifying + secrets: + + { = "$SECRET"; } + + + The environment-file can now specify the actual secret key: + + SECRET=veryverytopsecret + + ''; + }; + stateDir = mkOption { type = types.str; default = "/var/lib/privacyidea"; @@ -206,7 +226,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "postgresql.service" ]; path = with pkgs; [ openssl ]; - environment.PRIVACYIDEA_CONFIGFILE = piCfgFile; + environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; preStart = let pi-manage = "${pkgs.sudo}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; pgsu = config.services.postgresql.superUser; @@ -214,6 +234,10 @@ in in '' mkdir -p ${cfg.stateDir} /run/privacyidea chown ${cfg.user}:${cfg.group} -R ${cfg.stateDir} /run/privacyidea + umask 077 + ${lib.getBin pkgs.envsubst}/bin/envsubst -o ${cfg.stateDir}/privacyidea.cfg \ + -i "${piCfgFile}" + chown ${cfg.user}:${cfg.group} ${cfg.stateDir}/privacyidea.cfg if ! test -e "${cfg.stateDir}/db-created"; then ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea @@ -231,6 +255,7 @@ in Type = "notify"; ExecStart = "${uwsgi}/bin/uwsgi --json ${piuwsgi}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; NotifyAccess = "main"; KillSignal = "SIGQUIT"; diff --git a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix index 72de11a925..033ff5ef4b 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix @@ -108,8 +108,8 @@ in { partOf = optional config.networking.firewall.enable "firewall.service"; path = with pkgs; if config.networking.nftables.enable - then [ nftables iproute systemd ] - else [ iptables ipset iproute systemd ]; + then [ nftables iproute2 systemd ] + else [ iptables ipset iproute2 systemd ]; # The sshguard ipsets must exist before we invoke # iptables. sshguard creates the ipsets after startup if diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix new file mode 100644 index 0000000000..704cd2cfa8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix @@ -0,0 +1,165 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.calibre-web; + + inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types; +in +{ + options = { + services.calibre-web = { + enable = mkEnableOption "Calibre-Web"; + + listen = { + ip = mkOption { + type = types.str; + default = "::1"; + description = '' + IP address that Calibre-Web should listen on. + ''; + }; + + port = mkOption { + type = types.port; + default = 8083; + description = '' + Listen port for Calibre-Web. + ''; + }; + }; + + dataDir = mkOption { + type = types.str; + default = "calibre-web"; + description = '' + The directory below /var/lib where Calibre-Web stores its data. + ''; + }; + + user = mkOption { + type = types.str; + default = "calibre-web"; + description = "User account under which Calibre-Web runs."; + }; + + group = mkOption { + type = types.str; + default = "calibre-web"; + description = "Group account under which Calibre-Web runs."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the server. + ''; + }; + + options = { + calibreLibrary = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to Calibre library. + ''; + }; + + enableBookConversion = mkOption { + type = types.bool; + default = false; + description = '' + Configure path to the Calibre's ebook-convert in the DB. + ''; + }; + + enableBookUploading = mkOption { + type = types.bool; + default = false; + description = '' + Allow books to be uploaded via Calibre-Web UI. + ''; + }; + + reverseProxyAuth = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable authorization using auth proxy. + ''; + }; + + header = mkOption { + type = types.str; + default = ""; + description = '' + Auth proxy header name. + ''; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.calibre-web = let + appDb = "/var/lib/${cfg.dataDir}/app.db"; + gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db"; + calibreWebCmd = "${pkgs.calibre-web}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; + + settings = concatStringsSep ", " ( + [ + "config_port = ${toString cfg.listen.port}" + "config_uploading = ${if cfg.options.enableBookUploading then "1" else "0"}" + "config_allow_reverse_proxy_header_login = ${if cfg.options.reverseProxyAuth.enable then "1" else "0"}" + "config_reverse_proxy_login_header_name = '${cfg.options.reverseProxyAuth.header}'" + ] + ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'" + ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" + ); + in + { + description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + + StateDirectory = cfg.dataDir; + ExecStartPre = pkgs.writeShellScript "calibre-web-pre-start" ( + '' + __RUN_MIGRATIONS_AND_EXIT=1 ${calibreWebCmd} + + ${pkgs.sqlite}/bin/sqlite3 ${appDb} "update settings set ${settings}" + '' + optionalString (cfg.options.calibreLibrary != null) '' + test -f ${cfg.options.calibreLibrary}/metadata.db || { echo "Invalid Calibre library"; exit 1; } + '' + ); + + ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}"; + Restart = "on-failure"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listen.port ]; + }; + + users.users = mkIf (cfg.user == "calibre-web") { + calibre-web = { + isSystemUser = true; + group = cfg.group; + }; + }; + + users.groups = mkIf (cfg.group == "calibre-web") { + calibre-web = {}; + }; + }; + + meta.maintainers = with lib.maintainers; [ pborzenkov ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix index 9083ddfa22..8f96dd9b5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix @@ -87,8 +87,8 @@ in { SystemCallFilter = [ "@system-service" - "~@chown" "~@cpu-emulation" "~@debug" "~@ipc" "~@keyring" "~@memlock" - "~@module" "~@obsolete" "~@privileged" "~@process" "~@raw-io" + "~@chown" "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" + "~@module" "~@obsolete" "~@privileged" "~@raw-io" "~@resources" "~@setuid" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 6c8341c111..f011b52723 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -154,9 +154,9 @@ let ${optionalString (cfg.recommendedProxySettings) '' proxy_redirect off; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; + proxy_connect_timeout 60; + proxy_send_timeout 60; + proxy_read_timeout 60; proxy_http_version 1.0; include ${recommendedProxyConfig}; ''} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix new file mode 100644 index 0000000000..a96df1dbf6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + format = pkgs.formats.yaml {}; +in +{ + options.services.pomerium = { + enable = mkEnableOption "the Pomerium authenticating reverse proxy"; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + description = "Path to Pomerium config YAML. If set, overrides services.pomerium.settings."; + }; + + useACMEHost = mkOption { + type = with types; nullOr str; + default = null; + description = '' + If set, use a NixOS-generated ACME certificate with the specified name. + + Note that this will require you to use a non-HTTP-based challenge, or + disable Pomerium's in-built HTTP redirect server by setting + http_redirect_addr to null and use a different HTTP server for serving + the challenge response. + + If you're using an HTTP-based challenge, you should use the + Pomerium-native autocert option instead. + ''; + }; + + settings = mkOption { + description = '' + The contents of Pomerium's config.yaml, in Nix expressions. + + Specifying configFile will override this in its entirety. + + See the Pomerium + configuration reference for more information about what to put + here. + ''; + default = {}; + type = format.type; + }; + + secretsFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to file containing secrets for Pomerium, in systemd + EnvironmentFile format. See the systemd.exec(5) man page. + ''; + }; + }; + + config = let + cfg = config.services.pomerium; + cfgFile = if cfg.configFile != null then cfg.configFile else (format.generate "pomerium.yaml" cfg.settings); + in mkIf cfg.enable ({ + systemd.services.pomerium = { + description = "Pomerium authenticating reverse proxy"; + wants = [ "network.target" ] ++ (optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target"); + after = [ "network.target" ] ++ (optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target"); + wantedBy = [ "multi-user.target" ]; + environment = optionalAttrs (cfg.useACMEHost != null) { + CERTIFICATE_FILE = "fullchain.pem"; + CERTIFICATE_KEY_FILE = "key.pem"; + }; + startLimitIntervalSec = 60; + + serviceConfig = { + DynamicUser = true; + StateDirectory = [ "pomerium" ]; + ExecStart = "${pkgs.pomerium}/bin/pomerium -config ${cfgFile}"; + + PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + MemoryDenyWriteExecute = false; # breaks LuaJIT + + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + DevicePolicy = "closed"; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectKernelLogs = true; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + LockPersonality = true; + SystemCallArchitectures = "native"; + + EnvironmentFile = cfg.secretsFile; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + + WorkingDirectory = mkIf (cfg.useACMEHost != null) "$CREDENTIALS_DIRECTORY"; + LoadCredential = optionals (cfg.useACMEHost != null) [ + "fullchain.pem:/var/lib/acme/${cfg.useACMEHost}/fullchain.pem" + "key.pem:/var/lib/acme/${cfg.useACMEHost}/key.pem" + ]; + }; + }; + + # postRun hooks on cert renew can't be used to restart Nginx since renewal + # runs as the unprivileged acme user. sslTargets are added to wantedBy + before + # which allows the acme-finished-$cert.target to signify the successful updating + # of certs end-to-end. + systemd.services.pomerium-config-reload = mkIf (cfg.useACMEHost != null) { + # TODO(lukegb): figure out how to make config reloading work with credentials. + + wantedBy = [ "acme-finished-${cfg.useACMEHost}.target" "multi-user.target" ]; + # Before the finished targets, after the renew services. + before = [ "acme-finished-${cfg.useACMEHost}.target" ]; + after = [ "acme-${cfg.useACMEHost}.service" ]; + # Block reloading if not all certs exist yet. + unitConfig.ConditionPathExists = [ "${certs.${cfg.useACMEHost}.directory}/fullchain.pem" ]; + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 60; + ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active pomerium.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl restart pomerium.service"; + }; + }; + }); +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix index bdae9c3afd..af303d6fb2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -14,6 +14,16 @@ in default = false; description = "Enable the kodi multimedia center."; }; + + package = mkOption { + type = types.package; + default = pkgs.kodi; + defaultText = "pkgs.kodi"; + example = "pkgs.kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])"; + description = '' + Package that should be used for Kodi. + ''; + }; }; }; @@ -21,11 +31,11 @@ in services.xserver.desktopManager.session = [{ name = "kodi"; start = '' - LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone & + LIRC_SOCKET_PATH=/run/lirc/lircd ${cfg.package}/bin/kodi --standalone & waitPID=$! ''; }]; - environment.systemPackages = [ pkgs.kodi ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 45febb27bf..d4ae4c9346 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -84,6 +84,7 @@ let # Kernel module loading. "systemd-modules-load.service" "kmod-static-nodes.service" + "modprobe@.service" # Filesystems. "systemd-fsck@.service" @@ -1187,9 +1188,12 @@ in systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container"; - boot.kernel.sysctl = mkIf (!cfg.coredump.enable) { - "kernel.core_pattern" = "core"; - }; + boot.kernel.sysctl."kernel.core_pattern" = mkIf (!cfg.coredump.enable) "core"; + + # Increase numeric PID range (set directly instead of copying a one-line file from systemd) + # https://github.com/systemd/systemd/pull/12226 + boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304); + boot.kernelParams = optional (!cfg.enableUnifiedCgroupHierarchy) "systemd.unified_cgroup_hierarchy=0"; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 59676e9967..97fab6f11e 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -302,7 +302,7 @@ in }; services.zfs.autoScrub = { - enable = mkEnableOption "Enables periodic scrubbing of ZFS pools."; + enable = mkEnableOption "periodic scrubbing of ZFS pools"; interval = mkOption { default = "Sun, 02:00"; diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix index 9ba6ccfbe7..11bd159319 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix @@ -101,7 +101,7 @@ let unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; @@ -185,7 +185,7 @@ let # Restart rather than stop+start this unit to prevent the # network from dying during switch-to-configuration. stopIfChanged = false; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' state="/run/nixos/network/addresses/${i.name}" @@ -258,7 +258,7 @@ let wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; partOf = [ "network-setup.service" ]; before = [ "network-setup.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -284,7 +284,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces echo "Removing old bridge ${n}..." @@ -372,7 +372,7 @@ let wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + path = [ pkgs.iproute2 config.virtualisation.vswitch.package ]; preStart = '' echo "Resetting Open vSwitch ${n}..." ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ @@ -413,7 +413,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute pkgs.gawk ]; + path = [ pkgs.iproute2 pkgs.gawk ]; script = '' echo "Destroying old bond ${n}..." ${destroyBond n} @@ -451,7 +451,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" @@ -476,7 +476,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" @@ -504,7 +504,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index 23e1e611a7..1c145e8ff4 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix @@ -259,7 +259,7 @@ in wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + path = [ pkgs.iproute2 config.virtualisation.vswitch.package ]; preStart = '' echo "Resetting Open vSwitch ${n}..." ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index f730ec82bd..b5d9784965 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -1171,7 +1171,7 @@ in wantedBy = [ "network.target" ]; after = [ "network-pre.target" ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; script = '' @@ -1249,7 +1249,7 @@ in ${optionalString (current.type == "mesh" && current.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"} ${optionalString (current.type == "monitor" && current.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"} ${optionalString (current.type == "managed" && current.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"} - ${optionalString (current.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${current.mac}"} + ${optionalString (current.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${current.mac}"} ''; # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface. @@ -1260,7 +1260,7 @@ in ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"} ${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${new.flags}"} ${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if new.fourAddr then "on" else "off"}"} - ${optionalString (new.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${new.mac}"} + ${optionalString (new.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${new.mac}"} ''; # Udev attributes for systemd to name the device and to create a .device target. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix index 4498e3a736..9641b693f1 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/brightbox-image.nix @@ -119,7 +119,7 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - path = [ pkgs.wget pkgs.iproute ]; + path = [ pkgs.wget pkgs.iproute2 ]; script = '' diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix index 6291253501..1b764e7e4d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix @@ -19,7 +19,7 @@ with lib; wantedBy = [ "multi-user.target" "sshd.service" ]; before = [ "sshd.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix index b6b1ffa395..cff48d20b2 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix @@ -110,7 +110,7 @@ in systemd.services.google-network-daemon = { description = "Google Compute Engine Network Daemon"; after = [ "network-online.target" "network.target" "google-instance-setup.service" ]; - path = with pkgs; [ iproute ]; + path = with pkgs; [ iproute2 ]; serviceConfig = { ExecStart = "${gce}/bin/google_network_daemon"; StandardOutput="journal+console"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index a853917a6d..f15d587584 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -739,7 +739,7 @@ in unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; environment = { root = "/var/lib/containers/%i"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xe-guest-utilities.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xe-guest-utilities.nix index 675cf92973..25ccbaebc0 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xe-guest-utilities.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xe-guest-utilities.nix @@ -17,7 +17,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "xe-linux-distribution.service" ]; requires = [ "proc-xen.mount" ]; - path = [ pkgs.coreutils pkgs.iproute ]; + path = [ pkgs.coreutils pkgs.iproute2 ]; serviceConfig = { PIDFile = "/run/xe-daemon.pid"; ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index 5b57ca860d..24df1b6ad7 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -248,7 +248,7 @@ in # Xen provides udev rules. services.udev.packages = [ cfg.package ]; - services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; + services.udev.path = [ pkgs.bridge-utils pkgs.iproute2 ]; systemd.services.xen-store = { description = "Xen Store Daemon"; diff --git a/third_party/nixpkgs/nixos/tests/agda.nix b/third_party/nixpkgs/nixos/tests/agda.nix index 3773907cff..f282788519 100644 --- a/third_party/nixpkgs/nixos/tests/agda.nix +++ b/third_party/nixpkgs/nixos/tests/agda.nix @@ -3,8 +3,9 @@ import ./make-test-python.nix ({ pkgs, ... }: let hello-world = pkgs.writeText "hello-world" '' open import IO + open import Level - main = run(putStrLn "Hello World!") + main = run {0ℓ} (putStrLn "Hello World!") ''; in { diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 65c7d84ee6..62188ddf9e 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -49,6 +49,7 @@ in cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cage = handleTest ./cage.nix {}; cagebreak = handleTest ./cagebreak.nix {}; + calibre-web = handleTest ./calibre-web.nix {}; cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; }; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; @@ -110,6 +111,7 @@ in ergo = handleTest ./ergo.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; + etebase-server = handleTest ./etebase-server.nix {}; etesync-dav = handleTest ./etesync-dav.nix {}; fancontrol = handleTest ./fancontrol.nix {}; fcitx = handleTest ./fcitx {}; @@ -225,6 +227,7 @@ in mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; matomo = handleTest ./matomo.nix {}; + matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; mediawiki = handleTest ./mediawiki.nix {}; memcached = handleTest ./memcached.nix {}; @@ -287,6 +290,7 @@ in nzbget = handleTest ./nzbget.nix {}; nzbhydra2 = handleTest ./nzbhydra2.nix {}; oh-my-zsh = handleTest ./oh-my-zsh.nix {}; + ombi = handleTest ./ombi.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; @@ -318,6 +322,7 @@ in plikd = handleTest ./plikd.nix {}; plotinus = handleTest ./plotinus.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; + pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; postgis = handleTest ./postgis.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/calibre-web.nix b/third_party/nixpkgs/nixos/tests/calibre-web.nix new file mode 100644 index 0000000000..4f73b33111 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/calibre-web.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + port = 3142; + defaultPort = 8083; + in + with lib; + { + name = "calibre-web"; + meta.maintainers = with pkgs.lib.maintainers; [ pborzenkov ]; + + nodes = { + default = { ... }: { + services.calibre-web.enable = true; + }; + + customized = { pkgs, ... }: { + services.calibre-web = { + enable = true; + listen.port = port; + options = { + calibreLibrary = "/tmp/books"; + reverseProxyAuth = { + enable = true; + header = "X-User"; + }; + }; + }; + environment.systemPackages = [ pkgs.calibre ]; + }; + }; + testScript = '' + start_all() + + default.wait_for_unit("calibre-web.service") + default.wait_for_open_port(${toString defaultPort}) + default.succeed( + "curl --fail 'http://localhost:${toString defaultPort}/basicconfig' | grep -q 'Basic Configuration'" + ) + + customized.succeed( + "mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book" + ) + customized.succeed("systemctl restart calibre-web") + customized.wait_for_unit("calibre-web.service") + customized.wait_for_open_port(${toString port}) + customized.succeed( + "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep -q test-book" + ) + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/croc.nix b/third_party/nixpkgs/nixos/tests/croc.nix index c1b6fc7232..75a8fc991d 100644 --- a/third_party/nixpkgs/nixos/tests/croc.nix +++ b/third_party/nixpkgs/nixos/tests/croc.nix @@ -6,7 +6,7 @@ let pass = pkgs.writeText "pass" "PassRelay"; in { name = "croc"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ hax404 julm ]; }; diff --git a/third_party/nixpkgs/nixos/tests/elk.nix b/third_party/nixpkgs/nixos/tests/elk.nix index 8488c97c01..fee350de65 100644 --- a/third_party/nixpkgs/nixos/tests/elk.nix +++ b/third_party/nixpkgs/nixos/tests/elk.nix @@ -120,6 +120,7 @@ let }; }; + passthru.elkPackages = elk; testScript = '' import json diff --git a/third_party/nixpkgs/nixos/tests/etebase-server.nix b/third_party/nixpkgs/nixos/tests/etebase-server.nix new file mode 100644 index 0000000000..4fc3c1f639 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/etebase-server.nix @@ -0,0 +1,50 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + dataDir = "/var/lib/foobar"; + +in { + name = "etebase-server"; + meta = with pkgs.lib.maintainers; { + maintainers = [ felschr ]; + }; + + machine = { pkgs, ... }: + { + services.etebase-server = { + inherit dataDir; + enable = true; + settings.global.secret_file = + toString (pkgs.writeText "secret" "123456"); + }; + }; + + testScript = '' + machine.wait_for_unit("etebase-server.service") + machine.wait_for_open_port(8001) + + with subtest("Database & src-version were created"): + machine.wait_for_file("${dataDir}/src-version") + assert ( + "${pkgs.etebase-server}" + in machine.succeed("cat ${dataDir}/src-version") + ) + machine.wait_for_file("${dataDir}/db.sqlite3") + machine.wait_for_file("${dataDir}/static") + + with subtest("Only allow access from allowed_hosts"): + machine.succeed("curl -sSfL http://0.0.0.0:8001/") + machine.fail("curl -sSfL http://127.0.0.1:8001/") + machine.fail("curl -sSfL http://localhost:8001/") + + with subtest("Run tests"): + machine.succeed("etebase-server check") + machine.succeed("etebase-server test") + + with subtest("Create superuser"): + machine.succeed( + "etebase-server createsuperuser --no-input --username admin --email root@localhost" + ) + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/gitlab.nix b/third_party/nixpkgs/nixos/tests/gitlab.nix index baad675229..582f5faf9b 100644 --- a/third_party/nixpkgs/nixos/tests/gitlab.nix +++ b/third_party/nixpkgs/nixos/tests/gitlab.nix @@ -34,6 +34,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { enableImap = true; }; + systemd.services.gitlab-backup.environment.BACKUP = "dump"; + services.gitlab = { enable = true; databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4"; @@ -64,60 +66,89 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { }; }; - testScript = - let - auth = pkgs.writeText "auth.json" (builtins.toJSON { - grant_type = "password"; - username = "root"; - password = initialRootPassword; - }); + testScript = { nodes, ... }: + let + auth = pkgs.writeText "auth.json" (builtins.toJSON { + grant_type = "password"; + username = "root"; + password = initialRootPassword; + }); - createProject = pkgs.writeText "create-project.json" (builtins.toJSON { - name = "test"; - }); + createProject = pkgs.writeText "create-project.json" (builtins.toJSON { + name = "test"; + }); - putFile = pkgs.writeText "put-file.json" (builtins.toJSON { - branch = "master"; - author_email = "author@example.com"; - author_name = "Firstname Lastname"; - content = "some content"; - commit_message = "create a new file"; - }); - in - '' - gitlab.start() + putFile = pkgs.writeText "put-file.json" (builtins.toJSON { + branch = "master"; + author_email = "author@example.com"; + author_name = "Firstname Lastname"; + content = "some content"; + commit_message = "create a new file"; + }); - 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") + # Wait for all GitLab services to be fully started. + waitForServices = '' + 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("${nodes.gitlab.config.services.gitlab.statePath}/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" - ) - gitlab.succeed( - "${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2" - ) - gitlab.succeed( - "echo \"Authorization: Bearer \$(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers" - ) - gitlab.succeed( - "curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects" - ) - gitlab.succeed( - "curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/1/repository/files/some-file.txt" - ) - gitlab.succeed( - "curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.gz > /tmp/archive.tar.gz" - ) - gitlab.succeed( - "curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.bz2 > /tmp/archive.tar.bz2" - ) - gitlab.succeed("test -s /tmp/archive.tar.gz") - gitlab.succeed("test -s /tmp/archive.tar.bz2") - ''; + # The actual test of GitLab. Only push data to GitLab if + # `doSetup` is is true. + test = doSetup: '' + gitlab.succeed( + "curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in" + ) + gitlab.succeed( + "${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2" + ) + gitlab.succeed( + "echo \"Authorization: Bearer \$(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers" + ) + '' + optionalString doSetup '' + gitlab.succeed( + "curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects" + ) + gitlab.succeed( + "curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/1/repository/files/some-file.txt" + ) + '' + '' + gitlab.succeed( + "curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.gz > /tmp/archive.tar.gz" + ) + gitlab.succeed( + "curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.bz2 > /tmp/archive.tar.bz2" + ) + gitlab.succeed("test -s /tmp/archive.tar.gz") + gitlab.succeed("test -s /tmp/archive.tar.bz2") + ''; + + in '' + gitlab.start() + '' + + waitForServices + + test true + + '' + gitlab.systemctl("start gitlab-backup.service") + gitlab.wait_for_unit("gitlab-backup.service") + gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/backup/dump_gitlab_backup.tar") + gitlab.systemctl("stop postgresql.service gitlab.target") + gitlab.succeed( + "find ${nodes.gitlab.config.services.gitlab.statePath} -mindepth 1 -maxdepth 1 -not -name backup -execdir rm -r {} +" + ) + gitlab.succeed("systemd-tmpfiles --create") + gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}") + gitlab.systemctl("start gitlab-config.service gitlab-postgresql.service") + gitlab.succeed( + "sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes" + ) + gitlab.systemctl("start gitlab.target") + '' + + waitForServices + + test false; }) diff --git a/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix b/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix new file mode 100644 index 0000000000..79b07ef83c --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix @@ -0,0 +1,162 @@ +import ./make-test-python.nix ({ pkgs, ... }: + let + homeserverUrl = "http://homeserver:8448"; + in + { + name = "matrix-appservice-irc"; + meta = { + maintainers = pkgs.matrix-appservice-irc.meta.maintainers; + }; + + nodes = { + homeserver = { pkgs, ... }: { + # We'll switch to this once the config is copied into place + specialisation.running.configuration = { + services.matrix-synapse = { + enable = true; + database_type = "sqlite3"; + app_service_config_files = [ "/registration.yml" ]; + + enable_registration = true; + + listeners = [ + # The default but tls=false + { + "bind_address" = ""; + "port" = 8448; + "resources" = [ + { "compress" = true; "names" = [ "client" "webclient" ]; } + { "compress" = false; "names" = [ "federation" ]; } + ]; + "tls" = false; + "type" = "http"; + "x_forwarded" = false; + } + ]; + }; + + networking.firewall.allowedTCPPorts = [ 8448 ]; + }; + }; + + ircd = { pkgs, ... }: { + services.ngircd = { + enable = true; + config = '' + [Global] + Name = ircd.ircd + Info = Server Info Text + AdminInfo1 = _ + + [Channel] + Name = #test + Topic = a cool place + + [Options] + PAM = no + ''; + }; + networking.firewall.allowedTCPPorts = [ 6667 ]; + }; + + appservice = { pkgs, ... }: { + services.matrix-appservice-irc = { + enable = true; + registrationUrl = "http://appservice:8009"; + + settings = { + homeserver.url = homeserverUrl; + homeserver.domain = "homeserver"; + + ircService.servers."ircd" = { + name = "IRCd"; + port = 6667; + dynamicChannels = { + enabled = true; + aliasTemplate = "#irc_$CHANNEL"; + }; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ 8009 ]; + }; + + client = { pkgs, ... }: { + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "do_test" + { libraries = [ pkgs.python3Packages.matrix-client ]; } '' + import socket + from matrix_client.client import MatrixClient + from time import sleep + + matrix = MatrixClient("${homeserverUrl}") + matrix.register_with_password(username="alice", password="foobar") + + irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + irc.connect(("ircd", 6667)) + irc.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + irc.send(b"USER bob bob bob :bob\n") + irc.send(b"NICK bob\n") + + m_room = matrix.join_room("#irc_#test:homeserver") + irc.send(b"JOIN #test\n") + + # plenty of time for the joins to happen + sleep(10) + + m_room.send_text("hi from matrix") + irc.send(b"PRIVMSG #test :hi from irc \r\n") + + print("Waiting for irc message...") + while True: + buf = irc.recv(10000) + if b"hi from matrix" in buf: + break + + print("Waiting for matrix message...") + + + def callback(room, e): + if "hi from irc" in e['content']['body']: + exit(0) + + + m_room.add_listener(callback, "m.room.message") + matrix.listen_forever() + '' + ) + ]; + }; + }; + + testScript = '' + start_all() + + ircd.wait_for_unit("ngircd.service") + ircd.wait_for_open_port(6667) + + with subtest("start the appservice"): + appservice.wait_for_unit("matrix-appservice-irc.service") + appservice.wait_for_open_port(8009) + + with subtest("copy the registration file"): + appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml") + homeserver.copy_from_host( + pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml", "/" + ) + homeserver.succeed("chmod 444 /registration.yml") + + with subtest("start the homeserver"): + homeserver.succeed( + "/run/current-system/specialisation/running/bin/switch-to-configuration test >&2" + ) + + homeserver.wait_for_unit("matrix-synapse.service") + homeserver.wait_for_open_port(8448) + + with subtest("ensure messages can be exchanged"): + client.succeed("do_test") + ''; + + }) diff --git a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix index a4b893a9f3..0a40c010a4 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -2,7 +2,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : let mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; - mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute netcat procps pv socat ]; }; + mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute2 netcat procps pv socat ]; }; in { name = "mariadb-galera-mariabackup"; diff --git a/third_party/nixpkgs/nixos/tests/ombi.nix b/third_party/nixpkgs/nixos/tests/ombi.nix new file mode 100644 index 0000000000..bfca86af81 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ombi.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "ombi"; + meta.maintainers = with maintainers; [ woky ]; + + nodes.machine = + { pkgs, ... }: + { services.ombi.enable = true; }; + + testScript = '' + machine.wait_for_unit("ombi.service") + machine.wait_for_open_port("5000") + machine.succeed("curl --fail http://localhost:5000/") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/pomerium.nix b/third_party/nixpkgs/nixos/tests/pomerium.nix new file mode 100644 index 0000000000..531b621271 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/pomerium.nix @@ -0,0 +1,102 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "pomerium"; + meta = with lib.maintainers; { + maintainers = [ lukegb ]; + }; + + nodes = let base = myIP: { pkgs, lib, ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + dhcpcd.enable = false; + firewall.allowedTCPPorts = [ 80 443 ]; + hosts = { + "192.168.1.1" = [ "pomerium" "pom-auth" ]; + "192.168.1.2" = [ "backend" "dummy-oidc" ]; + }; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = myIP; prefixLength = 24; } + ]; + }; + }; in { + pomerium = { pkgs, lib, ... }: { + imports = [ (base "192.168.1.1") ]; + services.pomerium = { + enable = true; + settings = { + address = ":80"; + insecure_server = true; + authenticate_service_url = "http://pom-auth"; + + idp_provider = "oidc"; + idp_scopes = [ "oidc" ]; + idp_client_id = "dummy"; + idp_provider_url = "http://dummy-oidc"; + + policy = [{ + from = "https://my.website"; + to = "http://192.168.1.2"; + allow_public_unauthenticated_access = true; + preserve_host_header = true; + } { + from = "https://login.required"; + to = "http://192.168.1.2"; + allowed_domains = [ "my.domain" ]; + preserve_host_header = true; + }]; + }; + secretsFile = pkgs.writeText "pomerium-secrets" '' + # 12345678901234567890123456789012 in base64 + COOKIE_SECRET=MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI= + IDP_CLIENT_SECRET=dummy + ''; + }; + }; + backend = { pkgs, lib, ... }: { + imports = [ (base "192.168.1.2") ]; + services.nginx.enable = true; + services.nginx.virtualHosts."my.website" = { + root = pkgs.runCommand "testdir" {} '' + mkdir "$out" + echo hello world > "$out/index.html" + ''; + }; + services.nginx.virtualHosts."dummy-oidc" = { + root = pkgs.runCommand "testdir" {} '' + mkdir -p "$out/.well-known" + cat <"$out/.well-known/openid-configuration" + { + "issuer": "http://dummy-oidc", + "authorization_endpoint": "http://dummy-oidc/auth.txt", + "token_endpoint": "http://dummy-oidc/token", + "jwks_uri": "http://dummy-oidc/jwks.json", + "userinfo_endpoint": "http://dummy-oidc/userinfo", + "id_token_signing_alg_values_supported": ["RS256"] + } + EOF + echo hello I am login page >"$out/auth.txt" + ''; + }; + }; + }; + + testScript = { ... }: '' + backend.wait_for_unit("nginx") + backend.wait_for_open_port(80) + + pomerium.wait_for_unit("pomerium") + pomerium.wait_for_open_port(80) + + with subtest("no authentication required"): + pomerium.succeed( + "curl --resolve my.website:80:127.0.0.1 http://my.website | grep -q 'hello world'" + ) + + with subtest("login required"): + pomerium.succeed( + "curl -I --resolve login.required:80:127.0.0.1 http://login.required | grep -q pom-auth" + ) + pomerium.succeed( + "curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep -q 'hello I am login page'" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/privacyidea.nix b/third_party/nixpkgs/nixos/tests/privacyidea.nix index b71ff0a166..4a94f07279 100644 --- a/third_party/nixpkgs/nixos/tests/privacyidea.nix +++ b/third_party/nixpkgs/nixos/tests/privacyidea.nix @@ -12,10 +12,16 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { services.privacyidea = { enable = true; - secretKey = "testing"; - pepper = "testing"; + secretKey = "$SECRET_KEY"; + pepper = "$PEPPER"; adminPasswordFile = pkgs.writeText "admin-password" "testing"; adminEmail = "root@localhost"; + + # Don't try this at home! + environmentFile = pkgs.writeText "pi-secrets.env" '' + SECRET_KEY=testing + PEPPER=testing + ''; }; services.nginx = { enable = true; @@ -29,6 +35,8 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { machine.start() machine.wait_for_unit("multi-user.target") machine.succeed("curl --fail http://localhost | grep privacyIDEA") + machine.succeed("grep \"SECRET_KEY = 'testing'\" /var/lib/privacyidea/privacyidea.cfg") + machine.succeed("grep \"PI_PEPPER = 'testing'\" /var/lib/privacyidea/privacyidea.cfg") machine.succeed( "curl --fail http://localhost/auth -F username=admin -F password=testing | grep token" ) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 290cb87abb..a43dca4fe1 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -201,6 +201,22 @@ let ''; }; + # Access to WHOIS server is required to properly test this exporter, so + # just perform basic sanity check that the exporter is running and returns + # a failure. + domain = { + exporterConfig = { + enable = true; + }; + exporterTest = '' + wait_for_unit("prometheus-domain-exporter.service") + wait_for_open_port(9222) + succeed( + "curl -sSf 'http://localhost:9222/probe?target=nixos.org' | grep -q 'domain_probe_success 0'" + ) + ''; + }; + dovecot = { exporterConfig = { enable = true; @@ -603,6 +619,66 @@ let ''; }; + openldap = { + exporterConfig = { + enable = true; + ldapCredentialFile = "${pkgs.writeText "exporter.yml" '' + ldapUser: "cn=root,dc=example" + ldapPass: "notapassword" + ''}"; + }; + metricProvider = { + services.openldap = { + enable = true; + settings.children = { + "cn=schema".includes = [ + "${pkgs.openldap}/etc/schema/core.ldif" + "${pkgs.openldap}/etc/schema/cosine.ldif" + "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "${pkgs.openldap}/etc/schema/nis.ldif" + ]; + "olcDatabase={1}mdb" = { + attrs = { + objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; + olcDatabase = "{1}mdb"; + olcDbDirectory = "/var/db/openldap"; + olcSuffix = "dc=example"; + olcRootDN = { + # cn=root,dc=example + base64 = "Y249cm9vdCxkYz1leGFtcGxl"; + }; + olcRootPW = { + path = "${pkgs.writeText "rootpw" "notapassword"}"; + }; + }; + }; + "olcDatabase={2}monitor".attrs = { + objectClass = [ "olcDatabaseConfig" ]; + olcDatabase = "{2}monitor"; + olcAccess = [ "to dn.subtree=cn=monitor by users read" ]; + }; + }; + declarativeContents."dc=example" = '' + dn: dc=example + objectClass: domain + dc: example + + dn: ou=users,dc=example + objectClass: organizationalUnit + ou: users + ''; + }; + }; + exporterTest = '' + wait_for_unit("prometheus-openldap-exporter.service") + wait_for_open_port(389) + wait_for_open_port(9330) + wait_until_succeeds( + "curl -sSf http://localhost:9330/metrics | grep -q 'openldap_scrape{result=\"ok\"} 1'" + ) + ''; + }; + openvpn = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/wireguard/basic.nix b/third_party/nixpkgs/nixos/tests/wireguard/basic.nix index a31e92e864..36ab226cde 100644 --- a/third_party/nixpkgs/nixos/tests/wireguard/basic.nix +++ b/third_party/nixpkgs/nixos/tests/wireguard/basic.nix @@ -52,9 +52,9 @@ import ../make-test-python.nix ({ pkgs, lib, ...} : inherit (wg-snakeoil-keys.peer0) publicKey; }; - postSetup = let inherit (pkgs) iproute; in '' - ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 - ${iproute}/bin/ip route replace fc00::1/128 dev wg0 + postSetup = let inherit (pkgs) iproute2; in '' + ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute2}/bin/ip route replace fc00::1/128 dev wg0 ''; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix new file mode 100644 index 0000000000..57e6cdba5a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/accessibility/svkbd/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, writeText +, pkg-config +, libX11 +, libXft +, libXi +, libXinerama +, libXtst +, layout ? null +, conf ? null +, patches ? [ ] +}: + +stdenv.mkDerivation rec { + pname = "svkbd"; + version = "0.3"; + + src = fetchurl { + url = "https://dl.suckless.org/tools/svkbd-${version}.tar.gz"; + sha256 = "108khx665d7dlzs04iy4g1nw3fyqpy6kd0afrwiapaibgv4xhfsk"; + }; + + inherit patches; + + postPatch = let + configFile = if lib.isDerivation conf || lib.isPath conf then + conf + else + writeText "config.def.h" conf; + in lib.optionalString (conf != null) '' + cp ${configFile} config.def.h + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libX11 + libXft + libXi + libXinerama + libXtst + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ] ++ lib.optional (layout != null) "LAYOUT=${layout}"; + + meta = with lib; { + description = "Simple virtual keyboard"; + homepage = "https://tools.suckless.org/x/svkbd/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix index 636314bf1c..418426530b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: +{ lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { name = packageName + "-" + version ; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib minixml jack2Full ]; + buildInputs = [ alsaLib minixml jack2 ]; meta = with lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix b/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix index be984e7e98..c75adb11ed 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/amarok/default.nix @@ -15,6 +15,8 @@ mkDerivation rec { sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a"; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix b/third_party/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix index 5d0cb68edb..e4d43d7f01 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/apple-music-electron/default.nix @@ -18,7 +18,7 @@ in appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=$out/bin/apple-music-electron' + --replace "Exec=AppRun" "Exec=$out/bin/apple-music-electron" cp -r ${appimageContents}/usr/share/icons $out/share ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 4e9762b3e7..fac816649c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "10nf29zr0xg9mxmknkc39jh3y9kpxzy5wg1v0s3kkd180lja9zpn"; + sha256 = "sha256-k7L6CU2lY9192tfaWtVOxq9BCY7FZZdxmHT8EA+ZFsk="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix index dd4cdd29c6..ab2450f1e5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix @@ -1,6 +1,6 @@ { faust , gtk2 -, jack2Full +, jack2 , alsaLib , opencv , libsndfile @@ -18,7 +18,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk2 - jack2Full + jack2 alsaLib opencv libsndfile diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix index 76e4b5ce8d..f6bc4d485f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,5 +1,5 @@ { faust -, jack2Full +, jack2 , qt4 , libsndfile , alsaLib @@ -16,7 +16,7 @@ faust.wrapWithBuildEnv { ]; propagatedBuildInputs = [ - jack2Full + jack2 qt4 libsndfile alsaLib diff --git a/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix index f60320784a..c906f62894 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "freac"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "enzo1982"; repo = "freac"; rev = "v${version}"; - sha256 = "1sdrsc5pn5901bbds7dj02n71zn5rs4wnv2xxs8ffql4b7jjva0m"; + sha256 = "sha256-JwZJOV4mxNKqhhdlfFcX06NwBxmbye2mgMfdM//bHYI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/gtklick/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gtklick/default.nix index b3b95ca057..6b7f4e4d7b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gtklick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gtklick/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages, gettext, klick}: +{ lib, fetchurl, python2Packages, gettext, klick}: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "gtklick"; version = "0.6.4"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137"; }; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ pyliblo pyGtkGlade ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ingen/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ingen/default.nix index 55456b2fb6..a0defad0da 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ingen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkg-config, python, raul, rdflib, serd, sord, sratom +, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom , wafHook , suil }: @@ -16,24 +16,21 @@ stdenv.mkDerivation rec { deepClone = true; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ]; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper - python raul serd sord sratom suil + boost ganv glibmm gtkmm2 libjack2 lilv lv2 + python3 raul serd sord sratom suil ]; - preConfigure = '' - sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript - ''; + strictDeps = true; - propagatedBuildInputs = [ rdflib ]; + pythonPath = [ + python3 + python3.pkgs.rdflib + ]; postInstall = '' - for program in ingenams ingenish - do - wrapProgram $out/bin/$program \ - --prefix PYTHONPATH : $out/${python.sitePackages}:$PYTHONPATH - done + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix index 611956089e..b640b55c54 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python +{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3 , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ - gtk2 libjack2 lilv lv2 python serd sord sratom suil + gtk2 libjack2 lilv lv2 python3 serd sord sratom suil ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix new file mode 100644 index 0000000000..299fe54736 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "JMusicBot"; + version = "0.3.4"; + + src = fetchurl { + url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; + sha256 = "sha256-++/ot9k74pkN9Wl7IEjiMIv/q5zklIEdU6uFjam0tmU="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/lib + cp $src $out/lib/JMusicBot + + makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ + --add-flags "-Xmx1G -Dnogui=true -jar $out/lib/JMusicBot" + ''; + + meta = with lib; { + description = "Discord music bot that's easy to set up and run yourself"; + homepage = "https://github.com/jagrosh/MusicBot"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/lastfmsubmitd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lastfmsubmitd/default.nix index efafc5b05b..8a786c5c69 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "lastfmsubmitd"; version = "1.0.6"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index a25c522e12..e3f92d2da7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper -, libsndfile, jack2Full +, libsndfile, jack2 , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config php makeWrapper ]; - buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; + buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/third_party/nixpkgs/pkgs/applications/audio/oxefmsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/oxefmsynth/default.nix new file mode 100644 index 0000000000..427029f3c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/oxefmsynth/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchFromGitHub, unzip, fetchzip, libX11 }: + +let + + vst-sdk = stdenv.mkDerivation rec { + name = "vstsdk3610_11_06_2018_build_37"; + src = fetchzip { + url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; + sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; + }; + installPhase = "cp -r . $out"; + }; + +in stdenv.mkDerivation rec { + pname = "oxefmsynth"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "oxesoft"; + repo = pname; + rev = "v${version}"; + sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn"; + }; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + + buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; + + buildInputs = [ libX11 ]; + + installPhase = '' + mkdir -p $out/lib/lxvst + install -Dm644 oxevst64.so -t $out/lib/lxvst + ''; + + meta = with lib; { + homepage = "https://github.com/oxesoft/oxefmsynth"; + description = "An open source VST 2.4 instrument plugin"; + maintainers = [ maintainers.hirenashah ]; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index 349f4636a7..c84aa039c5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -9,7 +9,7 @@ , pkg-config , boost , bash -, jack2Full +, jack2 , supercollider , qwt , osmid @@ -102,7 +102,7 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ + --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \ --set AUBIO_LIB "${aubio}/lib/libaubio.so" ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix new file mode 100644 index 0000000000..211e45f7b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, lib +, cmake +, mkDerivation +, libxcb +, qtbase +, qtsvg +}: + +mkDerivation rec { + pname = "spotify-qt"; + version = "3.5"; + + src = fetchFromGitHub { + owner = "kraxarn"; + repo = pname; + rev = "v${version}"; + sha256 = "1bgd0q4sbbww3lbrx2zwgaz0sl7qh195s4kvgsq16gv7ij82bskn"; + }; + + buildInputs = [ libxcb qtbase qtsvg ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=" ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + description = "Lightweight unofficial Spotify client using Qt"; + homepage = "https://github.com/kraxarn/spotify-qt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kiyengar ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix index 69aae9d643..3be5af2755 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.55.494.gca75f788"; + version = "1.1.55.498.gf9a83c60"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "45"; + rev = "46"; deps = [ alsaLib @@ -79,7 +79,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "5d61a2d5b26be651620ab5d18d3a204d8d7b09dcec8a733ddc176c44cb43e9176c4350933ebe4498b065ba219113f3226c13bea9659da738fe635f41d01db303"; + sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; }; nativeBuildInputs = [ makeWrapper squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index fc13c8862c..76ed0e9cc1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-1aXHMvjLK5WiE0mut/a3ynuMfNHgPbUzAZdmaVJBDXQ="; + sha256 = "sha256:0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2"; }; buildInputs = [ @@ -67,7 +67,6 @@ mkDerivation rec { libselinux libsepol p11-kit - util-linux ] ++ lib.optionals withGstreamer (with gst_all_1; [ gstreamer @@ -77,7 +76,11 @@ mkDerivation rec { ]) ++ lib.optional withVlc libvlc; - nativeBuildInputs = [ cmake ninja pkg-config qttools ]; + nativeBuildInputs = [ + cmake ninja pkg-config qttools + ] ++ lib.optionals stdenv.isLinux [ + util-linux + ]; cmakeFlags = [ "-DUSE_SYSTEM_TAGLIB=ON" @@ -91,7 +94,7 @@ mkDerivation rec { description = "Music player and music collection organizer"; homepage = "https://www.strawberrymusicplayer.org/"; changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; # upstream says darwin should work but they lack maintainers as of 0.6.6 platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index 1f74998166..f584b13a29 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook +{ fetchFromGitLab, lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true @@ -8,11 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.7"; + version = "0.11.10"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "1x6b02gw46gp6qcgv67j7k3gr1dpfczbyma6dxanag8pnpqrj8qi"; + src = fetchFromGitLab { + owner = "sublime-music"; + repo = pname; + rev = "v${version}"; + sha256 = "1g78gmiywg07kaywfc9q0yab2bzxs936vb3157ni1z0flbmcwrry"; }; nativeBuildInputs = [ @@ -30,6 +32,7 @@ python3Packages.buildPythonApplication rec { ; propagatedBuildInputs = with python3Packages; [ + bleach dataclasses-json deepdiff fuzzywuzzy @@ -52,12 +55,22 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; - pythonImportsCheck = [ "sublime" ]; + pythonImportsCheck = [ "sublime_music" ]; + + postInstall = '' + install -Dm444 sublime-music.desktop -t $out/share/applications + install -Dm444 sublime-music.metainfo.xml -t $out/share/metainfo + + for size in 16 22 32 48 64 72 96 128 192 512 1024; do + install -Dm444 logo/rendered/"$size".png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/sublime-music.png + done + ''; meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ albakham ]; + maintainers = with maintainers; [ albakham sumnerevans ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix index 1fe56096e9..b501202948 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper -, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient +, expat, fftwFloat, fontconfig, freetype, libjack2, jack2, libclthreads, libclxclient , libsndfile, libxcb, xorg }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = '' # Make sure Jack is avalable in $PATH for tetraproc - wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2Full}/bin" + wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix index 7f7be99f9a..f04a5a2d8b 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "16284gv31wdwmb99056962d1gh6xz26ami6synr47nsbbp5l0s6k"; + sha256 = "sha256-jy22eyuzM2y7vByT3TOlAUuTKtPepkB9iiHQT1YGQ88="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "12ymjwpxx3sdna8w5j9fnwwfk8ynk9ziwl0lkpq68y0vyllln5an"; + sha256 = "1ndcpgw18w3l5f7vv5vw8lxhgd5y1zxfarwnyfx13m7kcv8m3vyj"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 61ce54beec..6952d9c007 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.7.0"; + version = "1.0.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1pbq0kik29sx1lwlic7fvhnjhrpnlk94w53wmywqnlpgjscx8x8a"; + sha256 = "1hxpbzc4l1zxrcvmdm93vvphhksfwd0mw2dv6h8vi4451p77dhd9"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix index 745ac34997..44ed4d1541 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.3"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "b4563921ed8bccd59d32b031f81825dc57fbe90882f0ecd5da89e48b59ff18b2"; + sha256 = "5154e67780dddbf12f64c4b1994c3ee3834236f05b6462adf25e8a5f3fa407ea"; }; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet.nix b/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet.nix new file mode 100644 index 0000000000..be45967018 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet.nix @@ -0,0 +1,33 @@ +{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: + +let + pname = "chain-desktop-wallet"; + version = "0.1.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${name}-x86_64.AppImage"; + sha256 = "12076hf8dlz0hg1pb2ixwlslrh8gi6s1iawnvhnn6vz4jmjvq356"; + }; + + appimageContents = appimageTools.extractType2 { inherit name src; }; +in appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + ${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png + install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' "Exec=$out/bin/${pname}" + ''; + + meta = with lib; { + description = "Crypto.org Chain desktop wallet (Beta)"; + homepage = "https://github.com/crypto-com/chain-desktop-wallet"; + license = licenses.asl20; + maintainers = with maintainers; [ th0rgal ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 90f7a03d0d..b012699a16 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -9,7 +9,7 @@ , useGTK2 ? false , gtk2 , gtk3 # gtk3 seems better supported -, exo +, xfce4-dev-tools , at-spi2-core , librsvg , hicolor-icon-theme @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; }; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; - buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] + nativeBuildInputs = [ pkg-config intltool xfce4-dev-tools wrapGAppsHook ]; + buildInputs = [ lightdm librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically ] ++ lib.optional useGTK2 "--with-gtk2"; + postPatch = '' + # exo-csource has been dropped from exo, and replaced by xdt-csource from xfce4-dev-tools + for f in configure.ac src/Makefile.am; do + substituteInPlace $f --replace exo-csource xdt-csource + done + ''; + preConfigure = '' configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) ''; @@ -66,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://launchpad.net/lightdm-gtk-greeter"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 0901c815f1..e7628715a2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, callPackage, fetchurl -, python , jdk, cmake, libxml2, zlib, python3, ncurses5 , dotnet-sdk_3 , vmopts ? null @@ -199,7 +198,7 @@ let platforms = platforms.linux; }; }).override { - propagatedUserEnvPkgs = [ python ]; + propagatedUserEnvPkgs = [ python3 ]; }; buildRider = { name, version, src, license, description, wmClass, ... }: diff --git a/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix index 95b41ba5ca..7304219e23 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ xnwdd ]; + # error: token ""1.1"" is not valid in preprocessor expression + # TODO: fix pname being different from the attribute name + broken = true; }; src = fetchgit { diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index 22e6185b22..47b9677e31 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -68,6 +68,7 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres metadark ]; platforms = platforms.unix; + changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix index b34441d100..d3d6e97f3f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "1hk8kmhvkwfimbxzhwbnb8qdpf4n36cdzl9wfvi574i9pps36hnz"; + sha256 = "sha256-BqNaIsUJE0KmFcmTjJERbclzaRe1dMjareWxUye2se0="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 4ae7600f4a..71e7be66b1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.1522"; + version = "8.2.2567"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0dah3392cq06pagik5y7kcq61mslqvfsh7vqldv3kvhr5ilqb8qy"; + sha256 = "sha256-FS3TZX7FKnnNpGYKbng2LIfWA9z2jqg7d2HC6t3xYTU="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 988bcf412e..09a58e7dfd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk"; - x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k"; - aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c"; - armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv"; + x86_64-linux = "0z1diiiykv4ilsiljffz9sl2mlvrxq0xwm8ga2ralfvjwbhzr6dn"; + x86_64-darwin = "02gzw46w3kzw1ya9nx8fkhvzi0mbpz2fyp47n58jki2zkdsfiwzh"; + aarch64-linux = "0bkvgdxch95dqcb41ncsjkaaswmwv6zad4hzdsr3famjm2vym1ky"; + armv7l-linux = "0wdp97ihdnx9bcyn2dh6wzhb7qvdj6x730r7ng1q3i9jhd19wfi3"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.54.3"; + version = "1.55.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 06613485e7..b11a8a8f10 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1577wxmm8623aj513hxqcfim4d9p1r9wbla9my0c0c1x6pik0h8h"; - x86_64-darwin = "1n8q626nlqw78wlpfppzj365gmlz2swll6csg3ic7p4ik3nak95b"; - aarch64-linux = "1a7rkmhz456rsqw95lrknp1wqsdp63pkzh76vhzy5bazb1h081v0"; - armv7l-linux = "1qjik1r41c8n9fs7p09p0zdj8c5xgqjniwv23hcy6mp28i4whclr"; + x86_64-linux = "0zzdbknmljf1hizmxnrby17i8v3kp98rklinywnr632jwgjms81j"; + x86_64-darwin = "0mccq1b0l6r1ipxp5gvyam43c2hh8hxdvwqikkz6g7y93p29wz9g"; + aarch64-linux = "12gpday6gzl1adcykqhgz3xrdm9568a26gsndmplkn2n6l6agnp0"; + armv7l-linux = "0l886vdw7az0nvvhh14pjawz0yyib59ymychy7gbk8ay5g9vfv03"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.54.3"; + version = "1.55.0"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix index c67abe1a74..47defd44c6 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -12,7 +12,7 @@ , dxflib , curl , libiodbc -, lzma +, xz , libharu , opencv , vigra @@ -64,7 +64,7 @@ mkDerivation rec { vigra postgresql libiodbc - lzma + xz qhull giflib ] diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 58c47721b6..49021f5e3c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-61"; - sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8="; + version = "7.0.11-3"; + sha256 = "sha256-y937OxAHNTbWa96oQmTpp/ivxtPVL16hr4SvzZWugQo="; patches = []; }; in @@ -84,6 +84,7 @@ stdenv.mkDerivation { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ erictapen ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 82007caea9..4155767a36 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -4,18 +4,18 @@ , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat , gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst -, libxcb, libuuid, nspr, nss, pango +, libxcb, libuuid, libxshmfence, nspr, nss, pango , systemd }: stdenv.mkDerivation rec { pname = "drawio"; - version = "14.4.3"; + version = "14.5.1"; src = fetchurl { - url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - hash = "sha256-0wBjZg6IvjVTzAGeXTBBZjIN6s9NxKV0r76YK9h4fFk="; + url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; + hash = "sha256-ZrEoeeEhHQOLm/L3KA43Ru5fruIPK35CCUsllwpPB58="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { libXi libXrandr libXrender + libxshmfence libXtst libxcb libuuid @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share - cp -r opt/draw.io $out/share/ + cp -r opt/drawio $out/share/ # Application icon mkdir -p $out/share/icons/hicolor @@ -77,11 +78,11 @@ stdenv.mkDerivation rec { # Symlink wrapper mkdir -p $out/bin - ln -s $out/share/draw.io/drawio $out/bin/drawio + ln -s $out/share/drawio/drawio $out/bin/drawio # Update binary path substituteInPlace $out/share/applications/drawio.desktop \ - --replace /opt/draw.io/drawio $out/bin/drawio + --replace /opt/drawio/drawio $out/bin/drawio ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 56994e1721..440cc7fa38 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch @@ -35,7 +36,7 @@ , scipy , shiboken2 , soqt -, spaceNavSupport ? true +, spaceNavSupport ? stdenv.isLinux , swig , vtk , wrapQtAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 365dbb66b6..df1fcc9eb6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, lzma +, xz , qt5 , wrapQtAppsHook , miniupnpc_2 @@ -39,7 +39,7 @@ pythonPackages.buildPythonPackage rec { service-identity twisted lz4 - lzma + xz pysocks matplotlib qtpy diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix index 3accf2fd59..ac41a23f8b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -25,6 +25,7 @@ , mkDerivation , qtmacextras , qmake +, spacenavSupport ? stdenv.isLinux, libspnav }: mkDerivation rec { @@ -46,9 +47,15 @@ mkDerivation rec { qtbase qtmultimedia qscintilla ] ++ lib.optionals stdenv.isLinux [ libGLU libGL ] ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optional spacenavSupport libspnav ; - qmakeFlags = [ "VERSION=${version}" ]; + qmakeFlags = [ "VERSION=${version}" ] ++ + lib.optionals spacenavSupport [ + "ENABLE_SPNAV=1" + "SPNAV_INCLUDEPATH=${libspnav}/include" + "SPNAV_LIBPATH=${libspnav}/lib" + ]; # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix index da5aa7bf6e..14a130d7f4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix @@ -1,5 +1,5 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase +, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, pkg-config, qtbase , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { libtiff libusb1 lz4 - lzma + xz lzo openblas qtbase diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/config.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/config.nix index 304df652f1..397e17837b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/config.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/config.nix @@ -1,9 +1,10 @@ { lib, stdenv }: -{ paths }: +{ paths, disabledDefaultBackends ? [] }: with lib; -let installSanePath = path: '' +let +installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do symlink "$backend" "$out/lib/sane/$(basename "$backend")" @@ -27,6 +28,10 @@ let installSanePath = path: '' done fi ''; + disableBackend = backend: '' + grep -q '${backend}' $out/etc/sane.d/dll.conf || { echo '${backend} is not a default plugin in $SANE_CONFIG_DIR/dll.conf'; exit 1; } + substituteInPlace $out/etc/sane.d/dll.conf --replace '${backend}' '# ${backend} disabled in nixos config' + ''; in stdenv.mkDerivation { name = "sane-config"; @@ -42,5 +47,7 @@ stdenv.mkDerivation { } mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane - '' + concatMapStrings installSanePath paths; + '' + + (concatMapStrings installSanePath paths) + + (concatMapStrings disableBackend disabledDefaultBackends); } diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix index e0b0e2324b..fd662d7e99 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix @@ -2,8 +2,8 @@ mkDerivation, lib, kdepimTeam, 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, lzma, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, + signond, xz, }: mkDerivation { @@ -21,15 +21,15 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin - ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond + ki18n kiconthemes kio kwindowsystem xz accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; CXXFLAGS = [ - ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"'' - ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"'' - ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"'' - ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"'' + ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"'' + ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"'' + ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"'' + ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix b/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix index 308ed35dc4..72c22c21ec 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - karchive, ki18n, kio, perl, python, php, qttools + karchive, ki18n, kio, perl, python3, php, qttools , kdbusaddons }: @@ -12,5 +12,5 @@ mkDerivation { maintainers = with lib.maintainers; [ orivej ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ karchive ki18n kio perl python php qttools kdbusaddons ]; + buildInputs = [ karchive ki18n kio perl python3 php qttools kdbusaddons ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix index 0287830485..7f24ec8e2f 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, gettext, kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, - qtbase, python + qtbase, python3 }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python + gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3 ]; propagatedUserEnvPkgs = [ ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/minuet.nix b/third_party/nixpkgs/pkgs/applications/kde/minuet.nix index ca7d6124ed..cc7be0bf79 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/minuet.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/minuet.nix @@ -1,5 +1,5 @@ { mkDerivation, qtbase -, lib, extra-cmake-modules, gettext, python +, lib, extra-cmake-modules, gettext, python3 , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools , qtquickcontrols2, qtsvg, qttools, qtdeclarative @@ -13,7 +13,7 @@ mkDerivation { broken = lib.versionOlder qtbase.version "5.14"; }; - nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ]; propagatedBuildInputs = [ drumstick fluidsynth diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix index 9472af7a16..56894a29a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix @@ -12,7 +12,7 @@ , at-spi2-atk , gnutar , atomEnv -, kerberos +, libkrb5 }: # from justinwoo/azuredatastudio-nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { at-spi2-core at-spi2-atk stdenv.cc.cc.lib - kerberos + libkrb5 ] ) targetPath diff --git a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix index 52d56d5c8f..cec4e8dd8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, python3, bind, iproute, bc, gitMinimal }: +, curl, python3, bind, iproute2, bc, gitMinimal }: let version = "1.23.0"; deps = lib.makeBinPath [ curl python3 bind.dnsutils - iproute + iproute2 bc gitMinimal ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch b/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch index bfbfb5e48e..da2d6fa4a3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch @@ -1,15 +1,16 @@ -diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake +diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake +index 31da529..90308aa 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake -@@ -80,7 +80,6 @@ else() +@@ -77,7 +77,6 @@ else() message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") endif() if(NOT EXISTS "${LIBDIR}/") - message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'") endif() - # ------------------------------------------------------------------------- -@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE) + # Prefer lib directory paths +@@ -113,10 +112,6 @@ if(WITH_CODEC_SNDFILE) find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) list(APPEND LIBSNDFILE_LIBRARIES @@ -20,7 +21,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf ) print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") -@@ -132,7 +127,7 @@ if(WITH_PYTHON) +@@ -133,7 +128,7 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m") @@ -29,7 +30,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -173,9 +168,7 @@ endif() +@@ -174,9 +169,7 @@ endif() if(WITH_CODEC_FFMPEG) set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil @@ -40,20 +41,20 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf find_package(FFmpeg) endif() -@@ -266,7 +259,6 @@ if(WITH_BOOST) +@@ -267,7 +260,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) -- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it ! +- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it ! endif() - if(WITH_OPENIMAGEIO) -@@ -439,7 +431,7 @@ else() + if(WITH_PUGIXML) +@@ -451,7 +443,7 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic") endif() -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) +if(FALSE) # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") + string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024") endif() diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 69f0d58159..451cc9a33f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -7,9 +7,11 @@ , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada -, spaceNavSupport ? false, libspnav +, spaceNavSupport ? stdenv.isLinux, libspnav , makeWrapper , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, potrace +, openxr-loader , embree, gmp }: @@ -24,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "2.91.0"; + version = "2.92.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"; + sha256 = "15a5vffn18a920286x0avbc2rap56k6y531wgibq68r90g2cz4g7"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -44,11 +46,13 @@ stdenv.mkDerivation rec { embree gmp pugixml + potrace ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender libGLU libGL openal libXxf86vm + openxr-loader # OpenVDB currently doesn't build on darwin openvdb ] @@ -104,6 +108,7 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include" "-DWITH_OPENVDB=ON" "-DWITH_TBB=ON" "-DWITH_IMAGE_OPENJPEG=ON" diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix index 632a0d5d0e..192cddc2e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.2"; + version = "5.3"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-bb+PQsWLf4KnbzWUY6B42yHaDQKN9dtyfwSLe8FBaWU="; + sha256 = "sha256-CuTYCNZ9oiDsm5mUDmjbxkmAl61PEXv3WMrZRzgdZeE="; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix index d0ef6f05ae..2de06f8c03 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.0.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3"; + sha256 = "sha256-LWIcE86o+uU8G9DtumiH6iTqHhvq4y/QyQX7J3FhKEc="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix index 699df0e193..bd22cc4745 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix @@ -6,13 +6,13 @@ let octoprint = stdenv.mkDerivation rec { pname = "Cura-OctoPrintPlugin"; - version = "3.5.16"; + version = "3.5.18"; src = fetchFromGitHub { owner = "fieldOfView"; repo = pname; - rev = "8affa8aa9796cb37129d3b7222fff03f86c936cd"; - sha256 = "0l4qfcashkdmpdm8nm3klz6hmi1f0bmbpb9b1yn4mvg0fam6c5xi"; + rev = "7bd73946fbf22d18337dc900a81a011ece26bee0"; + sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 6cbc7ffd47..a78ac11d67 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.13.5"; + version = "1.13.6"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fy202w1lUrymnpnCmWwnbpMsda7JrZ3B0c+a9UtKsSA="; + sha256 = "sha256-PTi1blbMVsuftLrFIYNDI8ZFEwRxDA53Md9oZTv7nHs="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index edce14d057..44f35e503c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchFromGitHub , wrapQtAppsHook @@ -19,7 +20,7 @@ }: let - version = "4.0.9"; + version = "4.1.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -35,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0cmdyfabllw4wnpqpdxp3l6hjnm0cvkwxn0z8ph4x54sf4zq9iz3"; + sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5"; extraPostFetch = '' mv $out ./all @@ -50,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"; + sha256 = "0yg6ld92a4xgn7y8i51hmr3kmgmrbrjwniikkmyq9q141h2drb80"; }; postUnpack = '' @@ -77,10 +78,10 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins + btchip ckcc-protocol keepkey trezor - btchip ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; preBuild = '' @@ -112,7 +113,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pycryptodomex ]; + checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum/tests" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix index 0e072aa649..b116fbbbd7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "flavours"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Misterio77"; repo = pname; rev = "v${version}"; - sha256 = "0nys1sh4qwda1ql6aq07bhyvhjp5zf0qm98kr4kf2fmr87ddc12q"; + sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc="; }; - cargoSha256 = "0bmmxiv8bd09kgxmhmynslfscsx2aml1m1glvid3inaipylcq45h"; + cargoSha256 = "sha256-cAXiAPhHdxdd8pFQ0Gq7eHO2p/Dam53gDbE583UYY/k="; meta = with lib; { description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index fa58c2d396..c3b9a3226a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1 -, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper +, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper }: let @@ -29,7 +29,7 @@ in mkDerivation rec { qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib qtconnectivity qtcharts libusb-compat-0_1 ]; - nativeBuildInputs = [ flex makeWrapper qmake yacc ]; + nativeBuildInputs = [ flex makeWrapper qmake bison ]; patches = [ # allow building with bison 3.7 diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 161aeb7720..15ef5d3b4c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3) + activesupport (6.1.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -15,14 +15,14 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.14.2) + ffi (1.15.0) 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.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) jekyll (4.2.0) addressable (~> 2.4) @@ -56,18 +56,18 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.4.1) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) mini_portile2 (2.5.0) minitest (5.14.4) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) pathutil (0.16.2) diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix index bda211e6f7..fadbf8e32b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h"; + sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc"; type = "gem"; }; - version = "6.1.3"; + version = "6.1.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.14.2"; + version = "1.15.0"; }; forwardable-extended = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -218,10 +218,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; + sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mercenary = { groups = ["default"]; @@ -291,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; pathutil = { dependencies = ["forwardable-extended"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock index e93f78e83c..b3d3b9ca49 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3) + activesupport (6.1.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -29,14 +29,14 @@ GEM ruby2_keywords faraday-net_http (1.0.1) fast-stemmer (1.0.2) - ffi (1.14.2) + ffi (1.15.0) 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.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) jekyll (4.2.0) addressable (~> 2.4) @@ -82,7 +82,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -92,7 +92,7 @@ GEM liquid (4.0.3) liquid-c (4.0.0) liquid (>= 3.0.0) - listen (3.4.1) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) @@ -102,7 +102,7 @@ GEM mini_portile2 (2.5.0) minitest (5.14.4) multipart-post (2.1.1) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) octokit (4.20.0) diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix index ee348a80c4..7a6814aaa3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h"; + sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc"; type = "gem"; }; - version = "6.1.3"; + version = "6.1.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.14.2"; + version = "1.15.0"; }; forwardable-extended = { groups = ["default"]; @@ -226,10 +226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -390,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -468,10 +468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj"; + sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mercenary = { groups = ["default"]; @@ -540,10 +540,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index b8e72daa6f..badda6b17e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17580"; + version = "17702"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "05y1g48llnpbyv0r8dn3kyhcfqylsg4fbp540xn1n7sk3h17gwsw"; + sha256 = "1p7p0jd87sxrs5n0r82apkilx0phgmjw7vpdg8qrr5msda4rsmpk"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0aqkr6951zbi7a6zawvpsh51i0c4nyz2xkj52gg8n4vxli5pp3y1"; + sha256 = "0r17cphxm852ykb8mkil29rr7sb0bj5w69qd5wz8zf2f9djk9npk"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "04mxrirlyjy8i5s6y8w84kxv3wjlhhdfmlaxxlxd25viim73g3zv"; + sha256 = "1b7dryvakph8znh2ahgywch66l4bl5rmgsr79axnz1xi12g8ac12"; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 7a5615bf40..37142cd20e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -18,14 +18,14 @@ buildPythonApplication rec { pname = "jrnl"; - version = "2.7.1"; + version = "2.8"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "v${version}"; - sha256 = "1m1shgnvwzzs0g6ph7rprwxd7w8zj0x4sbgiqsv9z41k6li7xj4r"; + sha256 = "1zpsvrjhami9y7204yjbdzi04bkkz6i3apda9fh3hbq83y6wzprz"; }; nativeBuildInputs = [ poetry ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix index 3bec8db068..64e41eaa3d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ lib, glibcLocales, python3 }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { version = "0.17.0"; @@ -9,6 +9,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ + python3.pkgs.setuptools-scm + ]; + propagatedBuildInputs = with python3.pkgs; [ atomicwrites configobj diff --git a/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix index dff50bafaf..f3406d4159 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix @@ -1,109 +1,48 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config -, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib -, gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake -, xapian, ctpp2, zimlib +{ lib, mkDerivation, fetchFromGitHub +, callPackage +, pkg-config +, makeWrapper +, qmake +, qtbase +, qtwebengine +, qtsvg +, qtimageformats +, aria2 }: -with lib; - -let - xulrunner64_tar = fetchurl { - url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2"; - sha256 = "0i3m30gm5z7qmas14id6ypvbmnb2k7jhz8aby2wz5vvv49zqmx3s"; - }; - xulrunnersdk64_tar = fetchurl { - url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2"; - sha256 = "0z90v7c4mq15g5klmsj8vs2r10fbygj3qzynx4952hkv8ihw8n3a"; - }; - xulrunner32_tar = fetchurl { - url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2"; - sha256 = "0yln6pxz8f6b9wm9124sx049z8mgi17lgd63rcv2hnix825y8gjb"; - }; - xulrunnersdk32_tar = fetchurl { - url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2"; - sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi"; - }; - - xulrunner = if stdenv.hostPlatform.system == "x86_64-linux" - then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; } - else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; }; - - pugixml = stdenv.mkDerivation rec { - version = "1.2"; - pname = "pugixml"; - - src = fetchurl { - url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz"; - sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; - }; - - nativeBuildInputs = [ cmake ]; - - unpackPhase = '' - # not a nice src archive: all the files are in the root :( - mkdir ${pname}-${version} - cd ${pname}-${version} - tar -xf ${src} - - # and the build scripts are in there :'( - cd scripts - ''; - }; - -in - -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kiwix"; - version = "0.9"; + version = "2.0.5"; - src = fetchurl { - url = "http://download.kiwix.org/src/kiwix-${version}-src.tar.xz"; - sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; + src = fetchFromGitHub { + owner = pname; + repo = "${pname}-desktop"; + rev = version; + sha256 = "12v43bcg4g8fcp02y2srsfdvcb7dpl4pxb9z7a235006s0kfv8yn"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; + buildInputs = [ - zip python zlib xapian which icu libmicrohttpd - lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml + qtbase + qtwebengine + qtsvg + qtimageformats + (callPackage ./lib.nix {}) ]; - postUnpack = '' - cd kiwix* - mkdir static - cp Makefile.in static/ - - cd src/dependencies - - tar -xf ${xulrunner.tar} - tar -xf ${xulrunner.sdk} - - cd ../../.. - ''; - - configureFlags = [ - "--disable-staticbins" + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ aria2 ]}" ]; - postInstall = '' - cp -r src/dependencies/xulrunner $out/lib/kiwix - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner - - rm $out/bin/kiwix - makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk-pixbuf pango cairo freetype fontconfig alsaLib atk]} \ - --suffix PATH : ${aria2}/bin - ''; - - meta = { + meta = with lib; { description = "An offline reader for Web content"; homepage = "https://kiwix.org"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ robbinch ]; - knownVulnerabilities = [ - "CVE-2015-1032" - ]; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix b/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix new file mode 100644 index 0000000000..dcde5c390a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, fetchFromGitHub +, meson, ninja, pkg-config +, python3 +, curl +, icu +, pugixml +, zimlib +, zlib +, libmicrohttpd +, mustache-hpp +, gtest +}: + + +stdenv.mkDerivation rec { + pname = "kiwix-lib"; + version = "9.4.1"; + + src = fetchFromGitHub { + owner = "kiwix"; + repo = pname; + rev = version; + sha256 = "034nk6l623v78clrs2d0k1vg69sbzrd8c0q79qiqmlkinck1nkxw"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + ]; + + buildInputs = [ + icu + zlib + mustache-hpp + ]; + + propagatedBuildInputs = [ + curl + libmicrohttpd + pugixml + zimlib + ]; + + checkInputs = [ + gtest + ]; + + doCheck = true; + + postPatch = '' + patchShebangs scripts + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 4c5a443ba0..d1326848d2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch -, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns +, python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns , which, perl, makeWrapper }: @@ -21,11 +21,11 @@ mkDerivation rec { nativeBuildInputs = [ which + python3 + ruby ]; buildInputs = [ - python - ruby qtbase qtmultimedia qttools diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix index d415657706..eadd5cae50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/third_party/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.02"; + version = "2021.03"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "0v7jx4a2kz1i1k9jqwcxbgdikflk28cnnp69sbhha8pkkbk8c5wh"; + sha256 = "sha256-XdCyx+SdcV1QitDVkOl9EZCHpU8Qiwu0qhcXkU6b+9o="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 3e8aacb989..89d7c2df74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "20.09"; + version = "21.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; + sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index 7c81e9607f..70f463c023 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "20.09"; + version = "21.03"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; + sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix index 75013f0931..50e95e3117 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "1.3.0"; + version = "1.4.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-uzWr6wWO6niocJ8yLc1Uu9Wt/FXlCuQrC0RJkgVlphM="; + sha256 = "sha256-JiTRTH8ai27H1xySyKTWiu/MG0C61Tz+hVI6tkSRp+k="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 53aa786e06..f35a3f1b71 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.11.5"; + version = "0.11.9"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "FxhvRRxV8oxRwvImftoSTqrus2x5p90NfuvddZjdBNU="; + sha256 = "XymM3qma8H2dm2tq8Zg+oKxOzb48azqlqn701pN5gdI="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix new file mode 100644 index 0000000000..6d840b1d9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule, fetchFromSourcehut, lib }: + +buildGoModule rec { + pname = "openring"; + version = "unstable-2021-04-03"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = pname; + rev = "f13edb5dfd882ce608d61cf6b6740650ce9d84a3"; + sha256 = "sha256-Z65V77JZ9jCzBg7T2+d5Agxxd+MV2R7nYcLedYP5eOE="; + }; + + vendorSha256 = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4="; + + # The package has no tests. + doCheck = false; + + meta = with lib; { + description = "A webring for static site generators"; + homepage = "https://git.sr.ht/~sircmpwn/openring"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix index 2bf102fee2..45e043b6dc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix @@ -4,6 +4,8 @@ ocamlPackages.buildDunePackage rec { pname = "orpie"; version = "1.6.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "pelzlpj"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix index 14141ca1ea..3f964824e6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "2.6.0"; + version = "2.6.5"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - sha256 = "1nviq2pavyxwh9k4kyzqpbzmx1wybwdax4pyd017izh9h6gqnjhs"; + sha256 = "17gfb7rdaadmcdba4mhish0jrz9lmiban6fpzwhyvn8z1rc43zx9"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index 721c95c028..261a597f8d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -14,6 +14,14 @@ mkDerivation rec { sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; + patches = [ + (fetchpatch { + name = "qt5.15-deprecation-fixes.patch"; + url = "https://github.com/mcallegari/qlcplus/commit/e4ce4b0226715876e8e9e3b23785d43689b2bb64.patch"; + sha256 = "1zhrg6ava1nyc97xcx75r02zzkxmar0973w4jwkm5ch3iqa8bqnh"; + }) + ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad diff --git a/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix index 10ea22a1ec..4bd8a182d6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ranger/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File manager with minimalistic curses interface"; - homepage = "http://ranger.github.io/"; + homepage = "https://ranger.github.io/"; license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ toonn magnetophon ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix index 523dc6aab8..9a05ac22af 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sc-im/default.nix @@ -1,11 +1,10 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , makeWrapper , pkg-config , which -, yacc +, bison , gnuplot , libxls , libxml2 @@ -15,36 +14,22 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-/eG2BdkyfEGoSzPu6jT+Bn1RZTGT1D3etGj1tYchm1M="; + sha256 = "sha256-AIYa3d1ml1f5GNLKijeFPX+UabgEqzdXiP60BGvBPsQ="; }; sourceRoot = "${src.name}/src"; - # make default colors readable on dark background - patches = [ - (fetchpatch { - url = "https://github.com/andmarti1424/sc-im/commit/78d2fdaaf2c578691e68fb5bd773803cb967ddba.patch"; - sha256 = "09716zsqa9qdsj2qpkji8wlzsmp9gl66ggvrg7lmrwwnvli2zn2w"; - }) - (fetchpatch { - url = "https://github.com/andmarti1424/sc-im/commit/f29d6605c8170febcec0dea7bda9613bee3b7011.patch"; - sha256 = "1zs1sb23g0k6lig4d0qdzq1wdhcdzl424ch567zyjl191lyhsjyg"; - }) - ]; - - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ makeWrapper pkg-config which - yacc + bison ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix new file mode 100644 index 0000000000..caeaa42192 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, gtk2 }: + +stdenv.mkDerivation rec { + pname = "spnavcfg"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "FreeSpacenav"; + repo = pname; + rev = "v${version}"; + sha256 = "180mkdis15gxs79rr3f7hpwa1p6v81bybw37pzzdjnmqwqrc08a0"; + }; + + postPatch = '' + sed -i s/4775/775/ Makefile.in + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk2 ]; + + meta = with lib; { + homepage = "http://spacenav.sourceforge.net/"; + description = "Interactive configuration GUI for space navigator input devices"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix index 7037b40816..65cd003253 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -1,29 +1,30 @@ { lib , fetchurl , mkDerivation -, libkcddb -, kinit -, kdelibs4support -, solid -, kxmlgui -, karchive -, kfilemetadata -, khtml -, knewstuff -, libksane , cmake , exempi , extra-cmake-modules -, libcdio -, poppler -, makeWrapper +, karchive , kdoctools +, kfilemetadata +, khtml +, kitemmodels +, knewstuff +, kxmlgui +, libcdio +, libkcddb +, libksane +, makeWrapper +, poppler +, qtcharts +, qtwebengine +, solid , taglib }: mkDerivation rec { - name = "tellico"; - version = "3.3.3"; + pname = "tellico"; + version = "3.4"; src = fetchurl { # version 3.3.0 just uses 3.3 in its name @@ -31,7 +32,7 @@ mkDerivation rec { "https://tellico-project.org/files/tellico-${version}.tar.xz" "https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz" ]; - sha256 = "sha256-9cdbUTa2Mt3/yNylOSdGjgDETD74sR0dU4C58uW0Y6o="; + sha256 = "sha256-YXMJrAkfehe3ox4WZ19igyFbXwtjO5wxN3bmgP01jPs="; }; nativeBuildInputs = [ @@ -43,17 +44,18 @@ mkDerivation rec { buildInputs = [ exempi - extra-cmake-modules karchive - libkcddb - kdelibs4support kfilemetadata khtml + kitemmodels knewstuff kxmlgui libcdio + libkcddb libksane poppler + qtcharts + qtwebengine solid taglib ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix new file mode 100644 index 0000000000..fc47a87284 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, lib, fzf, xclip }: + +stdenv.mkDerivation rec { + pname = "unipicker"; + version = "unstable-2018-07-10"; + + src = fetchFromGitHub { + owner = "jeremija"; + repo = pname; + rev = "767571c87cdb1e654408d19fc4db98e5e6725c04"; + sha256 = "1k4v53pm3xivwg9vq2kndpcmah0yn4679r5jzxvg38bbkfdk86c1"; + }; + + buildInputs = [ + fzf + xclip + ]; + + preInstall = '' + substituteInPlace unipicker --replace "/etc/unipickerrc" "$out/etc/unipickerrc" + substituteInPlace unipickerrc --replace "/usr/local" "$out" + ''; + + makeFlags = [ + "PREFIX=$(out)" + "DESTDIR=$(out)" + ]; + + meta = with lib; { + description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard"; + homepage = "https://github.com/jeremija/unipicker"; + license = licenses.mit; + maintainers = with maintainers; [ kiyengar ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix index 18d190a9dd..7bc4bd1ff7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -40,5 +40,6 @@ in stdenv.mkDerivation rec { homepage = "https://vifm.info/"; inherit version; updateWalker = true; + changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index b7f9d6ca1a..fc609b280f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.raskin ]; - platforms = with lib.platforms; linux ++ darwin; homepage = "http://visidata.org/"; + changelog = "https://github.com/saulpw/visidata/blob/v${version}/CHANGELOG.md"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix new file mode 100644 index 0000000000..5f38d405cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, go-bindata }: + +buildGoModule rec { + pname = "writefreely"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "writeas"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-6LpRfDu3xvE1eIRLfZliKnzsrrG5pjjf2ydxn9HQJJU="; + }; + + vendorSha256 = "sha256-U17AkMJQr/OIMED0i2ThcNVw3+aOvRLbpLNP/wEv6k8="; + + nativeBuildInputs = [ go-bindata ]; + + preBuild = '' + make assets + export buildFlagsArray=( + "-ldflags=-s -w -X github.com/writeas/writefreely.softwareVer=${version}" + "-tags='sqlite'" + ) + ''; + + subPackages = [ "cmd/writefreely" ]; + + meta = with lib; { + description = "Build a digital writing community"; + homepage = "https://github.com/writeas/writefreely"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index 8b5f410308..3b5e00a7ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -17,7 +17,7 @@ , glib , gtk3 , icu -, iproute +, iproute2 , krb5 , lib , mesa @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary done - wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute networkmanager dnsmasq ]} + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix index 59612550ea..04871239ed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/makeworld-the-better-one/amfora"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ deifactor ]; + changelog = "https://github.com/makeworld-the-better-one/amfora/blob/v${version}/CHANGELOG.md"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix new file mode 100644 index 0000000000..831fabf2de --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix @@ -0,0 +1,71 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, corrosion +, extra-cmake-modules +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kirigami2 +, knotifications +, kpurpose +, kwindowsystem +, qtquickcontrols2 +, qtwebengine +, rustPlatform +}: + +mkDerivation rec { + pname = "angelfish"; + version = "1.8.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "plasma-mobile"; + repo = "angelfish"; + rev = "v${version}"; + sha256 = "0pj2kw7lmxh7diwdcmk24qxqslavhvf23r2i6h549gbllbzk219f"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "0cyrmhlg0kjr14842ckbjdljc2zc28al0y9i8w5l0qzr18krgc0m"; + }; + + nativeBuildInputs = [ + cmake + corrosion + extra-cmake-modules + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + cmakeFlags = [ + "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo" + ]; + + buildInputs = [ + kconfig + kcoreaddons + kdbusaddons + ki18n + kirigami2 + knotifications + kpurpose + kwindowsystem + qtquickcontrols2 + qtwebengine + ]; + + meta = with lib; { + description = "Web browser for Plasma Mobile"; + homepage = "https://apps.kde.org/en/mobile.angelfish"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 989368f198..1fecadc2ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec { then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12 + broken = elem channel [ "beta" "dev" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 3197e272f0..8d0a59f291 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -8,7 +8,7 @@ , libusb1, pciutils, nss, re2 , python2Packages, perl, pkg-config -, nspr, systemd, kerberos +, nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf , glib, gtk3, dbus-glib @@ -135,7 +135,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd util-linux alsaLib - bison gperf kerberos + bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index c1b5711b02..1ad7bc8bfa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire @@ -39,6 +39,8 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") { + llvmPackages = llvmPackages_12; }); browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 723ea6235c..7660f2f9e6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "89.0.4389.90", - "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi", - "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk", + "version": "89.0.4389.114", + "sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j", + "sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a", "deps": { "gn": { "version": "2021-01-07", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "90.0.4430.40", - "sha256": "0n7g4j981h3fn5wgpb3azpili9682nq0yikhd4z7dr7agvpnfr3k", - "sha256bin64": "120rbh8bpcj3z5kqdaicqnsd2mh0xcr8y1411kl0zpwa6hfvgm3r", + "version": "90.0.4430.51", + "sha256": "1k87fw0pv0d2zlxm0il9b5p60gdz6l44jssmsns4zy2fmd9316wr", + "sha256bin64": "0q5yx7bc266azs3nl29ksz4yafvy2nmzn09ifcgr69fjkvsr1qh7", "deps": { "gn": { "version": "2021-02-09", @@ -31,22 +31,22 @@ } }, "dev": { - "version": "91.0.4455.2", - "sha256": "0nqw1jxysyl72dg2bqls7w9cm366j6i1p4sadf3s5vc0i7yr7h3i", - "sha256bin64": "0d7s7bg58489ph4i92yj4vkww0cl7473pk9sir64gcmm9z18yjc3", + "version": "91.0.4464.5", + "sha256": "1djwlb74cgfc5ns7w2m10qcd2d2fz0i90k5szcfsm899c7x3zgyf", + "sha256bin64": "0kqr5mlbq23ahmyg67lh15j5sqa29wi301s8rvfgh0gxf10vgc2l", "deps": { "gn": { - "version": "2021-03-12", + "version": "2021-03-30", "url": "https://gn.googlesource.com/gn", - "rev": "64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8", - "sha256": "14whk4gyx21cqxy1560xm8p1mc1581dh9g7xy120g8vvcylknjlm" + "rev": "5667cc61018864b17542e0baff8b790f245583b0", + "sha256": "0mr7jqk1r46ngrx4hrg8gxnzqxfxc1c9a966gpsjlgc00k390m5s" } } }, "ungoogled-chromium": { - "version": "89.0.4389.90", - "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi", - "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk", + "version": "89.0.4389.114", + "sha256": "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j", + "sha256bin64": "06wblyvyr93032fbzwm6qpzz4jjm6adziq4i4n6kmfdix2ajif8a", "deps": { "gn": { "version": "2021-01-07", @@ -55,8 +55,8 @@ "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" }, "ungoogled-patches": { - "rev": "89.0.4389.90-1", - "sha256": "0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79" + "rev": "89.0.4389.114-1", + "sha256": "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index e5282d79a2..9a7551a6ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib -, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev +, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses xlibsWrapper bzip2 zlib brotli zstd lzma + ncurses xlibsWrapper bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] ++ lib.optional stdenv.isLinux gpm diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 72e9746421..93b89e9031 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -13,7 +13,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libxcb @@ -106,7 +106,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 mesa libX11 libXScrnSaver diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index ad9a4618dc..3a8fec2c6e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -24,7 +24,7 @@ , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages -, gssSupport ? true, kerberos +, gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire ## privacy-related options @@ -174,7 +174,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional waylandSupport libxkbcommon ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed88bf587d..26fb49ef2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , tridactyl-native , fx_cast_bridge , udev -, kerberos +, libkrb5 , libva , mesa # firefox wants gbm for drm+dmabuf }: @@ -65,7 +65,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/gmni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/gmni/default.nix new file mode 100644 index 0000000000..7baca62e67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/gmni/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromSourcehut, pkg-config, bearssl, scdoc }: + +stdenv.mkDerivation rec { + pname = "gmni"; + version = "unstable-2021-03-26"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "gmni"; + rev = "77b73efbcd3ea7ed9e3e4c0aa19d9247e21d3c87"; + sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ bearssl scdoc ]; + + meta = with lib; { + description = "A Gemini client"; + homepage = "https://git.sr.ht/~sircmpwn/gmni"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ bsima jb55 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index b208ebf2ab..d903cb3c08 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, kerberos, libdrm, mesa +, libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland # Command line programs @@ -66,7 +66,7 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa coreutils + libkrb5 libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index deea3decc2..30e154e522 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-Y+BiXKxlUSZXaLcz75l333ZBkKyII9IyTmKQwjshBkE="; + sha256 = "sha256-85KshJEL7ri10mSm/KgcT03WLEwRMMTGczb6mGx66Jw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 6fa585e7de..6cb947cb81 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.1.0"; + version = "2.1.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0fz6rbacy9sbzx0jsvwkrcyv2849ia8pj1w716l6pw9i9wx3gp8x"; + sha256 = "sha256-txsArX1JiRGXjlu9FTpt0EUKxq3j5b85j8luFTKDQs4="; }; # Needs tox @@ -110,17 +110,18 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { done ''; - postFixup = '' - wrapProgram $out/bin/qutebrowser \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" \ + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "''${qtWrapperArgs[@]}" --add-flags '--backend ${backend}' + ) ''; meta = with lib; { homepage = "https://github.com/The-Compiler/qutebrowser"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry ]; + maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix index 1dd0b408a1..1e44d46689 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -3,11 +3,12 @@ lib, stdenv , makeWrapper , makeDesktopItem , fetchurl +, jdk11 , jdk8 }: let - generic = { version, sha256, ... }@attrs: + generic = { version, sha256, platform ? "", jdk, ... }@attrs: let desktopItem = makeDesktopItem { categories = "Network;Development;WebDevelopment;Java;"; @@ -25,13 +26,13 @@ let inherit version; src = fetchurl { - url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz"; inherit sha256; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \ + makeWrapper ${jdk}/bin/java $out/bin/charles \ --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" for fn in lib/*.jar; do @@ -56,12 +57,15 @@ let in { charles4 = (generic { - version = "4.2.8"; - sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; + version = "4.6.1"; + sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv"; + platform = "_amd64"; + jdk = jdk11; }); charles3 = (generic { version = "3.12.3"; sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; + jdk = jdk8.jre; }); } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index eb2e5e049c..1d8a8228af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.10.0"; + version = "0.11.0"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = "Der1Ud27eIV450KkxDTF2frmeKEHKsg6vJgdXE+3548="; + sha256 = "sha256-nqvFJriNMK3SvAsNzhE8MCzVNR8j/TjYU+f1PbuxkuI="; stripRoot = false; }; in @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "iJ6UyHbF4+RvfNoOuHt6X2R6XhpBe+t76deldwY5P2c="; + sha256 = "sha256-V4cZuRlC1Hu4gBG5/8ZNBKlSBFLgOtSJ3GbpjW5/8xM="; }; - vendorSha256 = "Z0keCr+KZ593c6a/56lYJwOgXu5hrUSn6N3NFf2LDUM="; + vendorSha256 = "sha256-aVVvrOjCKxzFer5uZRSu1LCQKkGkPcBdKdebN5uHUUg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 852088ec47..1d02e675f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-7uS8704YZ7lQTSSnbVvc6T5iadl02TeVpwVPf2uS9L4="; + sha256 = "sha256-SaDO3a50CLhgLafCdgKEfHpuHdIweSy5L/TUgEUv5CM="; }; - vendorSha256 = "sha256-oqfJaQA8ybh0UNWYJ2ukoWkwdgORwvXzRCquGstwA4M="; + vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 7c79c4896b..285e1db536 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -3,7 +3,7 @@ , makeWrapper , socat , iptables -, iproute +, iproute2 , bridge-utils , conntrack-tools , buildGoPackage @@ -240,7 +240,7 @@ stdenv.mkDerivation rec { kmod socat iptables - iproute + iproute2 bridge-utils ethtool util-linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 80a58543ae..ee16f923b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.5"; + version = "0.24.6"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-CAKvu6/U/2krJzY9VnK9wUHSNCpM6rjRzgXAWhC65uw="; + sha256 = "sha256-uqtjAvtsF+4cz3M60Xj9sCNotaoPzaeeTKnXQUB4CIo="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-WcGIw53QPOVPeRXKMr1rH1R+PZRWf9/asyPyoutD8x4="; + vendorSha256 = "sha256-/4Aof09MYHPc4VJJV2EyB7T9zNFtYY4JeDGJi67FQic="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix new file mode 100644 index 0000000000..683a91ffee --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kconf"; + version = "1.10.1"; + + src = fetchFromGitHub { + owner = "particledecay"; + repo = "kconf"; + rev = "v${version}"; + sha256 = "NlTpHQFOJJcIt/xMT3fvdrlxANyg//wtYMmXzEtaFXo="; + }; + + vendorSha256 = "2d4o87wE9QZltk2YOHc20XVYF8n0EOrDf5mJ6i6EB0c="; + + meta = with lib; { + description = "An opinionated command line tool for managing multiple kubeconfigs"; + homepage = "https://github.com/particledecay/kconf"; + license = licenses.mit; + maintainers = with maintainers; [ thmzlt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 8f44531516..5cb52c4717 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "4.3.0"; + version = "4.4.0"; excludedPackages = "tools"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-ybEYKr0rQY8Qg74V1mXqShq5Z2d/Adf0bSSbEMIyo3I="; + sha256 = "sha256-+9VtFHZ4ZZiX04u5YvPoQaelH9Q9oKMrbFHFFiNUxBA="; }; vendorSha256 = null; @@ -31,6 +31,14 @@ buildGoModule rec { --zsh <($out/bin/k3d completion zsh) ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/k3d --help + $out/bin/k3d version | grep "k3d version v${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/rancher/k3d"; changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index d7f829dc00..0a928ac929 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "0jw8v6ff0iwkwxlhcr35cvhy4zg31dsm1s3q4fxgi901yj1wn6zy"; + sha256 = "sha256-0+4hrC7A60dbf+1uvTVU2JRynvA3O/lXfgcra1fV9bI="; }; - vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb"; + vendorSha256 = "sha256-erGqCpWlAQanY1ghpNVRhzUEIXv3lCiBGRs888MmHN8="; buildFlagsArray = '' -ldflags= diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix index 28b3b71999..af8e04667b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeval"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; rev = version; - sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; + sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0="; }; - vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja"; + vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix new file mode 100644 index 0000000000..0c8f7f1574 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub}: + +buildGoModule rec { + name = "kuttl"; + pname = "kuttl"; + version = "0.9.0"; + cli = "kubectl-kuttl"; + + src = fetchFromGitHub { + owner = "kudobuilder"; + repo = "kuttl"; + rev = "v${version}"; + sha256 = "sha256:1cji0py2340mvcpplwq3licdkzjx7q5f27fdjjxvbhrgksnyw6hs"; + }; + + vendorSha256 = "sha256:1shra42ifa2knxp58fj5hn074jg89f3nqdqk4rqbp3ybir84ahsd"; + + subPackages = [ "cmd/kubectl-kuttl" ]; + + buildFlagsArray = '' + -ldflags=-s -w + -X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version} + ''; + + meta = with lib; { + description = "The KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators"; + homepage = "https://github.com/kudobuilder/kuttl"; + license = licenses.asl20; + maintainers = with maintainers; [ diegolelis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix index 6b303ce0f4..a4dac9dd62 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix @@ -2,12 +2,12 @@ let pname = "lens"; - version = "4.1.4"; + version = "4.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage"; - sha256 = "0g7k3sld6m31qi0zc9z5gydi60waw7ykwz48qnyg77xz1cpm6z5x"; + sha256 = "0g60d1h2dn41qdzdnqavwknqynjqil7s8kcqy01h021r81rdpn2q"; name="${pname}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 53209d2edd..a1d4b14683 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux -, coreutils, kerberos, ncurses, clang, installShellFiles +, coreutils, libkrb5, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -33,7 +33,7 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pgo-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pgo-client/default.nix new file mode 100644 index 0000000000..52c9c19121 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pgo-client/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pgo-client"; + version = "4.6.2"; + + src = fetchFromGitHub { + owner = "CrunchyData"; + repo = "postgres-operator"; + rev = "v${version}"; + sha256 = "sha256-zPFsLKbuVq2wMjFsqjBGiatPBwGR/X6q3mj8o5BE+r0="; + }; + + vendorSha256 = "sha256-DU1kc7YDQ+denj6tHVGt79s494aBFZ2KM7PVSn951KI="; + + subPackages = [ "cmd/pgo" ]; + + meta = with lib; { + description = "A CLI client for Crunchy PostgreSQL Kubernetes Operator"; + homepage = "https://github.com/CrunchyData/postgres-operator"; + changelog = "https://github.com/CrunchyData/postgres-operator/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 44ad3dfd72..8e7731590a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,20 +2,22 @@ buildGoModule rec { pname = "tanka"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM="; + sha256 = "sha256-ckXvDB3TU9HAXowAAr/fRmX3mylVvPKW8I74R/vUaRY="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + subPackages = [ "cmd/tk" ]; + + buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -26,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Flexible, reusable and concise configuration for Kubernetes"; - homepage = "https://github.com/grafana/tanka/"; + homepage = "https://tanka.dev"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 847e3f64ca..c59c037148 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-IyYlmatgcVbUj1WCPAFVOIgn1iHM80P4ie6d1YD3ISM="; + sha256 = "sha256-xwUTSJ0rlNzQqGQp6jL03L4SuHUvvD3aWXxa1Xp0UyM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index 752274a562..313bd46a51 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6jUYntnMB/LxyZuRkSaOVcrzJOIoucdaY+5GVHwJL8Y="; + sha256 = "sha256-zQFPuHxfFvfwPVV0vPeA+A6XCw2Vt4tY4S2JBGcqaBQ="; }; vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9f5ced1d51..329b1be682 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -359,10 +359,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "repo": "terraform-provider-google", - "rev": "v3.47.0", - "sha256": "05xb0q56y9088qbyaf3vzjm9im1s2azxffhjffjpzi0i79k0g2p0", - "vendorSha256": "1h83p7ncv7b4ci7qdig7hb81zk9458fq9aqqbkryawf1w7wbaq2a", - "version": "3.47.0" + "rev": "v3.62.0", + "sha256": "0x0qp8nk88667hvlpgxrdjsgirw8iwv85gn3k9xb37a3lw7xs4qz", + "vendorSha256": "0w6aavj1c4blpvsy00vz4dcj8rnxx6a586b16lqp6s1flqmlqrbi", + "version": "3.62.0" }, "google-beta": { "owner": "hashicorp", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/Gemfile b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/Gemfile new file mode 100644 index 0000000000..e6a4991e89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'terraforming' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/Gemfile.lock new file mode 100644 index 0000000000..ae2a40cc35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/Gemfile.lock @@ -0,0 +1,92 @@ +GEM + remote: https://rubygems.org/ + specs: + aws-eventstream (1.1.1) + aws-partitions (1.436.0) + aws-sdk-autoscaling (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudwatch (1.50.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.113.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-dynamodb (1.60.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.230.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-efs (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticache (1.54.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticloadbalancing (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticloadbalancingv2 (1.61.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-iam (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.43.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-rds (1.117.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-redshift (1.58.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53 (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.93.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sdk-sns (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.3) + aws-eventstream (~> 1, >= 1.0.2) + jmespath (1.4.0) + multi_json (1.12.2) + terraforming (0.18.0) + aws-sdk-autoscaling (~> 1) + aws-sdk-cloudwatch (~> 1) + aws-sdk-dynamodb (~> 1.18) + aws-sdk-ec2 (~> 1) + aws-sdk-efs (~> 1, >= 1.13.0) + aws-sdk-elasticache (~> 1) + aws-sdk-elasticloadbalancing (~> 1) + aws-sdk-elasticloadbalancingv2 (~> 1) + aws-sdk-iam (~> 1) + aws-sdk-kms (~> 1) + aws-sdk-rds (~> 1) + aws-sdk-redshift (~> 1) + aws-sdk-route53 (~> 1) + aws-sdk-s3 (~> 1) + aws-sdk-sns (~> 1) + aws-sdk-sqs (~> 1) + multi_json (~> 1.12.1) + thor + thor (1.1.0) + +PLATFORMS + ruby + +DEPENDENCIES + terraforming + +BUNDLED WITH + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/default.nix new file mode 100644 index 0000000000..85d522257c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/default.nix @@ -0,0 +1,20 @@ +{ lib, bundlerApp, bundlerUpdateScript, ruby }: + +bundlerApp rec { + inherit ruby; + + pname = "terraforming"; + gemdir = ./.; + exes = [ "terraforming" ]; + + passthru.updateScript = bundlerUpdateScript "terraforming"; + + meta = with lib; { + inherit (ruby.meta) platforms; + + description = "Export existing AWS resources to Terraform style (tf, tfstate)"; + homepage = "https://github.com/dtan4/terraforming"; + license = with licenses; mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/gemset.nix new file mode 100644 index 0000000000..9882efc29e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraforming/gemset.nix @@ -0,0 +1,261 @@ +{ + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3"; + type = "gem"; + }; + version = "1.1.1"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gn09cafg2n6gdc3ja80r3xjllly05r0m7x3w3b3rywir6k6ai4f"; + type = "gem"; + }; + version = "1.436.0"; + }; + aws-sdk-autoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0br6hfi2i5rri8ivamkmnx00p640s24pqmp8s67sm5asvdfzx4vr"; + type = "gem"; + }; + version = "1.59.0"; + }; + aws-sdk-cloudwatch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xga00dn925rfgz4p2zf734aaik00dqb9psll27lg5626jd6xr0c"; + type = "gem"; + }; + version = "1.50.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z"; + type = "gem"; + }; + version = "3.113.0"; + }; + aws-sdk-dynamodb = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dfsmkzv9cziykzc56g9pwxmbdqjpykxka3fq07b6iarzh38j1i3"; + type = "gem"; + }; + version = "1.60.0"; + }; + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3"; + type = "gem"; + }; + version = "1.230.0"; + }; + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kmpz86sxkm6nzcf80nd65902fy29hz8lvx1kjwl5idx07ls8pnd"; + type = "gem"; + }; + version = "1.39.0"; + }; + aws-sdk-elasticache = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05kn2k437rnsf9nkwc1x5i2klrasjgyk1pj89f2gb0za86swjcza"; + type = "gem"; + }; + version = "1.54.0"; + }; + aws-sdk-elasticloadbalancing = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j3px8dn2yxsnmy010kfkwa1a2flbdxachmly20f436ysi3ql3v3"; + type = "gem"; + }; + version = "1.31.0"; + }; + aws-sdk-elasticloadbalancingv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16hknbqv5s1im04dch9kdbc79x072613imdih62w48mvsf12c1mm"; + type = "gem"; + }; + version = "1.61.0"; + }; + aws-sdk-iam = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569"; + type = "gem"; + }; + version = "1.51.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh"; + type = "gem"; + }; + version = "1.43.0"; + }; + aws-sdk-rds = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hwxgcka6bmzdn5pazss0fv8xgbbgas4h2cwpzwhkjkwhh23dx6a"; + type = "gem"; + }; + version = "1.117.0"; + }; + aws-sdk-redshift = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sp186v00lj517hia6rsn28ph8rqknz9r79vbkbyh5fgrbh2j6bd"; + type = "gem"; + }; + version = "1.58.0"; + }; + aws-sdk-route53 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p9g0scw9c6qancdwvaw3kkj3pywchy2vl3qz2rqpjncqvj04pn5"; + type = "gem"; + }; + version = "1.48.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94"; + type = "gem"; + }; + version = "1.93.0"; + }; + aws-sdk-sns = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pmxi871r2nkl6by89vsy05ahk8dr6hmkny56fycrby6r9kri9q4"; + type = "gem"; + }; + version = "1.39.0"; + }; + aws-sdk-sqs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01m2l8y4q4fixjvl70w5bi1ihmmx2y4krms9kkjwd3ch21y14hif"; + type = "gem"; + }; + version = "1.38.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw"; + type = "gem"; + }; + version = "1.2.3"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + type = "gem"; + }; + version = "1.12.2"; + }; + terraforming = { + dependencies = ["aws-sdk-autoscaling" "aws-sdk-cloudwatch" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-efs" "aws-sdk-elasticache" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-iam" "aws-sdk-kms" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-s3" "aws-sdk-sns" "aws-sdk-sqs" "multi_json" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03fyhqx6bxpbn26pbcz748gz7rh7q3r9r0jimq7vj07fl454fmwh"; + type = "gem"; + }; + version = "0.18.0"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + type = "gem"; + }; + version = "1.1.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 9634e477e8..eb230062fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.16"; + version = "0.28.18"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xt04gYxInW9UNxPG4kmMagfAQyQ+T0/u7m39grFCdAc="; + sha256 = "sha256-W0HjGILezhuc1lXvGCHw23h8Sx1uw4YLLsOOBZYGvU8="; }; - vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc="; + vendorSha256 = "sha256-kcRM76xfajtQist1aJTmaRludxRlfvHQ9ucB3LOgnBk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix index d0db8cc10b..f4535c9120 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, xz, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libpcap openssl libtins - lzma + xz libctemplate libmaxminddb ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 1b8ff4622f..39073985fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-el94Iq7/+1FfGpqbhKEO6FGpaCxoueoc/+Se+WfT+G0="; + sha256 = "sha256-VSNvyigaGfGDbcng6ltdq+X35zT2tb2p4j/4KAjd1Yk="; }; - vendorSha256 = "sha256-MSHg1RWjbXm1pf6HTyJL4FcnLuacL9fO1F6zbouVkWg="; + vendorSha256 = "sha256-VU0uJDp5koVU+wDwr3ctrDY0R3vd/JmpA7gtWWpwpfw="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix index 23b79dccd6..9ecadd56f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -1,32 +1,19 @@ -{ pythonPackages, fetchurl, fetchpatch, lib, nixosTests }: +{ pythonPackages, fetchurl, lib, nixosTests }: with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12.2"; + version = "3.13"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr"; + sha256 = "09vp2y0ibv20y9yysniv6njzigif4h74pkj31l2a8xw5g19gclna"; }; - patches = [ - (fetchpatch { - name = "rss2email-feedparser6.patch"; - url = "https://github.com/rss2email/rss2email/pull/149/commits/338343c92f956c31ff5249ef4bcf7aeea81f687e.patch"; - sha256 = "0h8b3g9332vdrkqbh6lp00k97asrhmlxi13zghrgc78ia13czy3z"; - }) - (fetchpatch { - name = "rss2email-feedparser6-test.patch"; - url = "https://github.com/rss2email/rss2email/pull/149/commits/8c99651eced3f29f05ba2c0ca02abb8bb9a18967.patch"; - sha256 = "1scljak6xyqxlilg3j39v4qm9a9jks1bnvnrh62hyf3g53yw2xlg"; - }) - ]; - outputs = [ "out" "man" "doc" ]; postPatch = '' @@ -45,8 +32,10 @@ buildPythonApplication rec { cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/ ''; - postCheck = '' + checkPhase = '' + runHook preCheck env PATH=$out/bin:$PATH python ./test/test.py + runHook postCheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/firehol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firehol/default.nix index ee0b561e67..424c677210 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/firehol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgs -, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils +, autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois # If true, just install FireQOS without FireHOL @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - curl iprange iproute ipset iptables iputils kmod + curl iprange iproute2 ipset iptables iputils kmod nettools procps tcpdump traceroute util-linux whois ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix index 5ed87334c4..7b4ddb6134 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper -, gcc, nettools, iproute, linuxHeaders }: +, gcc, nettools, iproute2, linuxHeaders }: # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake flex bison makeWrapper ]; - buildInputs = [ openssl libedit qt4 nettools iproute ]; + buildInputs = [ openssl libedit qt4 nettools iproute2 ]; postPatch = '' # fix build with bison3 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 8f09c37d25..1775e45d4e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -26,6 +26,7 @@ , libuuid , libxcb , libxkbcommon +, libxshmfence , mesa , nspr , nss @@ -41,11 +42,11 @@ let pname = "slack"; - x86_64-darwin-version = "4.13.0"; - x86_64-darwin-sha256 = "1f155fgbdmqxy7324lxj3ysx1p332rzpwy06iac90rm6irf5v57f"; + x86_64-darwin-version = "4.14.0"; + x86_64-darwin-sha256 = "0kpjsnriav6rcddjkz0z9arxjd09i6bw2krnmf3dc31my64nmxs6"; - x86_64-linux-version = "4.13.0"; - x86_64-linux-sha256 = "1hqvynkhbkfwxvfgjqv91x5k7qlzayjr5mmf8rz0ncp4j4d3x9mq"; + x86_64-linux-version = "4.14.0"; + x86_64-linux-sha256 = "0xy9i8ssjba62ca7lfan58rhwx69wkapfd0jzkaj95qhqnv019fg"; version = { x86_64-darwin = x86_64-darwin-version; @@ -117,6 +118,7 @@ let xorg.libXi xorg.libXrandr xorg.libXrender + xorg.libxshmfence xorg.libXtst xorg.libxkbfile ] + ":${stdenv.cc.cc.lib}/lib64"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 676902d68e..bfd4f28d0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja , qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft -, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected +, xz, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft xz lz4 xxHash libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 1abedf5802..4dc29dd228 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,13 +22,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.23.4046"; - x86_64-linux = "3.23.2938"; + x86_64-darwin = "3.24.4059"; + x86_64-linux = "3.24.2939"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "19k8102chh4yphk89kiz83yarawnzdnsq0hbsqpjdhbmarqjcd9s"; - x86_64-linux = "1cx5azl5dvya1hf0gayafm4rg6ccmmq978xsgm6lf0rlb4kirj65"; + x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy"; + x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p"; }.${system} or throwSystem; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix index 62882818d7..d169e1fdea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos +{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5 , openldap }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses tcl openssl pam kerberos openldap + ncurses tcl openssl pam libkrb5 openldap ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix index b7527d04cb..278561e0e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + enableParallelBuilding = true; + postInstall = '' installShellCompletion contrib/_mblaze '' + lib.optionalString (ruby != null) '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index eecf8f0f67..27c06c95d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -4,7 +4,7 @@ , cyrus_sasl ? null , gnupg ? null , gpgme ? null -, kerberos ? null +, libkrb5 ? null , headerCache ? true , sslSupport ? true , saslSupport ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses which perl ] ++ optional headerCache gdbm ++ optional sslSupport openssl - ++ optional gssSupport kerberos + ++ optional gssSupport libkrb5 ++ optional saslSupport cyrus_sasl ++ optional gpgmeSupport gpgme; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0c02f512da..b2187371f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cyrus_sasl gss gpgme kerberos libidn ncurses + cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb mailcap sqlite ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index 5e2c74fb3f..dda6abac8e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -16,7 +16,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libXcomposite @@ -94,7 +94,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f9027285c1..d16cbfc1bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -20,7 +20,7 @@ , gpgme , gtk2 , gtk3 -, kerberos +, libkrb5 , libcanberra , libGL , libGLU @@ -93,7 +93,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 9b86c0847e..618234e6ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,34 +2,43 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "1.5.0"; + version = "1.6.9"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "lHqwKlFwz9iO7LJMGFTGCauw12z/BKnQte2sVoVkOaY="; + sha256 = "0p2315smxc5knxzr9413w62z65647znh9j9vyb6w5x4dqfp7vhz9"; }; - vendorSha256 = "eP+7fqBctX9XLCoHVJDI/qaa5tocgg3F5nfUM6dzNRg="; + vendorSha256 = "04aa7syp5hhpqxdpqlsmmbwywnbrh4ia0diym2935jbrqccnvm1k"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret ]; buildPhase = '' - make BUILD_TIME= build-nogui + runHook preBuild + + patchShebangs ./utils/ + make BUILD_TIME= -j$NIX_BUILD_CORES build-nogui + + runHook postBuild ''; installPhase = '' - install -Dm555 Desktop-Bridge $out/bin/protonmail-bridge + runHook preInstall + + install -Dm555 proton-bridge $out/bin/protonmail-bridge + + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/ProtonMail/proton-bridge"; changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md"; downloadPage = "https://github.com/ProtonMail/proton-bridge/releases"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lightdiscord ]; description = "Use your ProtonMail account with your local e-mail client"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix index acfacadd55..96c66f054e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking +, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib - kerberos + libkrb5 curl lttng-ust libpulseaudio diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index f52373f262..48ea229c24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -3,6 +3,7 @@ , at-spi2-atk , atk , buildFHSUserEnv +, cairo , dbus , fetchurl , fontconfig @@ -67,6 +68,9 @@ let # This libjpeg library interferes with Chromium, so we will be using ours instead. rm $out/lib/vmware/libjpeg.* + # This library causes the program to core-dump occasionally. Use ours instead. + rm $out/lib/vmware/view/crtbora/libcairo.* + # Force the default GTK theme (Adwaita) because Horizon is prone to # UI usability issues when using non-default themes, such as Adwaita-dark. makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ @@ -84,6 +88,7 @@ let targetPkgs = pkgs: [ at-spi2-atk atk + cairo dbus fontconfig freetype diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix index 314805a685..0b8e858d25 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs , util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg -, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash +, nettools, iproute2, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash }: let @@ -31,7 +31,7 @@ let binaryDeps = [ perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep - findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs + findutils nettools iproute2 bc procps psmisc lsof pwgen openssh sshfs xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil xorg.xkbcomp xorg.setxkbmap ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 58ff92b548..fa129baabc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , genericUpdater , common-updater-scripts +, makeWrapper +, openssh }: buildGoModule rec { @@ -31,6 +33,12 @@ buildGoModule rec { }; }; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/agent --prefix PATH : ${lib.makeBinPath [ openssh ]} + ''; + meta = with lib; { description = "Enables easy access any Linux device behind firewall and NAT"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 58f9745454..cde73fcc7c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.54.1"; + version = "1.55.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4="; + sha256 = "01pvcns3n735s848wc11q40pkkv646gn3cxkma866k44a9c2wirl"; }; - vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; + vendorSha256 = "05f9nx5sa35q2szfkmnkhvqli8jlqja8ghiwyxk7cvgjl7fgd6zk"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index b070683e6f..4f32486ffe 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -1,40 +1,44 @@ -{ lib, python3, beancount }: +{ lib, python3 }: -let - inherit (python3.pkgs) buildPythonApplication fetchPypi; -in -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "fava"; version = "1.18"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5"; }; - checkInputs = [ python3.pkgs.pytest ]; - propagatedBuildInputs = with python3.pkgs; - [ - Babel - cheroot - flaskbabel - flask - jinja2 - beancount - click - markdown2 - ply - simplejson - werkzeug - jaraco_functools - ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; - # CLI test expects fava on $PATH. Not sure why static_url fails. - # the entry_slices and render_entries requires other files to pass - checkPhase = '' - py.test tests -k 'not cli and not static_url and not entry_slice and not render_entries' + propagatedBuildInputs = with python3.pkgs; [ + Babel + cheroot + flaskbabel + flask + jinja2 + beancount + click + markdown2 + ply + simplejson + werkzeug + jaraco_functools + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TEMPDIR ''; + disabledTests = [ + # runs fava in debug mode, which tries to interpret bash wrapper as Python + "test_cli" + ]; + meta = { homepage = "https://beancount.github.io/fava"; description = "Web interface for beancount"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index 75c6b57047..3b8bba9ac1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -742,11 +742,11 @@ md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; } { - name = "Python-3.8.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.4.tar.xz"; - sha256 = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37"; + name = "Python-3.8.8rc1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz"; + sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6"; md5 = ""; - md5name = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37-Python-3.8.4.tar.xz"; + md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index ab320f0678..d3fbc261c3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "1"; + patch = "2"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1vz028hzbc4n8jznigs419ygylz1vp426dprrkm62bzckv2p1rfn"; + sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1vidv8077f394zn87b2ng1hsld0hgr1zb1p9lmjx0n9k7s7clavh"; + sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "14wn0lvvplsj194jdqqv184xx0adb4mm8bjflddvcqsl7xsfqx27"; + sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 99b021429a..e397743b22 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -1,19 +1,19 @@ -{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv /* for isLinux */ }: +{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv, qtx11extras }: mkDerivation rec { pname = "qownnotes"; - version = "20.2.5"; + version = "21.3.2"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 - sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.3.2.tar.xz.sha256 + sha256 = "a8e8ab2ca1ef6684407adeb8fc63abcafff407a367471e053c583a1c4215e5ee"; }; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ - qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets + qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] ++ lib.optional stdenv.isLinux qtwayland; meta = with lib; { @@ -21,7 +21,7 @@ mkDerivation rec { homepage = "https://www.qownnotes.org/"; platforms = platforms.all; - license = licenses.gpl2; - maintainers = with maintainers; [ dtzWill ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dtzWill totoroot ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index fad87d4491..b18f22b6c1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -23,7 +23,7 @@ , libtool , libuuid , libxml2 -, lzma +, xz , nspr , nss , openssl @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { libuuid libxcb libxml2 - lzma + xz nspr nss openssl diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix index 4675760186..44a8ed14c2 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix @@ -4,7 +4,7 @@ , cmake , gmp , glog -, gmock +, gtest , openssl , gflags , gnuradio3_8 @@ -42,7 +42,7 @@ gnuradio3_8.pkgs.mkDerivation rec { armadillo gnuradio3_8.unwrapped.boost glog - gmock + gtest openssl gflags orc diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix index 799b429800..9f90d3c035 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake # Remove gcc and python references , removeReferencesTo @@ -42,7 +41,7 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.8"; - minor = "2"; + minor = "3"; patch = "0"; } # We use our build of volk and not the one bundled with the release @@ -50,7 +49,7 @@ }: let - sourceSha256 = "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA="; + sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd"; featuresInfo = { # Needed always basic = { @@ -241,12 +240,17 @@ stdenv.mkDerivation rec { }; cmakeFlags = shared.cmakeFlags # From some reason, if these are not set, libcodec2 and gsm are not - # detected properly. NOTE: qradiolink needs libcodec2 to be detected in + # detected properly. The issue is reported upstream: + # https://github.com/gnuradio/gnuradio/issues/4278 + # + # NOTE: qradiolink needs libcodec2 to be detected in # order to build, see https://github.com/qradiolink/qradiolink/issues/67 ++ lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_FOUND=TRUE" "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_FOUND=TRUE" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" ] @@ -262,23 +266,4 @@ stdenv.mkDerivation rec { ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; - patches = [ - # Don't install python referencing files if python support is disabled. - # See: https://github.com/gnuradio/gnuradio/pull/3839 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff"; - sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q="; - }) - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff"; - sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4="; - }) - # Needed to use boost 1.7x, see: - # https://github.com/gnuradio/gnuradio/issues/3720 - # https://github.com/gnuradio/gnuradio/pull/3967 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff"; - sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v"; - }) - ]; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index bcb2560144..d622fef424 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -44,14 +44,14 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "0"; + minor = "1"; patch = "0"; } , fetchSubmodules ? false }: let - sourceSha256 = "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk="; + sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp"; featuresInfo = { # Needed always basic = { @@ -190,11 +190,10 @@ let runtime = [ SDL ]; cmakeEnableFlag = "GR_VIDEO_SDL"; }; - # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278 - # gr-vocoder = { - # runtime = [ codec2 gsm ]; - # cmakeEnableFlag = "GR_VOCODER"; - # }; + gr-vocoder = { + runtime = [ codec2 gsm ]; + cmakeEnableFlag = "GR_VOCODER"; + }; gr-wavelet = { cmakeEnableFlag = "GR_WAVELET"; runtime = [ gsl libsodium ]; @@ -234,7 +233,6 @@ stdenv.mkDerivation rec { src nativeBuildInputs buildInputs - cmakeFlags disallowedReferences stripDebugList doCheck @@ -250,6 +248,19 @@ stdenv.mkDerivation rec { } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { inherit (libsForQt5) qwt; }; + cmakeFlags = shared.cmakeFlags + # From some reason, if these are not set, libcodec2 and gsm are not + # detected properly. + ++ lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_FOUND=TRUE" + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" + "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_FOUND=TRUE" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" + ] + ; postInstall = shared.postInstall # This is the only python reference worth removing, if needed. diff --git a/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix new file mode 100644 index 0000000000..2f6eed575b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libbtbb, libpcap , libusb1, bluez +, udevGroup ? "ubertooth" +}: + +stdenv.mkDerivation rec { + pname = "ubertooth"; + version = "2020-12-R1"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = pname; + rev = version; + sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw"; + }; + + sourceRoot = "source/host"; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libbtbb libpcap libusb1 bluez ]; + + cmakeFlags = lib.optionals stdenv.isLinux [ + "-DINSTALL_UDEV_RULES=TRUE" + "-DUDEV_RULES_PATH=etc/udev/rules.d" + "-DUDEV_RULES_GROUP=${udevGroup}" + ]; + + meta = with lib; { + description = "Open source wireless development platform suitable for Bluetooth experimentation"; + homepage = "https://github.com/greatscottgadgets/ubertooth"; + license = licenses.gpl2; + maintainers = with maintainers; [ oxzi ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix index 80506bb79b..46d39c1a7b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python3, bash }: +{ lib, stdenv, fetchurl, htslib, zlib, bzip2, xz, curl, perl, python3, bash }: stdenv.mkDerivation rec { pname = "bcftools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = [ htslib zlib bzip2 lzma curl ]; + buildInputs = [ htslib zlib bzip2 xz curl ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix index f5aad5d055..aac36d2af3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}: +{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, xz}: stdenv.mkDerivation rec { pname = "bedtools"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; + cxx = if stdenv.cc.isClang then "clang++" else "g++"; cc = if stdenv.cc.isClang then "clang" else "gcc"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix index efaa4403f4..fe81ff44d2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: stdenv.mkDerivation rec { pname = "delly"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; }; - buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; + buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; EBROOTHTSLIB = htslib; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix index 32ab614b96..8646b8ca54 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/freebayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzma }: +{ lib, stdenv, fetchFromGitHub, zlib, bzip2, xz }: stdenv.mkDerivation rec { pname = "freebayes"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; installPhase = '' install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix index 26c55d3dc3..12bbfa09c2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix @@ -3,7 +3,7 @@ , libuuid , zlib , bzip2 -, lzma +, xz , openssl , curl , libmysqlclient @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; }; - buildInputs = [ libpng libuuid zlib bzip2 lzma openssl curl libmysqlclient ]; + buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; patchPhase = '' substituteInPlace ./src/checkUmask.sh \ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index fa88e5c47b..0ef48ec641 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: +{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost gmp htslib zlib lzma ]; + buildInputs = [ boost gmp htslib zlib xz ]; postInstall = '' mkdir $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix index 87b77f6ac0..1aed501919 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/svaba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, bzip2, lzma, fetchFromGitHub } : +{ lib, stdenv, zlib, bzip2, xz, fetchFromGitHub } : stdenv.mkDerivation rec { version = "1.1.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix index 9bb04a3189..5a46e8f638 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, bison, flex, imake, xorgproto, gccmakedep }: let libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; }; - nativeBuildInputs = [ which yacc flex imake gccmakedep ]; + nativeBuildInputs = [ which bison flex imake gccmakedep ]; buildInputs = [ tcl tk libX11 xorgproto ]; dontUseImakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix index b3c6a51d44..24d11c3a53 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python +{ lib, stdenv, fetchFromGitHub, cmake, gmp, mpfr, python2 , gperftools, ninja, makeWrapper }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper ninja ]; - buildInputs = [ gmp mpfr python gperftools ]; + buildInputs = [ gmp mpfr python2 gperftools ]; preConfigure = '' patchShebangs bin/leantags diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix index db124c379c..15e89138c6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/poly/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, gmp, cmake, python}: +{lib, stdenv, fetchFromGitHub, gmp, cmake, python3}: stdenv.mkDerivation rec { pname = "libpoly"; @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ gmp python ]; + buildInputs = [ gmp python3 ]; + + strictDeps = true; meta = with lib; { homepage = "https://github.com/SRI-CSL/libpoly"; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index 7d052c6c5e..47b826078f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig # data, compression -, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy +, bzip2, curl, hdf5, json_c, xz, lzo, protobuf, snappy # maths , blas, lapack, eigen, nlopt, lp_solve, colpack, glpk # libraries @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve xz lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 771d6227a8..de6f921298 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,27 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost169, rapidjson, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "8.9.2"; + version = "8.10.0"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "0ng1kip7sh3br85691xvszxd6lhv8nhfkgqkpwxd89wy85znzhmd"; + sha256 = "1vxnwanflsx6zf8m9mrxms28ii7rl61xfxp3556y3iawmy11d6pl"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ boost169 + flatbuffers + fmt rapidjson + spdlog zlib ]; # -DBUILD_TESTS=OFF is set as both it saves time in the build and the default # cmake flags appended by the builder include -DBUILD_TESTING=OFF for which # this is the equivalent flag. + # Flatbuffers are an optional feature. + # BUILD_FLATBUFFERS=ON turns it on. This will still consume Flatbuffers as a + # system dependency cmakeFlags = [ "-DVW_INSTALL=ON" "-DBUILD_TESTS=OFF" @@ -29,10 +35,12 @@ stdenv.mkDerivation rec { "-DBUILD_PYTHON=OFF" "-DUSE_LATEST_STD=ON" "-DRAPIDJSON_SYS_DEP=ON" + "-DFMT_SYS_DEP=ON" + "-DSPDLOG_SYS_DEP=ON" + "-DBUILD_FLATBUFFERS=ON" ]; meta = with lib; { - broken = stdenv.isAarch32 || stdenv.isAarch64; description = "Machine learning system focused on online reinforcement learning"; homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix index 6a38670adc..901b9a340f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }: +{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }: stdenv.mkDerivation rec { name = "ginac-1.8.0"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; - nativeBuildInputs = [ pkg-config python ]; + nativeBuildInputs = [ pkg-config python3 ]; + + strictDeps = true; preConfigure = "patchShebangs ginsh"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index 6066d0325f..2bfeaa0056 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, python }: +{ stdenv, lib, fetchurl, autoPatchelfHook, python2 }: let majorVersion = "8.1"; @@ -14,7 +14,9 @@ in stdenv.mkDerivation rec { sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ (python.withPackages (ps: [ ps.gurobipy ])) ]; + buildInputs = [ (python2.withPackages (ps: [ ps.gurobipy ])) ]; + + strictDeps = true; buildPhase = '' cd src/build diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix index 0d827e2ad1..0eb89b63e4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix @@ -3,24 +3,28 @@ with lib; stdenv.mkDerivation { pname = "aliza"; - version = "1.98.43"; + version = "1.98.57"; src = fetchurl { # See https://www.aliza-dicom-viewer.com/download - url = "https://drive.google.com/uc?export=download&id=1HiDYUVN30oSWZWt3HBp7gNRBCLLtJM1I"; - sha256 = "0d70q67j2q0wdn4m2fxljqb97jwmscqgg3rm1rkb77fi2ik206ra"; + urls = [ + "https://drive.google.com/uc?export=download&id=1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y" + "https://web.archive.org/web/20210327224315/https://doc-0s-0s-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/1lgjid9ti29rdf5ebmd7o58iqhs3gfpo/1616884950000/16072287944266838401/*/1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y?e=download" + ]; + sha256 = "01qk2gadmc24pmfdnmpiz7vgfiqkvhznyq9rsr153frscg76gc9b"; name = "aliza.rpm"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rpmextract ]; + nativeBuildInputs = [ makeWrapper rpmextract ]; unpackCmd = "rpmextract $curSrc"; - patchPhase = '' + postPatch = '' sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -r bin share $out diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix index 144827413b..75607fdda3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] + buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 2f3d57c31e..9df3b0020a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 -, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre , pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper cmake pkg-config ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] + buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix index 771e79311c..76937d1965 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.26"; + version = "3.27"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0kwiggdjqjhjvmwb1m7hb9clvm3xz948fy5ia67dif2pakwad754"; + sha256 = "13nwsyk030fhl3srhpc28j5s6594z0m38606f4ygc4qhv9wxw011"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] @@ -105,6 +105,6 @@ stdenv.mkDerivation rec { homepage = "https://simgrid.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; - platforms = ["x86_64-linux"]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index b14eb99420..48671582fb 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -33,8 +33,6 @@ , withGui ? true }: -assert stdenv.hostPlatform.system != "powerpc-linux"; - mkDerivation rec { pname = "recoll"; version = "1.28.6"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index a7dcd0959d..20d24a904e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -131,5 +131,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ]; platforms = platforms.unix; + changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 2631bae57e..08ef2f1373 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -18,10 +18,14 @@ , pkg-config , allowPgo ? true , python3 # for PGO +# for clang stdenv check +, foot +, llvmPackages +, llvmPackages_latest }: let - version = "1.7.0"; + version = "1.7.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -67,8 +71,8 @@ let # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#performance-optimized-pgo pgoCflags = { - "clang" = "-O3 -Wno-ignored-optimization-argument -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled"; - "gcc" = "-O3 -Wno-missing-profile"; + "clang" = "-O3 -Wno-ignored-optimization-argument"; + "gcc" = "-O3"; }."${compilerName}"; # ar with lto support @@ -89,7 +93,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0w07fw7y31g891335ji3fm783r4dsk5py82qp0zx6z3rfr07paby"; + sha256 = "1x6nyhlp0zynnbdjx87c4ybfx6fyr0r53vypkfima56dwbfh98ka"; }; nativeBuildInputs = [ @@ -130,12 +134,26 @@ stdenv.mkDerivation rec { preBuild = lib.optionalString doPgo '' meson configure -Db_pgo=generate ninja + # make sure there is _some_ profiling data on all binaries + ./footclient --version + ./foot --version + # generate pgo data of wayland independent code ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} meson configure -Db_pgo=use - '' + lib.optionalString (doPgo && stdenv.cc.cc.pname == "clang") '' + '' + lib.optionalString (doPgo && compilerName == "clang") '' llvm-profdata merge default_*profraw --output=default.profdata ''; + passthru.tests = { + clang-default-compilation = foot.override { + inherit (llvmPackages) stdenv; + }; + + clang-latest-compilation = foot.override { + inherit (llvmPackages_latest) stdenv; + }; + }; + meta = with lib; { homepage = "https://codeberg.org/dnkl/foot/"; changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index d5b0a9b3bb..a5db506570 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -115,5 +115,6 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ nequissimus vrthra ]; platforms = with lib.platforms; linux ++ darwin; + changelog = "https://invisible-island.net/xterm/xterm.log.html"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix index e41c2569fc..1c88edfd90 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bit"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "chriswalz"; repo = pname; rev = "v${version}"; - sha256 = "0dv6ma2vwb21cbxkxzrpmj7cqlhwr7a86i4g728m3y1aclh411sn"; + sha256 = "sha256-juQAFVqs0d4EtoX24EyrlKd2qRRseP+jKfM0ymkD39E="; }; - vendorSha256 = "1j6w7bll4zyp99579dhs2rza4y9kgfz3g8d5grfzgqck6cjj9mn8"; + vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA="; propagatedBuildInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 153a948d8e..6b79d15238 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0ndi264rrssqin03qmv7n0fpzs3kasfqykidrlcyizw1ngyfgc1a"; + sha256 = "1q0vc9wr4n813mxkf7jjj3prw1n7xv4l985qd57pg4a2js1dqa1y"; }; - vendorSha256 = "0ywh5d41b1c5ivwngsgn46d6yb7s1wqyzl5b0j1x4mcvydi5yi98"; + vendorSha256 = "1wv30z0jg195nkpz3rwvhixyw81lg2wzwwajq9g6s3rfjj8gs9v2"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix new file mode 100644 index 0000000000..89b2a5f23b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchPypi +, annexremote +, drivelib +, GitPython +, tenacity +, humanfriendly +}: + +buildPythonApplication rec { + pname = "git-annex-remote-googledrive"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "118w0fyy6pck8hyj925ym6ak0xxqhkaq2vharnpl9b97nab4mqg8"; + }; + + propagatedBuildInputs = [ annexremote drivelib GitPython tenacity humanfriendly ]; + + # while git-annex does come with a testremote command that *could* be used, + # testing this special remote obviously depends on authenticating with google + doCheck = false; + + pythonImportsCheck = [ "git_annex_remote_googledrive" ]; + + meta = with lib; { + description = "A git-annex special remote for Google Drive"; + homepage = "https://pypi.org/project/git-annex-remote-googledrive/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ gravndal ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 20e6a993ca..eec9b7ea12 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto -, pythonPackages }: +, python2Packages }: stdenv.mkDerivation { pname = "git-bz"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto ]; buildInputs = [] - ++ (with pythonPackages; [ python pysqlite ]); + ++ (with python2Packages; [ python pysqlite ]); postPatch = '' patchShebangs configure @@ -27,8 +27,8 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/git-bz \ - --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pycrypto}")" \ - --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")" + --prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pycrypto}")" \ + --prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pysqlite}")" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 5d1589446b..1f7fd36e1d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -24,7 +24,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.30.1"; + version = "2.31.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0rwlbps9x8kgk2hsm0bvsrkpsk9bnbnz8alknbd7i688jnhai27r"; + sha256 = "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -311,6 +311,9 @@ stdenv.mkDerivation { # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" + # Flaky tests: + disable_test t5319-multi-pack-index + ${lib.optionalString (!perlSupport) '' # request-pull is a Bash script that invokes Perl, so it is not available # when NO_PERL=1, and the test should be skipped, but the test suite does @@ -336,7 +339,7 @@ stdenv.mkDerivation { homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = lib.licenses.gpl2; - changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; + changelog = "https://github.com/git/git/blob/v${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix index 5dc75ce4d7..006809db62 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-crecord/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "git-crecord"; version = "20161216.0"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i"; }; - propagatedBuildInputs = with pythonPackages; [ docutils ]; + propagatedBuildInputs = with python2Packages; [ docutils ]; meta = { homepage = "https://github.com/andrewshadura/git-crecord"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix index ccd13ba818..b987a3f551 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }: +{ lib, stdenv, fetchzip, perl, python2, gnuplot, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "gitstats"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}" + "-src"; }; - buildInputs = [ perl python ]; + nativeBuildInputs = [ perl ]; + + buildInputs = [ python2 ]; + + strictDeps = true; postPatch = '' sed -e "s|gnuplot_cmd = .*|gnuplot_cmd = '${gnuplot}/bin/gnuplot'|" \ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix index 56cc2a4ea5..cfde0721ba 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib -, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw +, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw - yacc libtool fontconfig pango gd libwebp; + bison libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in let inherit (ocamlPackages) ocaml lablgtk camlp4; in diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index d7ec4a8646..541a2262f9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, libwebp +, bison, libtool, fontconfig, pango, gd, libwebp }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper libpng libjpeg expat libXaw yacc + xlibsWrapper libpng libjpeg expat libXaw bison libtool fontconfig pango gd libwebp ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 5540e53c84..d6cad45402 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -111,11 +111,6 @@ let }); in { - subversion19 = common { - version = "1.9.12"; - sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw"; - }; - subversion_1_10 = common { version = "1.10.6"; sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; diff --git a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index 6317d7b1ab..e14d902681 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchFromGitHub, # Main build tools - pkg-config, autoconf, automake, libtool, m4, lzma, python3, + pkg-config, autoconf, automake, libtool, m4, xz, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -100,7 +100,7 @@ _EOF ffmpeg-full libogg libtheora x264 x265 libvpx dav1d libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray lzma + libdvdread libdvdnav libdvdcss libbluray xz ] ++ lib.optional (!stdenv.isDarwin) numactl ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 136efe8a24..00e58ece07 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { - owner = "peak3d"; + owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s"; + sha256 = "0m2d5r0f82qv4kqmq5yxzpi1awkjir2b2s2mfwkjn8p55r7gzp7c"; }; extraBuildInputs = [ expat ]; @@ -20,7 +20,7 @@ buildKodiBinaryAddon rec { ''; meta = with lib; { - homepage = "https://github.com/peak3d/inputstream.adaptive"; + homepage = "https://github.com/xbmc/inputstream.adaptive"; description = "Kodi inputstream addon for several manifest types"; platforms = platforms.all; license = licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix new file mode 100644 index 0000000000..32b55d5e0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -0,0 +1,24 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, kodi, bzip2, zlib }: + +buildKodiBinaryAddon rec { + pname = "inputstream-ffmpegdirect"; + namespace = "inputstream.ffmpegdirect"; + version = "1.19.4"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = "inputstream.ffmpegdirect"; + rev = "${version}-${rel}"; + sha256 = "1ppvs6zybbi73zq1qh8klyhj99byh61c6nijmb1gd5yhg7cywf72"; + }; + + extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; + + meta = with lib; { + homepage = "https://github.com/xbmc/inputstream.ffmpegdirect/"; + description = "InputStream Client for streams that can be opened by either FFmpeg's libavformat or Kodi's cURL"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix new file mode 100644 index 0000000000..c575cfccfc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix @@ -0,0 +1,24 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, openssl, rtmpdump, zlib }: + +buildKodiBinaryAddon rec { + pname = "inputstream-rtmp"; + namespace = "inputstream.rtmp"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = "inputstream.rtmp"; + rev = "${version}-${rel}"; + sha256 = "1q4k6plkjasnjs7gnbcc1x2mwr562ach7bkqk1z1y343s0dp9qnq"; + }; + + extraBuildInputs = [ openssl rtmpdump zlib ]; + + meta = with lib; { + homepage = "https://github.com/xbmc/inputstream.rtmp/"; + description = "Client for RTMP streams"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix index e187fad973..e258270dad 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "0vv3234gg4brp0gvrsl4vdskmpfbyk4z7cjmmj31zn4m8j33japn"; + sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 9f160b4fa6..7fe0ed08e8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -1,17 +1,29 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, zlib, pugixml }: +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub +, pugixml, zlib +, inputstream-adaptive, inputstream-ffmpegdirect, inputstream-rtmp +}: + buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.4.2"; + version = "7.5.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; + sha256 = "1q470v9nipnrca0rbwvqlbxw9ccbl9s1k46hwwrh94vhyp5rjlib"; }; - extraBuildInputs = [ zlib pugixml ]; + extraBuildInputs = [ + pugixml + zlib + ]; + propagatedBuildInputs = [ + inputstream-adaptive + inputstream-ffmpegdirect + inputstream-rtmp + ]; meta = with lib; { homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix index 6819f7bfdc..2db17f17ab 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, lzma, bzip2, zlib, lz4, lzo, openssl }: +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, xz, bzip2, zlib, lz4, lzo, openssl }: buildKodiBinaryAddon rec { pname = namespace; namespace = "vfs.libarchive"; @@ -11,7 +11,7 @@ buildKodiBinaryAddon rec { sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; }; - extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; + extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; meta = with lib; { description = "LibArchive Virtual Filesystem add-on for Kodi"; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix new file mode 100644 index 0000000000..e6ce955e05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix @@ -0,0 +1,560 @@ +{ lib, stdenv, callPackage, fetchFromGitHub +, cmake, kodi, libcec_platform, tinyxml, pugixml +, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib +, python3Packages, expat, glib, nspr, nss, openssl +, libssh, libarchive, xz, bzip2, lz4, lzo }: + +with lib; + +let self = rec { + + addonDir = "/share/kodi/addons"; + rel = "Matrix"; + + inherit kodi; + + # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix + toKodiAddon = drv: drv.overrideAttrs(oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {})// { + kodiAddonFor = kodi; + requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs; + }; + }); + + # Check whether a derivation provides a Kodi addon. + hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi; + + # Get list of required Kodi addons given a list of derivations. + requiredKodiAddons = drvs: let + modules = filter hasKodiAddon drvs; + in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules)); + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "17.1"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodi libcec_platform tinyxml ]; + }; + + buildKodiAddon = + { name ? "${attrs.pname}-${attrs.version}" + , namespace + , sourceDir ? "" + , ... } @ attrs: + toKodiAddon (stdenv.mkDerivation ({ + name = "kodi-" + name; + + dontStrip = true; + + extraRuntimeDependencies = [ ]; + + installPhase = '' + cd $src/$sourceDir + d=$out${addonDir}/${namespace} + mkdir -p $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R "$sauce/"* $d + ''; + } // attrs)); + + buildKodiBinaryAddon = + { name ? "${attrs.pname}-${attrs.version}" + , namespace + , version + , extraBuildInputs ? [] + , extraRuntimeDependencies ? [] + , extraInstallPhase ? "", ... } @ attrs: + toKodiAddon (stdenv.mkDerivation ({ + name = "kodi-" + name; + + dontStrip = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs; + + inherit extraRuntimeDependencies; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ + "-DOVERRIDE_PATHS=1" + ]; + + # kodi checks for addon .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = let n = namespace; in '' + make install + ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} + ${extraInstallPhase} + ''; + } // attrs)); + + advanced-launcher = buildKodiAddon rec { + + pname = "advanced-launcher"; + namespace = "plugin.program.advanced.launcher"; + version = "2.5.8"; + + src = fetchFromGitHub { + owner = "edwtjo"; + repo = pname; + rev = version; + sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=85724"; + description = "A program launcher for Kodi"; + longDescription = '' + Advanced Launcher allows you to start any Linux, Windows and + macOS external applications (with command line support or not) + directly from the Kodi GUI. Advanced Launcher also give you + the possibility to edit, download (from Internet resources) + and manage all the meta-data (informations and images) related + to these applications. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 + }; + + }; + + advanced-emulator-launcher = buildKodiAddon rec { + + pname = "advanced-emulator-launcher"; + namespace = "plugin.program.advanced.emulator.launcher"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "Wintermute0110"; + repo = namespace; + rev = version; + sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=287826"; + description = "A program launcher for Kodi"; + longDescription = '' + Advanced Emulator Launcher is a multi-emulator front-end for Kodi + scalable to collections of thousands of ROMs. Includes offline scrapers + for MAME and No-Intro ROM sets and also supports scrapping ROM metadata + and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML + DATs. Launching of games and standalone applications is also available. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + broken = true; # requires port to python3 + }; + + }; + + controllers = let + pname = "game-controller"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "kodi-game-controllers"; + rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; + sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; + }; + + meta = { + description = "Add support for different gaming controllers."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + mkController = controller: { + ${controller} = buildKodiAddon rec { + pname = pname + "-" + controller; + namespace = "game.controller." + controller; + sourceDir = "addons/" + namespace; + inherit version src meta; + }; + }; + in (mkController "default") + // (mkController "dreamcast") + // (mkController "gba") + // (mkController "genesis") + // (mkController "mouse") + // (mkController "n64") + // (mkController "nes") + // (mkController "ps") + // (mkController "snes"); + + hyper-launcher = let + pname = "hyper-launcher"; + version = "1.5.2"; + src = fetchFromGitHub rec { + name = pname + "-" + version + ".tar.gz"; + owner = "teeedubb"; + repo = owner + "-xbmc-repo"; + rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6"; + sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; + }; + meta = { + 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 = buildKodiAddon { + pname = pname + "-service"; + version = "1.2.1"; + namespace = "service.hyper.launcher"; + inherit src meta; + }; + plugin = buildKodiAddon { + namespace = "plugin.hyper.launcher"; + inherit pname version src meta; + }; + }; + + joystick = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "peripheral.joystick"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; + }; + + meta = { + description = "Binary addon for raw joystick input."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + extraBuildInputs = [ tinyxml udev ]; + }; + + simpleplugin = buildKodiAddon rec { + pname = "simpleplugin"; + namespace = "script.module.simpleplugin"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "romanvm"; + repo = namespace; + rev = "v.${version}"; + sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j"; + }; + + meta = { + homepage = src.meta.homepage; + description = "Simpleplugin API"; + license = licenses.gpl3; + broken = true; # requires port to python3 + }; + }; + + svtplay = buildKodiAddon rec { + + pname = "svtplay"; + namespace = "plugin.video.svtplay"; + version = "5.1.12"; + + src = fetchFromGitHub { + name = pname + "-" + version + ".tar.gz"; + owner = "nilzen"; + repo = "xbmc-" + pname; + rev = "v${version}"; + sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=67110"; + description = "Watch content from SVT Play"; + longDescription = '' + With this addon you can stream content from SVT Play + (svtplay.se). The plugin fetches the video URL from the SVT + Play website and feeds it to the Kodi video player. HLS (m3u8) + is the preferred video format by the plugin. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + + steam-controller = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "peripheral.steamcontroller"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = namespace; + rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb"; + sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg"; + }; + + extraBuildInputs = [ libusb1 ]; + + meta = { + description = "Binary addon for steam controller."; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + + steam-launcher = buildKodiAddon { + + pname = "steam-launcher"; + namespace = "script.steam.launcher"; + version = "3.5.1"; + + src = fetchFromGitHub rec { + owner = "teeedubb"; + repo = owner + "-xbmc-repo"; + rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55"; + sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k"; + }; + + propagatedBuildInputs = [ steam ]; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=157499"; + description = "Launch Steam in Big Picture Mode from Kodi"; + longDescription = '' + This add-on will close/minimise Kodi, launch Steam in Big + Picture Mode and when Steam BPM is exited (either by quitting + Steam or returning to the desktop) Kodi will + restart/maximise. Running pre/post Steam scripts can be + configured via the addon. + ''; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + + pdfreader = buildKodiAddon rec { + pname = "pdfreader"; + namespace = "plugin.image.pdf"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "i96751414"; + repo = "plugin.image.pdfreader"; + rev = "v${version}"; + sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; + }; + + meta = { + homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; + description = "A comic book reader"; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + + pvr-hts = buildKodiBinaryAddon rec { + + pname = "pvr-hts"; + namespace = "pvr.hts"; + version = "8.2.2"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hts"; + rev = "${version}-${rel}"; + sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q"; + }; + + meta = { + homepage = "https://github.com/kodi-pvr/pvr.hts"; + description = "Kodi's Tvheadend HTSP client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ cpages ]; + }; + + }; + + pvr-hdhomerun = buildKodiBinaryAddon rec { + + pname = "pvr-hdhomerun"; + namespace = "pvr.hdhomerun"; + version = "7.1.0"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hdhomerun"; + rev = "${version}-${rel}"; + sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; + }; + + meta = { + homepage = "https://github.com/kodi-pvr/pvr.hdhomerun"; + description = "Kodi's HDHomeRun PVR client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ titanous ]; + }; + + extraBuildInputs = [ jsoncpp libhdhomerun ]; + + }; + + pvr-iptvsimple = buildKodiBinaryAddon rec { + + pname = "pvr-iptvsimple"; + namespace = "pvr.iptvsimple"; + version = "7.4.2"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.iptvsimple"; + rev = "${version}-${rel}"; + sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; + }; + + meta = { + homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; + description = "Kodi's IPTV Simple client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; + + extraBuildInputs = [ zlib pugixml ]; + }; + + osmc-skin = buildKodiAddon rec { + + pname = "osmc-skin"; + namespace = "skin.osmc"; + version = "18.0.0"; + + src = fetchFromGitHub { + owner = "osmc"; + repo = namespace; + rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0"; + sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s"; + }; + + meta = { + homepage = "https://github.com/osmc/skin.osmc"; + description = "The default skin for OSMC"; + platforms = platforms.all; + maintainers = with maintainers; [ worldofpeace ]; + license = licenses.cc-by-nc-sa-30; + }; + }; + + yatp = python3Packages.toPythonModule (buildKodiAddon rec { + pname = "yatp"; + namespace = "plugin.video.yatp"; + version = "3.3.2"; + + src = fetchFromGitHub { + owner = "romanvm"; + repo = "kodi.yatp"; + rev = "v.${version}"; + sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d"; + }; + + patches = [ ./yatp/dont-monkey.patch ]; + + propagatedBuildInputs = [ + simpleplugin + 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 + }; + }); + + inputstream-adaptive = buildKodiBinaryAddon rec { + + pname = "inputstream-adaptive"; + namespace = "inputstream.adaptive"; + version = "2.6.7"; + + src = fetchFromGitHub { + owner = "peak3d"; + repo = "inputstream.adaptive"; + rev = "${version}-${rel}"; + sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s"; + }; + + extraBuildInputs = [ expat ]; + + extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + + extraInstallPhase = let n = namespace; in '' + ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so + ''; + + meta = { + homepage = "https://github.com/peak3d/inputstream.adaptive"; + description = "Kodi inputstream addon for several manifest types"; + platforms = platforms.all; + maintainers = with maintainers; [ sephalon ]; + }; + }; + + vfs-sftp = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "vfs.sftp"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; + }; + + meta = with lib; { + description = "SFTP Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ openssl libssh zlib ]; + }; + + vfs-libarchive = buildKodiBinaryAddon rec { + pname = namespace; + namespace = "vfs.libarchive"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; + }; + + meta = with lib; { + description = "LibArchive Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ]; + }; +}; in self diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index 1b665418f3..6f926176ea 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -230,6 +230,7 @@ in stdenv.mkDerivation { passthru = { pythonPackages = python3Packages; + ffmpeg = ffmpeg; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch deleted file mode 100644 index 7a7378faa5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/cargo-lock-vendor-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e566ed25..a661a963 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -689,7 +689,7 @@ dependencies = [ - "serde", - "serde_derive", - "serde_json", -- "vfio-bindings 0.2.0 (git+https://github.com/rust-vmm/vfio-bindings)", -+ "vfio-bindings", - "vfio-ioctls", - "vm-allocator", - "vm-device", -@@ -1346,17 +1346,12 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] - name = "vfio-bindings" - version = "0.2.0" --source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7" - dependencies = [ - "vmm-sys-util", - ] - --[[package]] --name = "vfio-bindings" --version = "0.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7" -- - [[package]] - name = "vfio-ioctls" - version = "0.1.0" -@@ -1366,7 +1361,7 @@ dependencies = [ - "kvm-bindings", - "kvm-ioctls", - "log 0.4.8", -- "vfio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vfio-bindings", - "vm-memory", - "vmm-sys-util", - ] -diff --git a/pci/Cargo.toml b/pci/Cargo.toml -index 9c6955c7..4ecf8e6b 100644 ---- a/pci/Cargo.toml -+++ b/pci/Cargo.toml -@@ -23,5 +23,5 @@ vm-memory = "0.2.1" - vm-migration = { path = "../vm-migration" } - - [dependencies.vfio-bindings] --git = "https://github.com/rust-vmm/vfio-bindings" -+version = "0.2.0" - features = ["fam-wrappers"] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 32d5be13d3..5a12be3afa 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -1,28 +1,27 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, dtc, openssl }: rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "0.8.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI="; + sha256 = "0pnfg6dzpz8v40cwg3dmlj52x8pblavv7mkczar814dwbk01y7vr"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoPatches = [ ./cargo-lock-vendor-fix.patch ]; - cargoSha256 = "fOIB+qVDqAAgQPW3bK2NfST24GzYJeRXgaMFXyNPcPQ="; + cargoSha256 = "0dbjds40znly11i0ssfv66w82ynxp00ixw1349m5ln9i9ms94sr4"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM"; changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}"; license = with licenses; [ asl20 bsd3 ]; - maintainers = with maintainers; [ offline ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ offline qyliss ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 3628443674..5e84b883b6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { makeFlags = [ "bin/conmon" ]; installPhase = '' + runHook preInstall install -D bin/conmon -t $out/bin + runHook postInstall ''; passthru.tests = { inherit (nixosTests) cri-o podman; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 8a7399cf66..d3a440fefc 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -41,10 +41,13 @@ buildGoModule rec { BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' + runHook preBuild make binaries docs BUILDTAGS="$BUILDTAGS" + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 bin/* -t $out/bin for shell in bash fish zsh; do @@ -52,6 +55,7 @@ buildGoModule rec { done installManPage docs/*.[1-9] + runHook postInstall ''; passthru.tests = { inherit (nixosTests) cri-o; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index c050057678..233ee13ead 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.28.5"; + version = "1.28.6"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "b3ff8f0352eb4055c4c483cb498aeff7c90195fa679f3caf7098a2d6fa6030e5"; + sha256 = "1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281"; }; # lots of networking and other fails diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 73f4812ee5..a6f64444f8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -13,7 +13,7 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute, lvm2, systemd, docker-buildx + , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests @@ -72,7 +72,7 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); buildPhase = '' export GOCACHE="$TMPDIR/go-cache" diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix index 56760c293e..e6b83286c0 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix @@ -5,7 +5,7 @@ , git , glibcLocales , go -, iproute +, iproute2 , iptables , makeWrapper , procps @@ -87,7 +87,7 @@ in buildBazelPackage rec { # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ - --prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} + --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]} ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix index 3ce493c617..dd16fb4d25 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; + sha256 = "0rr6ngkzqgw250nilv36fz7fhsqxcgl4nhld2hnr0sr4ngirqcjp"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 1afe994977..e56293dcc6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}" + --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 32160616c8..b64fc82f53 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-+z28Z0KvaJa32+eTGFsNX8g/WVd3BohKoBnNPU/kpWM="; + sha256 = "sha256-Cql9ikk0lo/LeWNykEJSKgfGnBSUU5vOh/zUIEvMapk="; }; patches = [ @@ -48,14 +48,18 @@ buildGoModule rec { ]; buildPhase = '' + runHook preBuild patchShebangs . ${if stdenv.isDarwin then "make podman-remote" else "make podman"} make docs + runHook postBuild ''; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = '' + runHook preInstall + '' + lib.optionalString stdenv.isDarwin '' mv bin/{podman-remote,podman} '' + '' install -Dm555 bin/podman $out/bin/podman @@ -66,6 +70,8 @@ buildGoModule rec { '' + 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 + '' + '' + runHook postInstall ''; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index f9fbec9f4b..152cbf6199 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -35,17 +35,21 @@ buildGoPackage rec { makeFlags = [ "BUILDTAGS+=seccomp" ]; buildPhase = '' + runHook preBuild cd go/src/${goPackagePath} patchShebangs . make ${toString makeFlags} runc man + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 runc $out/bin/runc installManPage man/*/*.[1-9] wrapProgram $out/bin/runc \ --prefix PATH : ${lib.makeBinPath [ procps ]} \ --prefix PATH : /run/current-system/systemd/bin + runHook postInstall ''; passthru.tests = { inherit (nixosTests) cri-o docker podman; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index b90033e438..ea3b87b47e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; version = "6.6.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D x11docker "$out/bin/x11docker"; wrapProgram "$out/bin/x11docker" \ - --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" + --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute2 nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix index 5019ce2328..3d0ff3a6f3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix @@ -13,7 +13,7 @@ config: # Scripts , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools -, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd +, iproute2, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd , lvm2, util-linux, procps, systemd # Documentation @@ -31,7 +31,7 @@ let scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ which perl coreutils gawk gnused gnugrep diffutils util-linux multipath-tools - iproute inetutils iptables bridge-utils openvswitch nbd drbd + iproute2 inetutils iptables bridge-utils openvswitch nbd drbd ]; withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles); diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix index 69c9cc1c37..24c5950815 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, bison, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXinerama libXrandr libXft yacc ]; + buildInputs = [ libX11 libXinerama libXrandr libXft bison ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix index d419b0ebe3..e32cd38ec2 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,10 +1,10 @@ { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils -, enableNetwork ? true, dnsutils, iproute, wirelesstools }: +, enableNetwork ? true, dnsutils, iproute2, wirelesstools }: let bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] - ++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ]; + ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ]; in rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix new file mode 100644 index 0000000000..d24715aa98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "i3-auto-layout"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "chmln"; + repo = pname; + rev = "v${version}"; + sha256 = "0ps08lga6qkgc8cgf5cx2lgwlqcnd2yazphh9xd2fznnzrllfxxz"; + }; + + cargoSha256 = "1ch5mh515rlqmr65x96xcvrx6iaigqgjxc7sbwbznzkc5kmvwhc0"; + + # Currently no tests are implemented, so we avoid building the package twice + doCheck = false; + + meta = with lib; { + description = "Automatic, optimal tiling for i3wm"; + homepage = "https://github.com/chmln/i3-auto-layout"; + license = licenses.mit; + maintainers = with maintainers; [ mephistophiles ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix index 9c97c72ad5..df774aa417 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, perl, makeWrapper -, iproute, acpi, sysstat, alsaUtils +, iproute2, acpi, sysstat, alsaUtils , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" "load_average" "memory" "volume" "wifi" ] }: @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} + --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute2)} wrapProgram $out/libexec/i3blocks/battery \ --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} wrapProgram $out/libexec/i3blocks/cpu_usage \ --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} + --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)} wrapProgram $out/libexec/i3blocks/volume \ --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} ''; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix new file mode 100644 index 0000000000..35751da817 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "i3-ratiosplit"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "333fred"; + repo = pname; + rev = "v${version}"; + sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; + }; + + cargoSha256 = "0d5qd1wid5l1pl3ckrlfgdb980myi5gxcir39caywb9pkbnfndz6"; + + # Currently no tests are implemented, so we avoid building the package twice + doCheck = false; + + meta = with lib; { + description = "Resize newly created windows"; + homepage = "https://github.com/333fred/i3-ratiosplit"; + license = licenses.mit; + maintainers = with maintainers; [ svrana ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix index 04c232a3e8..bab0439bf8 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; + changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix index ebabcf196d..830242667d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; - broken = desktopSupport == "gnomeflashback"; + broken = desktopSupport == "gnomeflashback" || desktopSupport == "xfce4"; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/third_party/nixpkgs/pkgs/build-support/agda/default.nix b/third_party/nixpkgs/pkgs/build-support/agda/default.nix index d610a8f9a6..984d61f1f7 100644 --- a/third_party/nixpkgs/pkgs/build-support/agda/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages }: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }: with lib.strings; @@ -18,7 +18,10 @@ let in runCommandNoCC "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ makeWrapper ]; - passthru.unwrapped = Agda; + passthru = { + unwrapped = Agda; + tests = { inherit (nixosTests) agda; }; + }; } '' mkdir -p $out/bin makeWrapper ${Agda}/bin/agda $out/bin/agda \ diff --git a/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix b/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix index 5fafc36273..c2186cf6bf 100644 --- a/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix @@ -74,7 +74,7 @@ runCommand name preferLocalBuild = true; allowSubstitutes = false; # XXX: The size is somewhat arbitrary - passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; + passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ]; } '' ${buildPackages.perl}/bin/perl -w ${builder} diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh index d08fd24cd2..b402893100 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -132,12 +132,13 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then fi if [[ "$isCpp" = 1 ]]; then - if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" - fi NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" fi +if [[ "$cppInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" +fi + source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix index c65738aef4..8ce69a7f18 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix @@ -104,7 +104,9 @@ let if urls != [] && url == "" then (if lib.isList urls then urls else throw "`urls` is not a list") - else if urls == [] && url != "" then [url] + else if urls == [] && url != "" then + (if lib.isString url then [url] + else throw "`url` is not a string") else throw "fetchurl requires either `url` or `urls` to be set"; hash_ = diff --git a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix index 97df52eace..ac51b90e01 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix @@ -83,9 +83,9 @@ stdenv.mkDerivation ( ''; } - // args // + // removeAttrs args [ "lib" ] # Propagating lib causes the evaluation to fail, because lib is a function that can't be converted to a string - { + // { name = name + (if src ? version then "-" + src.version else ""); postHook = '' diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index eab5366e18..4995efd9a4 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -1,27 +1,12 @@ { lib, stdenv, stdenvNoCC, lndir, runtimeShell }: -let - - runCommand' = runLocal: stdenv: name: env: buildCommand: - stdenv.mkDerivation ({ - name = lib.strings.sanitizeDerivationName name; - inherit buildCommand; - passAsFile = [ "buildCommand" ]; - } - // (lib.optionalAttrs runLocal { - preferLocalBuild = true; - allowSubstitutes = false; - }) - // env); - -in - rec { /* Run the shell command `buildCommand' to produce a store path named * `name'. The attributes in `env' are added to the environment - * prior to running the command. By default `runCommand' runs using - * stdenv with no compiler environment. `runCommandCC` + * prior to running the command. By default `runCommand` runs in a + * stdenv with no compiler environment. `runCommandCC` uses the default + * stdenv, `pkgs.stdenv`. * * Examples: * runCommand "name" {envVariable = true;} ''echo hello > $out'' @@ -42,13 +27,64 @@ rec { runCommand = runCommandNoCC; runCommandLocal = runCommandNoCCLocal; - runCommandNoCC = runCommand' false stdenvNoCC; - runCommandNoCCLocal = runCommand' true stdenvNoCC; + runCommandNoCC = name: env: runCommandWith { + stdenv = stdenvNoCC; + runLocal = false; + inherit name; + derivationArgs = env; + }; + runCommandNoCCLocal = name: env: runCommandWith { + stdenv = stdenvNoCC; + runLocal = true; + inherit name; + derivationArgs = env; + }; - runCommandCC = runCommand' false stdenv; + runCommandCC = name: env: runCommandWith { + stdenv = stdenv; + runLocal = false; + inherit name; + derivationArgs = env; + }; # `runCommandCCLocal` left out on purpose. # We shouldn’t force the user to have a cc in scope. + /* Generalized version of the `runCommand`-variants + * which does customized behavior via a single + * attribute set passed as the first argument + * instead of having a lot of variants like + * `runCommand*`. Additionally it allows changing + * the used `stdenv` freely and has a more explicit + * approach to changing the arguments passed to + * `stdenv.mkDerivation`. + */ + runCommandWith = + let + # prevent infinite recursion for the default stdenv value + defaultStdenv = stdenv; + in + { stdenv ? defaultStdenv + # which stdenv to use, defaults to a stdenv with a C compiler, pkgs.stdenv + , runLocal ? false + # whether to build this derivation locally instead of substituting + , derivationArgs ? {} + # extra arguments to pass to stdenv.mkDerivation + , name + # name of the resulting derivation + }: buildCommand: + stdenv.mkDerivation ({ + name = lib.strings.sanitizeDerivationName name; + inherit buildCommand; + passAsFile = [ "buildCommand" ] + ++ (derivationArgs.passAsFile or []); + } + // (lib.optionalAttrs runLocal { + preferLocalBuild = true; + allowSubstitutes = false; + }) + // builtins.removeAttrs derivationArgs [ "passAsFile" ]); + + /* Writes a text file to the nix store. * The contents of text is added to the file in the store. * diff --git a/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix index 759245aed1..f6be1b299f 100644 --- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/vm/default.nix @@ -573,7 +573,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc lzma ]} + PATH=$PATH:${lib.makeBinPath [ dpkg dpkg glibc xz ]} # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. diff --git a/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix b/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix new file mode 100644 index 0000000000..fd21d1964a --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl }: + +let + version = "1.0"; +in fetchurl rec { + name = "curie-${version}"; + + url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + + downloadToTemp = true; + + recursiveHash = true; + + sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A="; + + postFetch = '' + tar xzf $downloadedFile + mkdir -p $out/share/fonts/misc + install *.otb $out/share/fonts/misc + ''; + + meta = with lib; { + description = "An upscaled version of scientifica"; + homepage = "https://github.com/NerdyPepper/curie"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix new file mode 100644 index 0000000000..c9e5131973 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub }: + +let + pname = "kreative-square-fonts"; + version = "unstable-2021-01-29"; +in +fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "kreativekorp"; + repo = "open-relay"; + rev = "084f05af3602307499981651eca56851bec01fca"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf + install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf + ''; + sha256 = "15vvbbzv6b3jh7lxg77viycdd7yf3y8lxy54vs3rsrsxwncg0pak"; + + meta = with lib; { + description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; + homepage = "https://www.kreativekorp.com/software/fonts/ksquare.shtml"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 1d4c3866b4..ff18baf75f 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210302"; + version = "20210401"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0"; + sha256 = "sha256-t0zoeIpj+0QVH1wmbEIJdqzEDOGzpclePv+bcZgtnwo="; }; nativeBuildInputs = [ @@ -25,12 +25,14 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall mkdir -p $out/share/icons mv {,e}Papirus* $out/share/icons for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + runHook postInstall ''; meta = with lib; { @@ -39,6 +41,6 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = with maintainers; [ romildo fortuneteller2k ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix index e50aa81656..9357a60a91 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -10,13 +10,6 @@ with lib; let - - certdata2pem = fetchurl { - name = "certdata2pem.py"; - url = "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py"; - sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; - }; - version = "3.60"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in @@ -29,6 +22,15 @@ stdenv.mkDerivation { sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0="; }; + certdata2pem = fetchurl { + name = "certdata2pem.py"; + urls = [ + "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py" + "https://git.launchpad.net/ubuntu/+source/ca-certificates/plain/mozilla/certdata2pem.py?id=47e49e1e0a8a1ca74deda27f88fe181191562957" + ]; + sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; + }; + outputs = [ "out" "unbundled" ]; nativeBuildInputs = [ python3 ]; @@ -40,7 +42,8 @@ stdenv.mkDerivation { ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} EOF - cat ${certdata2pem} > certdata2pem.py + # copy from the store, otherwise python will scan it for imports + cat "$certdata2pem" > certdata2pem.py ''; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index 5297fe0568..08d0f51094 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-02-04"; + version = "2021-04-05"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-CDym+yqLu7QpqmdUpXAbJTCjQf/r9D1sl7ZdpaWaXFE="; + sha256 = "0bm7hr4lqqz3z2miif38628r4qcy7i5hdk6sm0ngjacm43cl0qvg"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -16,16 +16,18 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall patchShebangs . mkdir -p $out/share/themes name= ./install.sh -d $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml mkdir -p $out/share/doc/${pname} cp -a src/extra/firefox $out/share/doc/${pname} + runHook postInstall ''; meta = with lib; { - description = "A stylish flat Design theme for GTK based desktop environments"; + description = "A stylish flat design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; license = licenses.gpl3Only; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index fa2fb86a5c..f0a80bc525 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.38.2"; + version = "3.38.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1"; + sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 4e7892c048..1374cfc935 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,15 +1,13 @@ { lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: -let +stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix index 5187f51cbf..cec0ac7a68 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp"; + sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index b943a02a56..dc43bdfd49 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja -, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber +, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber , gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite kerberos openldap webkitgtk glib-networking + icu sqlite libkrb5 openldap webkitgtk glib-networking libcanberra-gtk3 pcre libphonenumber boost protobuf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 603aaf1744..f8c458a3df 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,6 +1,5 @@ { fetchurl , fetchFromGitLab -, fetchpatch , lib, stdenv , substituteAll , accountsservice @@ -70,11 +69,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.38.1"; + version = "3.38.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d"; + sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk="; }; # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html @@ -151,22 +150,6 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) - - # Fix double free when leaving user accounts panel. - # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch"; - sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch"; - sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU="; - }) - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch"; - sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4="; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index bfe0bfe9d6..c6d8b31930 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.38.2"; + version = "3.38.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9"; + sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 95dfd0ef28..5c573d2502 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k="; + sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index d2909c449d..435da4e372 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.38.2"; + version = "3.38.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g="; + sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 56408d464d..2cd22e3cea 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.38.2"; + version = "3.38.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k"; + sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix index 1ac0be1b19..07e3b536a4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.2"; + version = "3.38.3"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr"; + sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 6d28228392..64009cd75e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy"; + sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index d4b6561c0d..22ce6c7201 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.38.1"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk"; + sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix index 62c5994fd4..754a774866 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "3.38.1"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl"; + sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix new file mode 100644 index 0000000000..0a9145de3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-disable-unredirect"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "kazysmaster"; + repo = "gnome-shell-extension-disable-unredirect"; + rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; + sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; + }; + + uuid = "unredirect@vaina.lt"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/gnome-shell/extensions + cp -R ${uuid} $out/share/gnome-shell/extensions/${uuid} + + runHook postInstall + ''; + + meta = with lib; { + description = "Disables unredirect fullscreen windows in gnome-shell to avoid tearing"; + license = licenses.gpl3Only; + homepage = "https://github.com/kazysmaster/gnome-shell-extension-disable-unredirect"; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 54af3281dc..084548e1a1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, glib, gnome3, gettext }: +{ lib, stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-topicons-plus"; - version = "22"; + version = "27"; src = fetchFromGitHub { owner = "phocean"; repo = "TopIcons-plus"; - rev = "v${version}"; - sha256 = "196s1gdir52gbc444pzrb5l7gn5xr5vqk5ajqaiqryqlmp3i8vil"; + rev = version; + sha256 = "1p3jlvs4zgnrvy8am7myivv4rnnshjp49kg87rd22qqyvcz51ykr"; }; buildInputs = [ glib ]; @@ -21,10 +21,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ eperuffo ]; homepage = "https://github.com/phocean/TopIcons-plus"; - # Unmaintained and no longer working with GNOME Shell 3.34+ - broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix index a209f2d2d9..ff97d34f7c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -118,6 +118,10 @@ stdenv.mkDerivation rec { patchShebangs build-aux/yaml_to_json.py chmod +x desktop/geary-attach + + # Drop test that breaks after webkitgtk 2.32.0 update + # https://gitlab.gnome.org/GNOME/geary/-/issues/1180 + sed -i '/add_test("edit_context_font", edit_context_font);/d' test/js/composer-page-state-test.vala ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix index cf815b8082..75e0fd6917 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix @@ -3,7 +3,7 @@ , extra-cmake-modules , gettext , kdoctools -, python +, python3 , appstream-qt , discount , flatpak @@ -34,7 +34,7 @@ mkDerivation { name = "discover"; meta.broken = lib.versionOlder qtbase.version "5.15.0"; - nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ]; buildInputs = [ # discount is needed for libmarkdown appstream-qt diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/gigolo/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/gigolo/default.nix index 251866528e..b9ff011f3b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -1,17 +1,22 @@ -{ mkXfceDerivation, exo, gtk3, gvfs, glib }: +{ lib, mkXfceDerivation, gtk3, gvfs, glib }: mkXfceDerivation { category = "apps"; pname = "gigolo"; - version = "0.5.1"; + version = "0.5.2"; odd-unstable = false; - sha256 = "11a35z5apr26nl6fpmbsvvv3xf5w61sgzcb505plavrchpfbdxjn"; + sha256 = "8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY="; - nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 glib gvfs ]; + postPatch = '' + # exo-csource has been dropped from exo + substituteInPlace src/Makefile.am --replace exo-csource xdt-csource + ''; + meta = { description = "A frontend to easily manage connections to remote filesystems"; + license = with lib.licenses; [ gpl2Only ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch new file mode 100644 index 0000000000..aa797bf42c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/allow-checking-parent-sources-when-looking-up-schema.patch @@ -0,0 +1,25 @@ +From 3b06d6129033ddaa8dc455a6a572077fd63a3816 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Mon, 1 Mar 2021 17:03:07 -0300 +Subject: [PATCH] Allow checking parent sources when looking up schema + +--- + mousepad/mousepad-settings-store.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c +index e5a848b..de989bd 100644 +--- a/mousepad/mousepad-settings-store.c ++++ b/mousepad/mousepad-settings-store.c +@@ -181,7 +181,7 @@ mousepad_settings_store_add_settings (MousepadSettingsStore *self, + const gchar *prefix; + + /* loop through keys in schema and store mapping of their setting name to GSettings */ +- schema = g_settings_schema_source_lookup (source, schema_id, FALSE); ++ schema = g_settings_schema_source_lookup (source, schema_id, TRUE); + keys = g_settings_schema_list_keys (schema); + prefix = schema_id + MOUSEPAD_ID_LEN + 1; + for (key = keys; key && *key; key++) +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index 3c84f5558a..eaac32bb5e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,20 +1,20 @@ -{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }: +{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview3, xfconf }: mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.4.2"; + version = "0.5.3"; odd-unstable = false; - sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; + sha256 = "0ki5k5p24dpawkyq4k8am1fcq02njhnmhq5vf2ah1zqbc0iyl5yn"; - nativeBuildInputs = [ exo ]; - buildInputs = [ glib gtk3 gtksourceview3 xfconf ]; + nativeBuildInputs = [ gobject-introspection vala ]; - # See https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + buildInputs = [ gtk3 gtksourceview3 xfconf ]; + + patches = [ ./allow-checking-parent-sources-when-looking-up-schema.patch ]; meta = { - description = "A simple text editor for Xfce"; + description = "Simple text editor for Xfce"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/parole/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/parole/default.nix index bfb8651844..5c55a22ea7 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/parole/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/parole/default.nix @@ -7,9 +7,9 @@ mkXfceDerivation { category = "apps"; pname = "parole"; - version = "1.0.5"; + version = "4.16.0"; - sha256 = "0qgis2gnkcvg7xwp76cbi0ihqdjprvvw2d66hk7klhrafp7c0v13"; + sha256 = "07hcnbcd56lq7z3gq1cnk71ppy98hwdvlfp5z3zlc55cqrry26zm"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix index 8766bd302a..e439c3d055 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif +{ mkXfceDerivation, gtk3, glib, libexif , libxfce4ui, libxfce4util, xfconf }: mkXfceDerivation { @@ -8,9 +8,13 @@ mkXfceDerivation { sha256 = "07h7wbq3xh2ac6q4kp2ai1incfn0zfxxngap7hzqx47a5xw2mrm8"; - nativeBuildInputs = [ exo ]; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; + postPatch = '' + # exo-csource has been dropped from exo + substituteInPlace src/Makefile.am --replace exo-csource xdt-csource + ''; + meta = { description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index 7e582abc05..6761d2ed5c 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0p7k2ffknr23hh3j17dhh5q8adn736p2piwx0sg8f5dvvhhc5whz"; + sha256 = "0gm5gwqxhnv3qz9ggf8dj1sq5s72xcliidkyip9l91msx03hfjah"; patches = [ ./configure-gio.patch ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index c9a6148884..64ab34d2b6 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.1"; + version = "0.6.2"; - sha256 = "18d2q5b54df8j2281lash8gm0826c6apn39q4igfz2zfcyqjh1if"; + sha256 = "1q8n7dffyqbfyy6vpqlmnsfpavlc7iz6hhv1h27fkwzswy2rx28s"; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 8c0fa3e3ed..3098b9c756 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.7"; + version = "1.9.8"; odd-unstable = false; - sha256 = "14vbd7iigaw57hl47rnixk873c20q5clqynzkm9zzpqc568dxixd"; + sha256 = "0pbzjcaxm8gk0s75s99kvzygmih4yghp7ngf2mxymjiywcxqr40d"; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index fd59b173a7..5a1510eaa8 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.3"; + version = "1.4.2"; - sha256 = "0818chns7vkvjqakgz8z790adkygcq4jlw59dv6kyzk17hxq6cxv"; + sha256 = "1l7k00y3d9j38g4hxjrcrh1y4s6s77sq4sjcadsbpzs6zdf05hld"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 libwnck3 libXmu ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 56de8d3bfb..19d98f84e3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,11 +1,13 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2 }: +{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.9.2"; + version = "0.8.10"; - sha256 = "1vlpfsrdalqmsd86aj0kvvam5skzn6xngigjziwli6q6il6lb9fj"; + sha256 = "0v58qcrdpqpd2nbwlc4ra7j9nkvfzfhb1zcp1kggbn627q86i0ql"; + + nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ]; buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix index a9610125b5..8373616694 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.7.7"; + version = "0.9.1"; rev-prefix = ""; odd-unstable = false; - sha256 = "0b9pl3k8wl7svwhb9knhvr86gjg2904n788l8cbczwy046ql7pyc"; + sha256 = "14k774wxbk3w0ci2mmm6bhq4i742qahd0j0dr40iwmld55473zgd"; buildInputs = [ clutter diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 569a18a796..31623598d3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.xfce.org/"; description = "Themes for Xfce"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.volth ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix index 17da815534..d9afdfe0d9 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3 , libxfce4ui, libxfce4util, perl }: mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "0.12.11"; + version = "4.16.1"; - sha256 = "1db7w6jk3i501x4qw0hs0ydrm1fjdkxmahzbv5iag859wnnlg0pd"; + sha256 = "1220mq8gs5s8l0d1p92j6icldzqj6zaisp27ss5jm7hwkkcnms9n"; nativeBuildInputs = [ libxslt @@ -14,7 +14,6 @@ mkXfceDerivation { ]; buildInputs = [ - gtk2 # some xfce plugins still uses gtk2 gtk3 glib libxfce4ui diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix index 69184f2afa..56ce6ac8aa 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix @@ -1,15 +1,18 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }: +{ lib, mkXfceDerivation, gobject-introspection, gtk3, libxfce4ui, libxfce4util }: mkXfceDerivation { category = "xfce"; pname = "garcon"; - version = "0.6.4"; + version = "4.16.1"; - sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv"; + sha256 = "134nm1754i12axl4si60fdwkbk2v6z108nrj9c0lb5in1zmqwa9a"; + + nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; meta = { description = "Xfce menu support library"; + license = with lib.licenses; [ lgpl2Only fdl11Only ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 79c8ec74b6..e17880f1b1 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -1,15 +1,15 @@ -{ lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM -, libstartup_notification, libxfce4util, xfconf }: +{ lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM +, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }: mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.14.1"; + version = "4.16.0"; - sha256 = "0fnncf30s51qhgixn57z4d021pjjhzgsg2x69w4dy68vff2347qy"; + sha256 = "0a9wfdpsv83giwv6kcidvpd6c665aa7sv6f2l1q6qcq214vb0rk2"; - nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ gtk2 gtk3 libstartup_notification xfconf ]; + nativeBuildInputs = [ gobject-introspection vala ]; + buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; configureFlags = [ @@ -18,6 +18,6 @@ mkXfceDerivation { meta = with lib; { description = "Widgets library for Xfce"; - license = licenses.lgpl2Plus; + license = with licenses; [ lgpl2Plus lgpl21Plus ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix index 4540d23525..69c3921285 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -1,13 +1,13 @@ -{ lib, mkXfceDerivation, gobject-introspection }: +{ lib, mkXfceDerivation, gobject-introspection, vala }: mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; - version = "4.14.0"; + version = "4.16.0"; - sha256 = "0vq16bzmnykiikg4dhiaj0qbyj76nkdd54j6k6n568h3dc9ix6q4"; + sha256 = "1p0snipc81dhaq5glv7c1zfq5pcvgq7nikl4ikhfm2af9picfsxb"; - nativeBuildInputs = [ gobject-introspection ]; + nativeBuildInputs = [ gobject-introspection vala ]; meta = with lib; { description = "Extension library for Xfce"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar-volman/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar-volman/default.nix index ecc26ccb8f..6ceca34b1b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -3,11 +3,11 @@ mkXfceDerivation { category = "xfce"; pname = "thunar-volman"; - version = "0.9.5"; + version = "4.16.0"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0"; + sha256 = "002nkxsvcq384dgpj7lv3bmb21ks64hsq13l67z1dcjbj51hzl03"; odd-unstable = false; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index 00da58f662..cc94683ddd 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "1.8.15"; + version = "4.16.6"; - sha256 = "1y9d88i0kwl7ak4d65gy3qf4bpkiyaqxd4g6px3v1ykf274k8al8"; + sha256 = "12zqwazsqdmghy4h2c4fwxha069l07d46i512395y22h7n6655rn"; nativeBuildInputs = [ docbook_xsl diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/tumbler/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/tumbler/default.nix index cb6f90e5b9..510d30ae63 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/tumbler/default.nix @@ -5,7 +5,6 @@ , freetype , libgsf , poppler -, libjpeg , gst_all_1 }: @@ -14,9 +13,9 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "0.2.9"; + version = "4.16.0"; - sha256 = "0b3mli40msv35qn67c1m9rn5bigj6ls10l08qk7fa3fwvzl49hmw"; + sha256 = "1z4q858afj3yksim4lc96wylgvymv4cv6iw41qdxl5xd6ii2ddr4"; buildInputs = [ ffmpegthumbnailer diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index cbb444c6c7..01cc70e3b9 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.14.0"; + version = "4.16.1"; - sha256 = "04h7jxfm3wkxnxfy8149dckay7i160vvk4p9lnq6xny22r4x20h8"; + sha256 = "1r7sjdavqadrpgxqclrznds7a1c2i7mlvghx5mi6qqnh42425gsy"; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 38fe82ffb0..9b3f443ba3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -1,14 +1,27 @@ -{ mkXfceDerivation, autoreconfHook, autoconf, automake -, glib, gtk-doc, intltool, libtool }: +{ mkXfceDerivation +, autoreconfHook +, libxslt +, docbook_xsl +, autoconf +, automake +, glib +, gtk-doc +, intltool +, libtool +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.14.0"; + version = "4.16.0"; - sha256 = "10hcj88784faqrk08xb538355cla26vdk9ckx158hqdqv38sb42f"; + sha256 = "0w47npi1np9vb7lhzjr680aa1xb8ch6kcbg0l0bqnpm0y0jmvgz6"; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + libxslt + docbook_xsl + ]; propagatedBuildInputs = [ autoconf @@ -19,11 +32,6 @@ mkXfceDerivation { libtool ]; - preAutoreconf = '' - substitute configure.ac.in configure.ac \ - --subst-var-by REVISION UNKNOWN - ''; - setupHook = ./setup-hook.sh; meta = { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh index 600bf47fd8..3abf3172ea 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh @@ -1,5 +1,5 @@ xdtEnvHook() { - addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros + addToSearchPath ACLOCAL_PATH $1/share/aclocal } envHooks+=(xdtEnvHook) diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index b7bede9e27..0a08d38823 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,17 +1,48 @@ -{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }: +{ mkXfceDerivation +, exo +, garcon +, gettext +, glib +, gobject-introspection +, gtk3 +, libdbusmenu-gtk3 +, libwnck3 +, libxfce4ui +, libxfce4util +, tzdata +, vala +, xfconf +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.4"; + version = "4.16.2"; - sha256 = "1srzgb9vsvfrbhym74zkz9hdhxcrvbffxpfgv5vprhlwxw3vk3fq"; + sha256 = "0wy66viwjnp1c0lgf90fp3vyqy0f1m1kbfdym8a0yrv2b6sn3958"; - nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; + nativeBuildInputs = [ + gobject-introspection + vala + ]; + + buildInputs = [ + exo + garcon + libdbusmenu-gtk3 + libxfce4ui + libwnck3 + xfconf + tzdata + ]; + + propagatedBuildInputs = [ + glib + gtk3 + libxfce4util + ]; patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = [ "-p1" ]; postPatch = '' for f in $(find . -name \*.sh); do @@ -21,9 +52,10 @@ mkXfceDerivation { --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - configureFlags = [ "--enable-gtk3" ]; + # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = { + meta = { description = "Xfce's panel"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 9f9a552b8c..709b6a2a0c 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "1.6.6"; + version = "4.16.0"; - sha256 = "0lyp3dp4ijbpf21vanrvgm6rmfp8v0zyqxibdj5gxnadmvcq38iy"; + sha256 = "1rfw07xbv83rfb0mz3ayanlcvnaq7xpl2znsyya0hspysvavwks2"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix index c7442a0195..0d4c061589 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -1,11 +1,11 @@ -{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }: +{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xfce4-session }: mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.14.2"; + version = "4.16.0"; - sha256 = "1gr6j96l792v33lbh7rqpbdjmy8m68hy14bsndx6bykv10zvmgx2"; + sha256 = "0b8vkcqn2arjp6qdwmzr0f84n8fjgy2kbf9h4gq03400ar1l111c"; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 9b263e5ee7..71645cd1f9 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -1,16 +1,16 @@ -{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3, glib +{ mkXfceDerivation, exo, garcon, gtk3, glib , libnotify, libxfce4ui, libxfce4util, libxklavier , upower, xfconf, xf86inputlibinput }: mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.14.3"; + version = "4.16.0"; - sha256 = "1zzngdj7mp2r6rcs8gvda1218zlz5gpnc6gsp20z32l69psp3yld"; + sha256 = "0iha3jm7vmgk6hq7z4l2r7w9qm5jraka0z580i8i83704kfx9g0y"; postPatch = '' - for f in $(find . -name \*.c); do + for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do substituteInPlace $f --replace \"libinput-properties.h\" '' done ''; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix index 357f4b2341..41af53c9cc 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,11 +1,13 @@ -{ mkXfceDerivation, libxfce4util }: +{ mkXfceDerivation, libxfce4util, gobject-introspection, vala }: mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.14.3"; + version = "4.16.0"; - sha256 = "0yxpdcyz81di7w9493jzps09bgrlgianjj5abnzahqmkpmpvb0rh"; + sha256 = "00cp2cm1w5a6k7g0fjvqx7d2iwaqw196vii9jkx1aa7mb0f2gk63"; + + nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ libxfce4util ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix index 75e9fc8cb6..a9e461a4e6 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.14.2"; + version = "4.16.0"; - sha256 = "04fhm1pf9290sy3ymrmnfnm2x6fq5ldzvj5bjd9kz6zkx0nsq1za"; + sha256 = "1znbccr25wvizmzzgdcf719y3qc9gqdi1g4rasgrmi95427lvwn3"; buildInputs = [ exo diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix index df46a80c4b..f8cfc55154 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.6"; + version = "4.16.1"; - sha256 = "1ml5b4nn8laqhjihfqqsbjn66525abhin5d32bplh1k9yfxw4xi4"; + sha256 = "1lhxm9ifkrnvn1vq3aak3kd695i1ishpryjnw617ifzawy9lj10b"; nativeBuildInputs = [ exo librsvg ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix b/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix index 5c47dc7f85..a9f30ebfab 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -48,7 +48,7 @@ let meta = with lib; { homepage = "https://gitlab.xfce.org/${category}/${pname}/about"; - license = licenses.gpl2; # some libraries are under LGPLv2+ + license = licenses.gpl2Plus; # some libraries are under LGPLv2+ platforms = platforms.linux; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 2349b4bf3e..1f79e0ffb2 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libXtst, libxfce4ui, libxfce4util, xfce4-panel, xfconf, exo }: +{ mkXfceDerivation, libXtst, libxfce4ui, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -6,7 +6,12 @@ mkXfceDerivation { version = "1.6.1"; sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; - buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; + + postPatch = '' + # exo-csource has been dropped from exo + substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource + ''; meta = { description = "Clipboard manager for Xfce panel"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index 3798edbf89..f776e6c169 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.1"; - sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv"; + version = "1.2.5"; + sha256 = "1isqlfhz1ijl1h3hfvi0n4misdjsrhd7pc9h5rkaqm4vh543ggxg"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index e80d0bbc9a..991da9928f 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -20,11 +20,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "YVrfmr2RQXpEMZ2OTa3GAS+iKjd48vN5cXUS3Lfvkko="; + sha256 = "13302psv0fzg2dsgadr8j6mb06k1bsa4zw6hxmb644vqlvcwq37v"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 304b9d9076..44d255c5fa 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -3,17 +3,16 @@ , intltool , libxfce4ui , xfce4-panel -, gtk3 , gettext }: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-datetime-plugin"; - version = "0.8.0"; + version = "0.8.1"; - rev-prefix = "datetime-"; - sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah"; + rev-prefix = "xfce4-datetime-plugin-"; + sha256 = "06h13bmh2sni4qbr3kfnqaa5dq5f48h4xkywrm9pa6h2nyvn4rma"; nativeBuildInputs = [ gettext @@ -21,7 +20,6 @@ mkXfceDerivation { ]; buildInputs = [ - gtk3 libxfce4ui xfce4-panel ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index e64d6fbae5..2c83abe657 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -1,30 +1,30 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python2, bash, vala_0_46 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, bash, vala_0_48 , dockbarx, gtk2, xfce, pythonPackages, wafHook }: stdenv.mkDerivation rec { pname = "xfce4-dockbarx-plugin"; version = "${ver}-${rev}"; - ver = "0.5"; - rev = "a2dcb66"; + ver = "0.6"; + rev = "5213876"; src = fetchFromGitHub { - owner = "TiZ-EX1"; + owner = "xuzhen"; repo = "xfce4-dockbarx-plugin"; rev = rev; - sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx"; + sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn"; }; pythonPath = [ dockbarx ]; nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] + buildInputs = [ python3 vala_0_48 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; postPatch = '' substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/" substituteInPlace src/dockbarx.vala --replace /usr/share/ $out/share/ - substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash + substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python3' ${bash}/bin/bash ''; postFixup = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"; + homepage = "https://github.com/xuzhen/xfce4-dockbarx-plugin"; description = "A plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index cf383f840d..7c48e4a2a9 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { description = "Embed arbitrary app windows on Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; + broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix index 8afff65696..3a01e80638 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; + broken = true; # unmaintained plugin; no longer compatible with xfce 4.16 maintainers = [ maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index df31ea3b9b..b9f4481be3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, - gtk2, exo, gnutls, libgcrypt, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, xfce4-panel, libxfce4ui, + exo, gnutls, libgcrypt, xfce }: let category = "panel-plugins"; @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-mailwatch-plugin"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; + sha256 = "0bmykjhd3gs1737fl3zn5gg6f3vlncak2xqz89zv5018znz1xy90"; }; nativeBuildInputs = [ @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libxfce4util libxfce4ui xfce4-panel - gtk2 - exo # needs exo with gtk2 support + exo gnutls libgcrypt ]; @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; description = "Mail watcher plugin for Xfce panel"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 407f349d9b..ec57a7260f 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' - for f in src/preferences.vala src/namebar.vala; do - substituteInPlace $f --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" - done + substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" + substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" ''; passthru.updateScript = xfce.updateScript { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 7442e30ed6..79519b8587 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -1,15 +1,11 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , intltool -, libxfce4util , xfce4-panel , libxfce4ui , xfconf -, gtk2 -, libunique , xfce }: @@ -30,16 +26,11 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libxfce4util libxfce4ui xfce4-panel xfconf - gtk2 - libunique ]; - hardeningDisable = [ "format" ]; - passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 845f1b22e3..dbefda4e5e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.3.92"; + version = "1.3.95"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; + sha256 = "0v44qwrwb95jrlsni1gdlc0zhymlm62w42zs3jbr5mcdc7j4mil3"; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 13bce97fe3..3c35297897 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -3,10 +3,9 @@ , fetchurl , pkg-config , intltool -, libxfce4util , xfce4-panel , libxfce4ui -, gtk3 +, xfconf , xfce }: @@ -14,11 +13,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "BTG435I8ujvo0GTLi2OLlU33SRXlpEciiZlReEd4mDU="; + sha256 = "0lknh5l30qs5c69wwjcblbyhczvdbxs59fqkb8mpqbfm05w01lan"; }; nativeBuildInputs = [ @@ -27,10 +26,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libxfce4util libxfce4ui xfce4-panel - gtk3 + xfconf ]; passthru.updateScript = xfce.updateScript { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 7c2fb69dc5..3731d3937b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; description = "Simple countdown and alarm plugin for the Xfce panel"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index 94b467fd68..209e25bc9e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -5,7 +5,6 @@ , pcre , libxfce4util , xfce4-panel -, xfconf }: mkXfceDerivation { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 18639946ce..5992bf343e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxml2, libsoup, upower, - libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower, + libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-weather-plugin"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; + sha256 = "1z2k24d599mxf5gqa35i3xmc3gk2yvqs80hxxpyw06yma6ljw973"; }; nativeBuildInputs = [ @@ -20,13 +20,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 libxml2 libsoup upower libxfce4ui - libxfce4util xfce4-panel + xfconf hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ef269d64e0..123376b0f2 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.6"; + version = "2.5.3"; rev-prefix = "v"; odd-unstable = false; - sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; + sha256 = "15kcph35pji3l1y81snrmpqzhhpdc9h4nk6cjsjyla51a1s2y3hz"; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index ec6ef0e7b6..281003db92 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, gtk2 -, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck3, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; - version = "0.4.6"; + version = "0.4.10"; src = fetchFromGitHub { - owner = "cedl38"; + owner = "invidian"; repo = pname; rev = "v${version}"; - sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g"; + sha256 = "0l066a174v2c7ly125v9x1fgbg5bnpwdwnjh69v9kp4plp791q4n"; }; nativeBuildInputs = [ @@ -20,11 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ python3 imagemagick - libwnck - gtk2 - exo + libwnck3 libxfce4ui - libxfce4util xfce4-panel xfconf xfce4-dev-tools diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index b632fde2df..d43c56c728 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/Jeinzi/thunar-dropbox"; description = "A plugin that adds context-menu items for Dropbox to Thunar"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix index cfbec681e8..7a76d4948e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/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-2021.02.14"; + version = "unstable-2021.03.29"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; - rev = "c085ecd807d85f31d102d8bec71f5c28dc96b31d"; - sha256 = "0c86gwhrarw78cr9c9slb9vij6kcwx3x281kbqji96qqzs0dfb32"; + rev = "00185f7960bd1bd5554a1167be9f37e1f18ac454"; + sha256 = "1bcdhql4cla137d8xr8m2h21dyxv0jpjpalpr5mgj2jxqfsmkbrn"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index f101f59674..58e4b3b355 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -270,7 +270,13 @@ rec { binary = crystal_0_35; }; - crystal = crystal_0_36; + crystal_1_0 = generic { + version = "1.0.0"; + sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; + binary = crystal_0_36; + }; + + crystal = crystal_1_0; crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix index 79a290a6c1..083998049c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation { license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; + changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${s.version}/CHANGELOG"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix index 14f4d93caa..736178e76c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,7 +4,7 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "1.22.4"; + version = "2.0.3"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; in @@ -15,7 +15,7 @@ in pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw"; + sha256 = "14a63cpkp78rgymmlrppds69jsrdarg33dr43nb7s61r0xfh9icm"; }; patches = getPatches ./patches; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index 4a7aa0d014..27436d8b61 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -41,11 +41,10 @@ let buildInputs = [ git ]; - inherit src patches; + inherit src patches version; postPatch = '' patchShebangs --build ./bin/ - find ./bin/ -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index 35ce5b3673..1fe0981368 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 8d613de739..a673466726 100644 +index c44f867746..c9eda34e26 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -204,8 +204,6 @@ function shared::execute() { +@@ -218,8 +218,6 @@ function shared::execute() { # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" @@ -12,20 +12,18 @@ index 8d613de739..a673466726 100644 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 8a1a1e29da..778f253358 100644 +index 3dc7929dd1..e65d70d55b 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -293,13 +293,6 @@ class FlutterCommandRunner extends CommandRunner { +@@ -246,11 +246,7 @@ class FlutterCommandRunner extends CommandRunner { globals.flutterUsage.suppressAnalytics = true; } -- try { -- await globals.flutterVersion.ensureVersionFile(); -- } on FileSystemException catch (e) { -- globals.printError('Failed to write the version file to the artifact cache: "$e".'); -- globals.printError('Please ensure you have permissions in the artifact cache directory.'); -- throwToolExit('Failed to write the version file'); -- } +- globals.flutterVersion.ensureVersionFile(); final bool machineFlag = topLevelResults['machine'] as bool; - if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { - await globals.flutterVersion.checkFlutterVersionFreshness(); +- if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { +- await globals.flutterVersion.checkFlutterVersionFreshness(); +- } + + // See if the user specified a specific device. + globals.deviceManager.specifiedDeviceId = topLevelResults['device-id'] as String; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch index dc77496edb..d6a45a97e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -1,59 +1,54 @@ -diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index d045c83f04..d51973020b 100644 ---- a/dev/devicelab/lib/framework/runner.dart -+++ b/dev/devicelab/lib/framework/runner.dart -@@ -136,7 +136,7 @@ Future cleanupSystem() async { - print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); - final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; - final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); -- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); - copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); - if (!Platform.isWindows) { - await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index 8da01315ae..bb8d61d7f2 100644 +index a6c59bae07..21f6c9812a 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; +@@ -5,6 +5,7 @@ + import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; - import 'package:yaml/yaml.dart'; +import 'base/common.dart'; import 'base/context.dart'; import 'base/file_system.dart'; - import 'base/utils.dart'; -@@ -399,7 +400,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { - for (final Map font in (family['fonts'] as List).cast>()) { - final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); - result.add(_Asset( -- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), - relativeUri: Uri(path: entryUri.pathSegments.last), - entryUri: entryUri, - package: null, + import 'base/logger.dart'; +@@ -14,6 +15,7 @@ import 'cache.dart'; + import 'convert.dart'; + import 'dart/package_map.dart'; + import 'devfs.dart'; ++import 'globals.dart' as globals; + import 'flutter_manifest.dart'; + import 'license_collector.dart'; + import 'project.dart'; +@@ -377,7 +379,7 @@ class ManifestAssetBundle implements AssetBundle { + for (final Map font in family['fonts'] as List>) { + final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String); + result.add(_Asset( +- baseDir: _fileSystem.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), ++ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), + relativeUri: Uri(path: entryUri.pathSegments.last), + entryUri: entryUri, + package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index a35d8f87d0..a40027dc74 100644 +index 11e3bf3e11..39d6fae0d1 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -215,8 +215,15 @@ class Cache { +@@ -321,8 +321,15 @@ class Cache { return; } assert(_lock == null); + -+ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); ++ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); + if (!dir.existsSync()) { + dir.createSync(recursive: true); + globals.os.chmod(dir, '755'); + } + final File lockFile = -- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); -+ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); +- _fileSystem.file(_fileSystem.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); ++ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -319,7 +326,7 @@ class Cache { +@@ -424,7 +431,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 50031f5acd..474a960d35 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NCLPatJWpvYKM+QdJB/Gfldlz5MQynWZB8o4x4cf5cA="; + sha256 = "sha256-iW4mH9zLJzD+E+H/b0NAbPWzfSbDmRpirDwrLlyZppI="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security ]; + lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-Tvb6QJubV8FS8UER++bEhst7Z0hVw42TCl+wOzZzi8Y="; + cargoSha256 = "sha256-ErLwrve2Fpyg9JaH3y7VIYuFcOPVP++XAIrRvv5dGm0="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix index b54f57e9b6..ccfb4a18a1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath, which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc, - xcodebuild, gfortran, readline, bzip2, lzma, pcre, curl, ed, libresolv, libiconv, writeScriptBin, + xcodebuild, gfortran, readline, bzip2, xz, pcre, curl, ed, libresolv, libiconv, writeScriptBin, openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa }: @@ -372,7 +372,7 @@ in rec { buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang python27withPackages icu ruby bzip2 which - readline bzip2 lzma pcre curl ed gfortran + readline bzip2 xz pcre curl ed gfortran ] ++ lib.optional stdenv.isDarwin [ CoreFoundation gcc.cc.lib libiconv perl openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index ebba160fc9..5128658296 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -7,7 +7,7 @@ , flex , llvmPackages_8 , opencl-clang -, python +, python3 , spirv-llvm-translator , buildWithPatches ? true @@ -33,9 +33,11 @@ stdenv.mkDerivation rec { sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq"; }; - nativeBuildInputs = [ clang cmake bison flex llvm python ]; + nativeBuildInputs = [ clang cmake bison flex python3 ]; - buildInputs = [ clang opencl-clang spirv-llvm-translator ]; + buildInputs = [ clang opencl-clang spirv-llvm-translator llvm ]; + + strictDeps = true; # checkInputs = [ lit pythonPackages.nose ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix new file mode 100644 index 0000000000..087b0ad115 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix @@ -0,0 +1,54 @@ +{ stdenv, buildPackages, cmake, gnumake, makeWrapper, mkDerivation, fetchFromGitHub +, alex, array, base, bytestring, cond, containers, directory, extra +, filepath, haskeline, hpack, hspec, hspec-core, json, lib, mtl +, parsec, process, regex-compat, text, time }: + +let + version = "2.1.1"; + src = fetchFromGitHub { + owner = "koka-lang"; + repo = "koka"; + rev = "v${version}"; + sha256 = "sha256-cq+dljfTKJh5NgwQfxQQP9jRcg2PQxxBVEgQ59ll36o="; + fetchSubmodules = true; + }; + kklib = stdenv.mkDerivation { + pname = "kklib"; + inherit version; + src = "${src}/kklib"; + nativeBuildInputs = [ cmake ]; + }; + runtimeDeps = [ + buildPackages.stdenv.cc + buildPackages.stdenv.cc.bintools.bintools + gnumake + cmake + ]; +in +mkDerivation rec { + pname = "koka"; + inherit version src; + isLibrary = false; + isExecutable = true; + libraryToolDepends = [ hpack ]; + executableHaskellDepends = [ + array base bytestring cond containers directory haskeline mtl + parsec process text time kklib + ]; + executableToolDepends = [ alex makeWrapper ]; + postInstall = '' + mkdir -p $out/share/koka/v${version} + cp -a lib $out/share/koka/v${version} + cp -a contrib $out/share/koka/v${version} + cp -a kklib $out/share/koka/v${version} + wrapProgram "$out/bin/koka" \ + --set CC "${lib.getBin buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" \ + --prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}" + ''; + doCheck = false; + prePatch = "hpack"; + description = "Koka language compiler and interpreter"; + homepage = "https://github.com/koka-lang/koka"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ siraben sternenseemann ]; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools.nix new file mode 100644 index 0000000000..53f7941e33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools.nix @@ -0,0 +1,29 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix new file mode 100644 index 0000000000..d4d0ddf795 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix @@ -0,0 +1,110 @@ +{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation ({ + pname = "clang"; + inherit version; + + src = fetch "clang" "11ay72f81ffygil5ficq7mzplck4gffm77p0yj4ib3dgiqbb1qbw"; + inherit clang-tools-extra_src; + + unpackPhase = '' + unpackFile $src + mv clang-* clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + ''; + + nativeBuildInputs = [ cmake python3 lld ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 llvm ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++14" + "-DCLANGD_BUILD_XPC=OFF" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ]; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "python" ]; + + # Clang expects to find LLVMgold in its own prefix + postInstall = '' + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + ''; + + passthru = { + isClang = true; + inherit llvm; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = "https://llvm.org/"; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); +in self diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/purity.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/purity.patch new file mode 100644 index 0000000000..deb230a36c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/clang/purity.patch @@ -0,0 +1,28 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!IsStatic) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch new file mode 100644 index 0000000000..f6f9336ad5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch @@ -0,0 +1,23 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -301,6 +301,10 @@ if (NOT MSVC) + i386/umoddi3.S + ) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -608,6 +612,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch new file mode 100644 index 0000000000..120cfe6feb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch new file mode 100644 index 0000000000..3cc12b94b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch @@ -0,0 +1,33 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $ +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +2.14.1 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt.nix new file mode 100644 index 0000000000..9721879d76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt.nix @@ -0,0 +1,90 @@ +{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + +stdenv.mkDerivation rec { + pname = "compiler-rt"; + inherit version; + src = fetch pname "01dvir3858qkjmqhw2h6jjagq0la0kasnwzqbyv91yixnwx8369z"; + + nativeBuildInputs = [ cmake python3 llvm ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-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" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals (useLLVM || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include " "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include " "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include " "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + ''; + +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix new file mode 100644 index 0000000000..901e9c82ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -0,0 +1,204 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs +, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, buildPackages +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +, darwin +}: + +let + release_version = "12.0.0"; + candidate = "rc4"; # empty or "rcN" + dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; + version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs + targetConfig = stdenv.targetPlatform.config; + + fetch = name: sha256: fetchurl { + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz"; + inherit sha256; + }; + + clang-tools-extra_src = fetch "clang-tools-extra" "1m1qga8m967bzqkxwx9xqkw1lkxi9dhlrn6km2k7g2yqyb6k14ag"; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + mkExtraBuildCommands = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + in { + + llvm = callPackage ./llvm.nix { }; + + clang-unwrapped = callPackage ./clang { + inherit (tools) lld; + inherit clang-tools-extra_src; + }; + + # disabled until recommonmark supports sphinx 3 + #Llvm-manpages = lowPrio (tools.llvm.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + #}); + + clang-manpages = lowPrio (tools.clang-unwrapped.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # disabled until recommonmark supports sphinx 3 + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); + + libclang = tools.clang-unwrapped.lib; + + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld.nix { + libunwind = libraries.libunwind; + }; + + lldb = callPackage ./lldb.nix { + inherit (darwin) libobjc bootstrap_cmds; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools = callPackage ./bintools.nix {}; + + lldClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoCompilerRt = wrapCCWith { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + ''; + }; + + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + in { + + compiler-rt = callPackage ./compiler-rt.nix ({} // + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; + })); + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libc++ ({} // + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); + + libcxxabi = callPackage ./libc++abi.nix ({} // + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); + + openmp = callPackage ./openmp.nix {}; + + libunwind = callPackage ./libunwind.nix ({} // + (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); + + }); + +in { inherit tools libraries; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++/default.nix new file mode 100644 index 0000000000..e910d2c96b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation { + pname = "libc++"; + inherit version; + + src = fetch "libcxx" "0ai91zls1738502c3b2frhawmjpi73rm3m677hh540wrjp3xv0ql"; + + postUnpack = '' + unpackFile ${libcxxabi.src} + mv libcxxabi-* libcxxabi + unpackFile ${llvm.src} + mv llvm-* llvm + ''; + + patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = [ libcxxabi ]; + + cmakeFlags = [ + "-DLIBCXX_CXX_ABI=libcxxabi" + ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optional stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + + passthru = { + isLLVM = true; + }; + + meta = { + homepage = "https://libcxx.llvm.org/"; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = with lib.licenses; [ ncsa mit ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi.nix new file mode 100644 index 0000000000..70dd5af727 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libc++abi.nix @@ -0,0 +1,67 @@ +{ lib, stdenv, cmake, python3, fetch, libcxx, libunwind, llvm, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation { + pname = "libc++abi"; + inherit version; + + src = fetch "libcxxabi" "02qp6ndagq7n48p53z93d1rrx0v0v4rsahd4vkv5frid0vm4ah9h"; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + postUnpack = '' + unpackFile ${libcxx.src} + mv libcxx-* libcxx + unpackFile ${llvm.src} + mv llvm-* llvm + '' + lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib + install -m 644 ../include/cxxabi.h $out/include + '' + lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = "https://libcxxabi.llvm.org/"; + description = "A new implementation of low level support for a standard C++ library"; + license = with lib.licenses; [ ncsa mit ]; + maintainers = with lib.maintainers; [ vlstill ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch new file mode 100644 index 0000000000..4ebfe46aa8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind.nix new file mode 100644 index 0000000000..ddfcf508fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libunwind.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, version, fetch, libcxx, llvm, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + src = fetch pname "1a5db1lxw98a430b8mnaclc0w98y6cc8k587kgjhn0nghl40l40i"; + + postUnpack = '' + unpackFile ${libcxx.src} + mv libcxx-* libcxx + unpackFile ${llvm.src} + mv llvm-* llvm + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld.nix new file mode 100644 index 0000000000..00e30e16b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lld.nix @@ -0,0 +1,39 @@ +{ lib, stdenv +, fetch +, libunwind +, cmake +, libxml2 +, llvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + src = fetch pname "0r9pxhvinipirv9s5k8fnsnqd30zfniwqjkvw5sac3lq29rn2lp1"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm libxml2 ]; + + postPatch = '' + substituteInPlace MachO/CMakeLists.txt --replace \ + '(''${LLVM_MAIN_SRC_DIR}/' '(' + mkdir -p libunwind/include + tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" + ''; + + outputs = [ "out" "dev" ]; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = { + description = "The LLVM Linker"; + homepage = "https://lld.llvm.org/"; + license = lib.licenses.ncsa; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb-procfs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb-procfs.patch new file mode 100644 index 0000000000..b075dbaeee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb-procfs.patch @@ -0,0 +1,31 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -11,21 +11,12 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include ++#include + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include ++#undef pt_regs ++#else + #include +-#endif // __ANDROID__ ++#endif diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb.nix new file mode 100644 index 0000000000..f9f978c60b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/lldb.nix @@ -0,0 +1,103 @@ +{ lib, stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, llvm +, clang-unwrapped +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, enableManpages ? false +}: + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + src = fetch pname "0943gan83mldizwbhksd07w4h90z4djjpv5f8v49caz8y9113svg"; + + patches = [ ./lldb-procfs.patch ]; + + nativeBuildInputs = [ cmake python3 which swig lit ] + ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + llvm + ] + ++ lib.optionals stdenv.isDarwin [ + libobjc + xpc + Foundation + bootstrap_cmds + Carbon + Cocoa + ]; + + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLVM_ENABLE_RTTI=OFF" + "-DClang_DIR=${clang-unwrapped}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + ]; + + postInstall = '' + # Editor support + # vscode: + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = with lib; { + description = "A next-generation high-performance debugger"; + homepage = "https://lldb.llvm.org"; + license = licenses.ncsa; + platforms = platforms.all; + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + buildPhase = '' + make docs-lldb-man + ''; + + propagatedBuildInputs = []; + # manually install lldb man page + installPhase = '' + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLDB ${version}"; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm-outputs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm-outputs.patch new file mode 100644 index 0000000000..40096fa349 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm.nix new file mode 100644 index 0000000000..f70c4379c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm.nix @@ -0,0 +1,189 @@ +{ lib, stdenv +, fetch +, cmake +, python3 +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, buildPackages +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder +) +, enablePolly ? false +}: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = fetch pname "1jif65i165h41cfcsfvfjy5k1yrnikg61assj5vs0f25pv1vbyvf"; + polly_src = fetch "polly" "0hk6j6rsal3zsp1f9fla71yzbwmzz9007m63x22hy7qfiwyplvf2"; + + unpackPhase = '' + unpackFile $src + mv llvm-${release_version}* llvm + sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile $polly_src + mv polly-* $sourceRoot/tools/polly + ''; + + outputs = [ "out" "python" ] + ++ optional enableSharedLibraries "lib"; + + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildPackages.llvm_12}/bin/llvm-tblgen" + ]; + + postBuild = '' + rm -R $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + '' + + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + ''; + + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl); + + checkTarget = "check-all"; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = "https://llvm.org/"; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + buildPhase = '' + make docs-llvm-man + ''; + + installPhase = '' + make -C docs install + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp.nix new file mode 100644 index 0000000000..fcb91574d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetch +, cmake +, llvm +, perl +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = fetch pname "07g2rsfhli3szv3chzy6y37p2176ywdb6w3k2fv9g2r416cpxjdz"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = "https://openmp.llvm.org/"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch new file mode 100644 index 0000000000..1f2ac97818 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch @@ -0,0 +1,412 @@ +From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 24 Sep 2018 11:17:25 -0500 +Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project. + +------ +Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + lib/sanitizer_common/sanitizer_allocator.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +- + .../sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux.cc | 8 +++- + .../sanitizer_linux_libcdep.cc | 10 ++--- + lib/sanitizer_common/sanitizer_platform.h | 6 +++ + .../sanitizer_platform_interceptors.h | 4 +- + .../sanitizer_platform_limits_posix.cc | 37 +++++++++++-------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 13 files changed, 51 insertions(+), 34 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 625f32d40..73cf77aca 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -46,7 +46,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #elif SANITIZER_NETBSD +@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 26bfcd8f6..529b234f7 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + } + + // Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 942c25609..24a4d5080 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & WRAP(func)) + + // Android, Solaris and OpenBSD do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 385a650c4..6e30a8ce9 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD + + #include "msan.h" + #include "msan_report.h" +diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc +index 6bfd5e5ee..048f6154f 100644 +--- a/lib/sanitizer_common/sanitizer_allocator.cc ++++ b/lib/sanitizer_common/sanitizer_allocator.cc +@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator"; + + // ThreadSanitizer for Go uses libc malloc/free. + #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC) +-# if SANITIZER_LINUX && !SANITIZER_ANDROID ++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + extern "C" void *__libc_malloc(uptr size); + # if !SANITIZER_GO + extern "C" void *__libc_memalign(uptr alignment, uptr size); +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 2d633c173..b6eb23116 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -104,7 +104,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -365,7 +365,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc +index 96d6c1eff..9e2b7fb9d 100644 +--- a/lib/sanitizer_common/sanitizer_linux.cc ++++ b/lib/sanitizer_common/sanitizer_linux.cc +@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD ++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + extern "C" { + SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end; + } + #endif + +-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \ ++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \ + !SANITIZER_OPENBSD + static void ReadNullSepFileToArray(const char *path, char ***arr, + int arr_size) { +@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) { + #elif SANITIZER_NETBSD + *argv = __ps_strings->ps_argvstr; + *envp = __ps_strings->ps_envstr; ++#elif SANITIZER_NONGNU ++ static const int kMaxArgv = 2000, kMaxEnvp = 2000; ++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv); ++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp); + #else // SANITIZER_FREEBSD + #if !SANITIZER_GO + if (&__libc_stack_end) { +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 4962ff832..438f94dbe 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor, + } + + #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \ +- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS ++ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -261,7 +261,7 @@ void InitTlsSize() { } + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \ + defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \ + defined(__arm__)) && \ +- SANITIZER_LINUX && !SANITIZER_ANDROID ++ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t thread_descriptor_size; + +@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) { + #elif SANITIZER_OPENBSD + *addr = 0; + *size = 0; +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #elif SANITIZER_SOLARIS +@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) { + #if !SANITIZER_GO + uptr GetTlsSize() { + #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \ +- SANITIZER_OPENBSD || SANITIZER_SOLARIS ++ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index d81e25580..e10680ac8 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -208,6 +208,12 @@ + # define SANITIZER_SOLARIS32 0 + #endif + ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + #if defined(__myriad2__) + # define SANITIZER_MYRIAD2 1 + #else +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index f95539a73..6c53b3415 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -39,7 +39,7 @@ + # include "sanitizer_platform_limits_solaris.h" + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +@@ -322,7 +322,7 @@ + #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_SHMCTL \ + (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \ +- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \ ++ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \ + SANITIZER_WORDSIZE == 64)) // NOLINT + #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID + #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 54da635d7..2f6ff69c3 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -251,7 +256,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // Use pre-computed size of struct ustat to avoid which + // has been removed from glibc 2.28. + #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ +@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 +@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index de989b780..51a97b554 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -294,7 +294,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.19.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/update.sh b/third_party/nixpkgs/pkgs/development/compilers/llvm/update.sh new file mode 100755 index 0000000000..8f28d34073 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -eu + +# Example usage: ./pkgs/development/compilers/llvm/update.sh 12.0.0-rc4 + +readonly VERSION="$1" +readonly VERSION_MAJOR="${VERSION%%.*}" +readonly VERSION_MAIN="${VERSION%%-*}" +declare VERSION_PATCH="${VERSION/$VERSION_MAIN/}" +readonly VERSION_PATCH="${VERSION_PATCH/-/}" + +readonly DIR="pkgs/development/compilers/llvm/$VERSION_MAJOR" +readonly FILE="$DIR/default.nix" + +sed -Ei \ + -e "s/release_version = \".+\";/release_version = \"$VERSION_MAIN\";/" \ + -e "s/candidate = \".*\";/candidate = \"$VERSION_PATCH\";/" \ + "$FILE" + +readonly ATTRSET="llvmPackages_$VERSION_MAJOR" +readonly SOURCES=( + "clang-unwrapped.src" + "compiler-rt.src" + "clang-unwrapped.clang-tools-extra_src" + "libcxx.src" + "libcxxabi.src" + "libunwind.src" + "lld.src" + "lldb.src" + "llvm.src" + "llvm.polly_src" + "openmp.src" +) + +for SOURCE in "${SOURCES[@]}"; do + echo "Updating the hash of $SOURCE:" + declare ATTR="$ATTRSET.$SOURCE" + declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)" + declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\"" + find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} + +done + +echo OK diff --git a/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix index d1d103c047..1024ddb6a8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix @@ -1,15 +1,18 @@ -{ lib, fetchFromGitHub, crystal_0_33, openssl }: +{ lib, fetchFromGitHub, crystal_0_36, openssl }: -let crystal = crystal_0_33; -in crystal.buildCrystalPackage rec { - version = "0.9.0"; +let + crystal = crystal_0_36; + +in +crystal.buildCrystalPackage rec { + version = "0.11.0"; pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "0y1qr616x7s0pjgih6s1n4wiwb8kn8l1knnzmib6j4jmqax0jhz0"; + sha256 = "sha256-QqO4Kc8hf6WNCENPvLwYIF9gtXG/VRR7DhyZvxB4VsA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix b/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix index 8e2b6b6ad4..595f9c5ebe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix @@ -2,20 +2,20 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.9.0"; - sha256 = "0y8gsh1qz42bc9jawcrn0i49mzzfvf8znmivd8lybapf0f53fblz"; + rev = "v1.11.2"; + sha256 = "0rxsy41d0qpw9h1d3jvhmbmzqba9yhgyzc0jrdbg28f59fl7zp7q"; }; ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.12.0"; - sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; + rev = "v0.13.3"; + sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; }; baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "v0.9.8"; - sha256 = "12l375jllg1lxvfh610dz0a39p803xw6q9fxlmnc6hy55i0gm0y3"; + rev = "7183bfde8d86a976a6912f582b51cbd1783456af"; + sha256 = "0s1bsrimz30wfkkfmb4bm49mx44nhqj0hky8jkn0kz0mpc28mkkl"; }; diff = { owner = "MakeNowJust"; @@ -38,8 +38,8 @@ kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.26.1"; - sha256 = "169pwkjmk7x6j8i0rf5rpyk1y0hl7jaf9h6yrq4ha2ag9yq9i8fr"; + rev = "v0.27.0"; + sha256 = "01p5fkm6q9k6390dhhw3dwwzlxhxafykknkkcayv1k4ynn126hi7"; }; kilt = { owner = "jeromegn"; @@ -50,8 +50,8 @@ markd = { owner = "icyleaf"; repo = "markd"; - rev = "v0.2.0"; - sha256 = "0n27fndd77mlkgw1r4pf0sa8fz4gwsh7dpnjck95c0ml91cr8j1a"; + rev = "620845abb6776d1765d20d86cc0220aa40f89a91"; + sha256 = "1nq1ddmd2kgnl8vrk0y65lqhy145740a3s68kn0advm2xx8rbhmy"; }; radix = { owner = "luislavena"; @@ -72,9 +72,9 @@ sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v"; }; tree_template = { - owner = "anykeyh"; + owner = "gdotdesign"; repo = "tree_template"; - rev = "3fcb71ee6852040077dd1a2c8c55c67f4a95ba4e"; - sha256 = "04w89wpnkna4ipyy3pxshqqwgk965hz1d31vqp0mrb0ilmpsywdk"; + rev = "7e24c92208cc99938f3fbd8f5fecda22bcbe3cc3"; + sha256 = "0ixscq7nqlp83x976d41kq83a5gw9kkk7lnxhlsc91000hm5h3wq"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix index 06449d59da..4e393a588f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix @@ -15,7 +15,7 @@ , CoreFoundation, Security , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform -, llvmPackages_5, llvm_11 +, llvmPackages_11, llvm_11 } @ args: import ./default.nix { @@ -26,7 +26,7 @@ import ./default.nix { llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; }; - llvmBootstrapForDarwin = llvmPackages_5; + llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime llvmShared = llvm_11.override { enableSharedLibraries = true; }; @@ -54,4 +54,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"]) diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 222ad903ec..b56f509b31 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -38,6 +38,8 @@ let "0.48" = ./disable-graphviz-0.46.1.patch; + "0.50" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -108,8 +110,8 @@ in rec { }; vala_0_40 = generic { - version = "0.40.18"; - sha256 = "1f7cdkjdysg4dcri1wbzdddm46amk2s48jkwb5ghpdvhjb4l5j2m"; + version = "0.40.25"; + sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7"; }; vala_0_44 = generic { @@ -118,13 +120,18 @@ in rec { }; vala_0_46 = generic { - version = "0.46.5"; - sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s"; + version = "0.46.13"; + sha256 = "0d7l4vh2xra3q75kw3sy2d9bn5p6s3g3r7j37bdn6ir8l3wp2ivs"; }; vala_0_48 = generic { - version = "0.48.9"; - sha256 = "1agyrvslv2yh9ikiw7k5nw6j6il1l2zrzfan0pzdpb9xpg9idslw"; + version = "0.48.14"; + sha256 = "0iz3zzimmk5wxvy5bi75v8ckv153gjrz3r5iqvl8xqackzi7v9fw"; + }; + + vala_0_50 = generic { + version = "0.50.4"; + sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q"; }; vala = vala_0_48; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 2356f3cea6..a0c02e26db 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib +{ stdenv +, lib , abc-verifier , bash , bison @@ -33,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+3962"; + version = "0.9+4052"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "5d0cc54f5c36dea1d989438426a321b4554257c8"; - sha256 = "1c85kga95lin6rcpr7cf80wr9f1a6irdrld9g23zmqdrxhick8y7"; + rev = "687f381b6985d9dda7e11535628e2fafff267af5"; + sha256 = "15lcj798ckh9zwvdqb5gnvicilsxjyxv01gcviijg310hq62n7vf"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix new file mode 100644 index 0000000000..adc4e3a594 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, mathcomp, version ? null }: +with lib; + +mkCoqDerivation { + pname = "odd-order"; + owner = "math-comp"; + + release."1.12.0".rev = "mathcomp-odd-order.1.12.0"; + release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM="; + + inherit version; + defaultVersion = with versions; switch mathcomp.character.version [ + { case = pred.union (isGe "1.10.0") (isEq "dev"); out = "1.12.0"; } + ] null; + + propagatedBuildInputs = [ mathcomp.character ]; + + meta = { + description = "Formal proof of the Odd Order Theorem"; + maintainers = with maintainers; [ siraben ]; + license = licenses.cecill-b; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index a374229e53..0956e55ed5 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq"; + sha256 = "13n62v3cdkx23fywdccczcr8vsf0vmjbimmgin766bf428jlhh6h"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -91,6 +91,7 @@ self: super: { tdigest = doJailbreak super.tdigest; text-short = doJailbreak super.text-short; tree-diff = doJailbreak super.tree-diff; + zinza = doJailbreak super.zinza; # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; @@ -708,8 +709,13 @@ self: super: { diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; - # https://github.com/diagrams/diagrams-lib/issues/288 - diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; })); + # apply patch from master to add compat with optparse-applicative >= 0.16 + diagrams-lib = doJailbreak (appendPatch super.diagrams-lib + (pkgs.fetchpatch { + url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; + sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; + includes = [ "*/CmdLine.hs" ]; + })); # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; @@ -1159,10 +1165,11 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; - # version constraints break the build, so we jailbreak - # can be removed at a new release which also fixes - # https://github.com/jgm/gitit/issues/665 - gitit = doJailbreak super.gitit; + # * jailbreak can be removed at the next release (current is 0.13.0.0) + # * patch fixes compilation with pandoc >= 2.12, can be removed if a + # release contains https://github.com/jgm/gitit/pull/670 or equivalent. + # Patch is vendored in as it may change upstream in the future. + gitit = doJailbreak (appendPatch super.gitit ./patches/gitit-pandoc-2.12.patch); # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; @@ -1407,13 +1414,26 @@ self: super: { # 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8 implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; - # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 - lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); - # 2021-03-09: Golden tests seem to be missing in hackage release: # https://github.com/haskell/haskell-language-server/issues/1536 hls-tactics-plugin = dontCheck super.hls-tactics-plugin; + # 2021-03-24: hlint 3.3 is for ghc 9 compat, but hls only supports ghc 8.10 + hls-hlint-plugin = super.hls-hlint-plugin.override { + hlint = super.hlint_3_2_7; + }; + + # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage + hlint = super.hlint.overrideScope (self: super: { + ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { + doHaddock = false; + }; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; + }); + + # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 + lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); + # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 # Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595 @@ -1593,9 +1613,6 @@ self: super: { 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. @@ -1675,8 +1692,92 @@ self: super: { # https://github.com/jgm/pandoc/issues/7163 pandoc = dontCheck super.pandoc; + # test suite triggers some kind of linking bug at runtime + # https://github.com/noinia/hgeometry/issues/132 + hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial; + + # Too strict version bounds on ansi-terminal + # https://github.com/kowainik/co-log/pull/218 + co-log = doJailbreak super.co-log; + + # Test suite has a too strict bound on base + # https://github.com/jswebtools/language-ecmascript/pull/88 + language-ecmascript = doJailbreak super.language-ecmascript; + + # Too strict bounds on containers + # https://github.com/jswebtools/language-ecmascript-analysis/issues/1 + language-ecmascript-analysis = doJailbreak super.language-ecmascript-analysis; + + # Too strict bounds on optparse-applicative + # https://github.com/faylang/fay/pull/474 + fay = doJailbreak super.fay; + # Too strict version bounds on cryptonite. # Issue reported upstream, no bug tracker url yet. darcs = doJailbreak super.darcs; + # Too strict version bounds on ansi-terminal + # This patch will be contained with the next release (current is 0.1.0.0). + colourista = appendPatch super.colourista + (pkgs.fetchpatch { + url = "https://github.com/kowainik/colourista/commit/15ace92105b56eba4ea3717bd55f733afe5be401.patch"; + sha256 = "sha256-9gJFlyWUkO5sJodDRNuH10I66j8/0ZZIv6nJQkhlA0s="; + }); + + # Too strict version bounds on base16-bytestring and http-link-header. + # This patch will be merged when next release comes. + github = appendPatch super.github (pkgs.fetchpatch { + url = "https://github.com/phadej/github/commit/514b175851dd7c4a9722ff203dd6f652a15d33e8.patch"; + sha256 = "0pmx54xd7ah85y9mfi5366wbnwrp918j0wbx8yw8hrdac92qi4gh"; + }); + + # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream. + trial-optparse-applicative = assert super.trial-optparse-applicative.version == "0.0.0.0"; doJailbreak super.trial-optparse-applicative; + + # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream. + extensions = assert super.extensions.version == "0.0.0.1"; doJailbreak super.extensions; + + # 2021-04-02: iCalendar is basically unmaintained. + # There are PRs for bumping the bounds: https://github.com/chrra/iCalendar/pull/46 + iCalendar = overrideCabal (doJailbreak super.iCalendar) { + # Overriding bounds behind a cabal flag + preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"''; + }; + + # Too strict bounds on base: https://github.com/runarorama/fuzzyfind/issues/1 + fuzzyfind = doJailbreak super.fuzzyfind; + + # Apply patch from master relaxing the version bounds on tasty. + # Can be removed at next release (current is 0.10.1.0). + ginger = appendPatch super.ginger + (pkgs.fetchpatch { + url = "https://github.com/tdammers/ginger/commit/bd8cb39c1853d4fb4f663c4c201884575906acea.patch"; + sha256 = "1rdy53k0384g52bnc59j1f0i13hr4lbnbksfsabr4av6zmw9wmzf"; + }); + + # Too strict version bounds on cryptonite + # https://github.com/obsidiansystems/haveibeenpwned/issues/7 + haveibeenpwned = doJailbreak super.haveibeenpwned; + + # Too strict version bounds on ghc-events + # https://github.com/haskell/ThreadScope/issues/118 + threadscope = doJailbreak super.threadscope; + + # Too strict version bounds on tasty + # Can likely be removed next week (2021-04-09) when 1.1.1.1 is released. + fused-effects = doJailbreak super.fused-effects; + + # Test suite doesn't support base16-bytestring >= 1.0 + # https://github.com/centromere/blake2/issues/6 + blake2 = dontCheck super.blake2; + + # Test suite doesn't support base16-bytestring >= 1.0 + # https://github.com/serokell/haskell-crypto/issues/25 + crypto-sodium = dontCheck super.crypto-sodium; + + # Too strict version bounds on a bunch of libraries: + # https://github.com/smallhadroncollider/taskell/issues/100 + # May be possible to remove at the next release (1.11.0) + taskell = doJailbreak super.taskell; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 08fb8aa88f..a2ccc3103d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -73,11 +73,33 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - - ghcide < 1.1 # To stay hls 1.0 compatible - - hls-retrie-plugin < 1.0.0.1 # To stay hls 1.0 compatible + # Needs Cabal 3.4 for Setup.hs + - gi-javascriptcore < 4.0.23 # + - gi-soup < 2.4.24 # + - gi-webkit2 < 4.0.27 # + # To stay hls 1.0 compatible + - ghcide < 1.1 + - hls-retrie-plugin < 1.0.0.1 + - lsp < 1.2 + - lsp-types < 1.2 + # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, + # so we need to restrict these to compatible versions + # Remove these as soon as haskell-gi{,-base} are 0.25.* + # in Stackage Nightly! + - gi-ggit < 1.0.10 + - gi-girepository < 1.0.24 + - gi-gst < 1.0.24 + - gi-gstbase < 1.0.24 + - gi-gstvideo < 1.0.24 + - gi-gtksource < 3.0.24 + - gi-ibus < 1.5.3 + - gi-notify < 0.7.23 + - gi-ostree < 1.0.14 + - gi-pangocairo < 1.0.25 + - gi-secret < 0.0.13 + - gi-vte < 2.91.28 - # Stackage Nightly 2021-03-17 + # Stackage Nightly 2021-03-21 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -112,6 +134,7 @@ default-package-overrides: - alarmclock ==0.7.0.5 - alerts ==0.1.2.0 - alex ==3.2.6 + - alex-meta ==0.3.0.13 - alg ==0.2.13.1 - algebraic-graphs ==0.5 - Allure ==0.9.5.0 @@ -350,6 +373,7 @@ default-package-overrides: - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 - BNFC ==2.9.1 + - BNFC-meta ==0.6.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 @@ -409,7 +433,7 @@ default-package-overrides: - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - - call-stack ==0.2.0 + - call-stack ==0.3.0 - can-i-haz ==0.3.1.0 - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 @@ -707,6 +731,7 @@ default-package-overrides: - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.7 + - download-curl ==0.1.4 - drinkery ==0.4 - dsp ==0.2.5.1 - dual ==0.1.1.1 @@ -829,6 +854,7 @@ default-package-overrides: - filelock ==0.1.1.5 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 + - filepath-bytestring ==1.4.2.1.7 - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 @@ -1010,6 +1036,7 @@ default-package-overrides: - gluturtle ==0.0.58.1 - gnuplot ==0.5.6.1 - google-isbn ==1.0.3 + - gopher-proxy ==0.1.1.2 - gothic ==0.1.6 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 @@ -1042,6 +1069,7 @@ default-package-overrides: - hapistrano ==0.4.1.2 - happstack-server ==7.7.0 - happy ==1.20.0 + - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 - hasbolt ==0.1.4.4 - hashable ==1.3.0.0 @@ -1050,7 +1078,7 @@ default-package-overrides: - hashing ==0.1.0.1 - hashmap ==1.3.3 - hashtables ==1.2.4.1 - - haskeline ==0.8.1.1 + - haskeline ==0.8.1.2 - haskell-gi ==0.24.7 - haskell-gi-base ==0.24.5 - haskell-gi-overloading ==1.0 @@ -1080,7 +1108,7 @@ default-package-overrides: - HDBC-session ==0.1.2.0 - headroom ==0.4.1.0 - heap ==1.0.4 - - heaps ==0.3.6.1 + - heaps ==0.4 - hebrew-time ==0.1.2 - hedgehog ==1.0.5 - hedgehog-corpus ==0.2.0 @@ -1157,7 +1185,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.5.1 + - HsOpenSSL ==0.11.6 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.8 @@ -1173,6 +1201,7 @@ default-package-overrides: - hspec-golden ==0.1.0.3 - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 + - hspec-junit-formatter ==1.0.0.0 - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 @@ -1198,7 +1227,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==2.0.6 - - HTTP ==4000.3.15 + - HTTP ==4000.3.16 - http-api-data ==0.4.2 - http-client ==0.6.4.1 - http-client-openssl ==0.3.2.0 @@ -1217,7 +1246,7 @@ default-package-overrides: - http-streams ==0.8.7.2 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - - HUnit ==1.6.1.0 + - HUnit ==1.6.2.0 - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.4 - hvect ==0.4.0.0 @@ -1377,7 +1406,7 @@ default-package-overrides: - ki ==0.2.0.1 - kind-apply ==0.3.2.0 - kind-generics ==0.4.1.0 - - kind-generics-th ==0.2.2.1 + - kind-generics-th ==0.2.2.2 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - krank ==0.2.2 @@ -1793,9 +1822,9 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.11.0.2 + - persistent ==2.11.0.4 - persistent-documentation ==0.1.0.2 - - persistent-mtl ==0.2.0.0 + - persistent-mtl ==0.2.1.0 - persistent-mysql ==2.10.3.1 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.11.0.1 @@ -1830,6 +1859,7 @@ default-package-overrides: - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - pkgtreediff ==0.4 + - place-cursor-at ==1.0.1 - placeholders ==0.1 - plaid ==0.1.0.4 - plotlyhs ==0.2.1 @@ -1965,7 +1995,7 @@ default-package-overrides: - rate-limit ==1.4.2 - ratel-wai ==1.1.5 - rattle ==0.2 - - rattletrap ==11.0.0 + - rattletrap ==11.0.1 - Rattus ==0.5 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1982,7 +2012,7 @@ default-package-overrides: - record-hasfield ==1.0 - records-sop ==0.1.0.3 - record-wrangler ==0.1.1.0 - - recursion-schemes ==5.2.2 + - recursion-schemes ==5.2.2.1 - reducers ==3.12.3 - refact ==0.3.0.2 - ref-fd ==0.4.0.2 @@ -2104,6 +2134,7 @@ default-package-overrides: - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.1 + - sendgrid-v3 ==0.3.0.0 - seqalign ==0.2.0.4 - seqid ==0.6.2 - seqid-streams ==0.7.2 @@ -2179,11 +2210,11 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.4.1 - - skylighting-core ==0.10.4.1 + - skylighting ==0.10.5 + - skylighting-core ==0.10.5 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - - slist ==0.1.1.0 + - slist ==0.2.0.0 - slynx ==0.5.0.2 - smallcheck ==1.2.1 - smash ==0.1.1.0 @@ -2199,6 +2230,7 @@ default-package-overrides: - soap ==0.2.3.6 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.4 + - socket ==0.8.3.0 - socks ==0.6.1 - some ==1.0.2 - sop-core ==0.5.0.1 @@ -2207,6 +2239,7 @@ default-package-overrides: - sourcemap ==0.1.6 - sox ==0.2.3.1 - soxlib ==0.0.3.1 + - spacecookie ==1.0.0.0 - sparse-linear-algebra ==0.3.1 - sparse-tensor ==0.2.1.5 - spatial-math ==0.5.0.1 @@ -2327,7 +2360,7 @@ default-package-overrides: - tardis ==0.4.3.0 - tasty ==1.4.1 - tasty-ant-xml ==1.1.8 - - tasty-bench ==0.2.2 + - tasty-bench ==0.2.3 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 @@ -2486,6 +2519,7 @@ default-package-overrides: - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - type-natural ==1.1.0.0 + - typenums ==0.1.3 - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 @@ -2570,7 +2604,7 @@ default-package-overrides: - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8 + - vector-builder ==0.3.8.1 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.3 - vector-instances ==3.4 @@ -2599,6 +2633,7 @@ default-package-overrides: - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 + - wai-middleware-auth ==0.2.4.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - wai-middleware-static ==0.9.0 @@ -2750,10 +2785,9 @@ extra-packages: - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - optparse-applicative < 0.16 # needed for niv-0.2.19 + - lsp-test < 0.14 # needed for hls 1.0.0 package-maintainers: peti: @@ -2831,6 +2865,8 @@ package-maintainers: - taskwarrior - haskell-language-server - shake-bench + - iCalendar + - stm-containers sorki: - cayene-lpp - data-stm32 @@ -3075,6 +3111,7 @@ broken-packages: - ACME - acme-all-monad - acme-comonad + - acme-dont - acme-flipping-tables - acme-hq9plus - acme-http @@ -3147,6 +3184,7 @@ broken-packages: - aeson-tiled - aeson-typescript - aeson-utils + - aeson-via - affection - affine-invariant-ensemble-mcmc - afv @@ -3204,6 +3242,7 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products + - amazonka-ec2 - amazonka-s3-streaming - amby - AMI @@ -3282,6 +3321,7 @@ broken-packages: - apiary-session - apiary-websockets - apis + - apns-http2 - apotiki - app-lens - appc @@ -3291,6 +3331,7 @@ broken-packages: - applicative-parsec - applicative-quoters - applicative-splice + - apply-unordered - approveapi - approx - ApproxFun-hs @@ -3298,8 +3339,10 @@ broken-packages: - arbb-vm - arbor-datadog - arbor-monad-counter + - arbor-monad-logger - arbor-monad-metric - arbor-monad-metric-datadog + - arbor-postgres - arch-hs - arch-web - archive-libarchive @@ -3351,6 +3394,8 @@ broken-packages: - asn1-codec - asn1-data - assert + - assert4hs + - assert4hs-tasty - assertions - asset-map - assimp @@ -3460,6 +3505,7 @@ broken-packages: - azure-service-api - azure-servicebus - azurify + - b-tree - b9 - babylon - backblaze-b2-hs @@ -3491,9 +3537,12 @@ broken-packages: - barrier - barrier-monad - base-compat-migrate + - base-encoding - base-feature-macros - base-generics - base-io-access + - base16 + - base16-lens - base32-bytestring - base62 - base64-bytes @@ -3553,10 +3602,12 @@ broken-packages: - betacode - betris - bff + - bglib - bgmax - bgzf - bhoogle - bibdb + - bidi-icu - bidirectional - bidirectionalization-combined - bidispec @@ -3646,6 +3697,7 @@ broken-packages: - biopsl - biosff - biostockholm + - bip32 - birch-beer - bird - BirdPP @@ -3660,10 +3712,12 @@ broken-packages: - bitcoin-block - bitcoin-compact-filters - bitcoin-hs + - bitcoin-keys - bitcoin-rpc - bitcoin-script - bitcoin-scripting - bitcoin-tx + - bitcoin-types - bitcoind-regtest - bitcoind-rpc - Bitly @@ -3721,6 +3775,7 @@ broken-packages: - blunk-hask-tests - blunt - bno055-haskell + - bogocopy - bogre-banana - boilerplate - bolt @@ -3743,6 +3798,7 @@ broken-packages: - boring-window-switcher - bot - botpp + - bound-extras - bounded-array - bowntz - box @@ -3851,6 +3907,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-edit - cabal-file-th - cabal-ghc-dynflags - cabal-ghci @@ -4281,6 +4338,7 @@ broken-packages: - conferer-provider-dhall - conferer-provider-json - conferer-provider-yaml + - conferer-snap - conferer-source-dhall - conferer-source-json - conferer-source-yaml @@ -4467,6 +4525,7 @@ broken-packages: - ctkl - ctpl - cube + - cubical - cuboid - cuckoo - curl-runnings @@ -4744,6 +4803,7 @@ broken-packages: - dingo-core - dingo-example - dingo-widgets + - diohsc - diophantine - diplomacy - diplomacy-server @@ -4964,6 +5024,7 @@ broken-packages: - eibd-client-simple - eigen - Eight-Ball-Pool-Hack-Cheats + - eio - either-list-functions - either-unwrap - EitherT @@ -5042,6 +5103,7 @@ broken-packages: - equeue - erf-native - erlang + - erlang-ffi - eros - eros-client - eros-http @@ -5080,6 +5142,7 @@ broken-packages: - ethereum-analyzer-webui - ethereum-client-haskell - ethereum-merkle-patricia-db + - ethereum-rlp - euphoria - eurofxref - evdev @@ -5176,23 +5239,15 @@ broken-packages: - fastedit - fastirc - fastly + - fastpbkdf2 - FastPush - fastsum - FastxPipe - fathead-util - fault-tree - - fay - - fay-base - fay-builder - - fay-dom - - fay-geoposition - fay-hsx - - fay-jquery - - fay-ref - fay-simplejson - - fay-text - - fay-uri - - fay-websockets - fb-persistent - fbmessenger-api - fbrnch @@ -5307,6 +5362,7 @@ broken-packages: - fizzbuzz-as-a-service - flac - flac-picture + - flaccuraterip - flamethrower - flamingra - flashblast @@ -5360,6 +5416,7 @@ broken-packages: - forest - forest-fire - Forestry + - forex2ledger - forger - ForkableT - formal @@ -5377,6 +5434,7 @@ broken-packages: - forth-hll - Fortnite-Hack-Cheats-Free-V-Bucks-Generator - fortran-src + - fortran-src-extras - fortytwo - foscam-directory - foscam-filename @@ -5449,6 +5507,8 @@ broken-packages: - ft-generator - ftdi - FTGL-bytestring + - ftp-client + - ftp-client-conduit - ftp-conduit - ftphs - FTPLine @@ -5493,6 +5553,7 @@ broken-packages: - fwgl - fwgl-glfw - fwgl-javascript + - fxpak - g-npm - g2 - g2q @@ -5574,6 +5635,7 @@ broken-packages: - GenSmsPdu - gentlemark - GenussFold + - genvalidity-persistent - geo-resolver - GeocoderOpenCage - geodetic @@ -5589,6 +5651,7 @@ broken-packages: - GGg - ggtsTC - gh-labeler + - ghc-bignum - ghc-clippy-plugin - ghc-core-smallstep - ghc-datasize @@ -5640,8 +5703,6 @@ broken-packages: - gi-gstaudio - gi-gstpbutils - gi-gsttag - - gi-gtk-declarative - - gi-gtk-declarative-app-simple - gi-gtkosxapplication - gi-gtksheet - gi-handy @@ -5847,6 +5908,7 @@ broken-packages: - gross - GroteTrap - groundhog-converters + - groundhog-mysql - group-theory - group-with - grouped-list @@ -5932,6 +5994,7 @@ broken-packages: - hackernews - HackMail - hackmanager + - hackport - hactor - hactors - haddock @@ -6120,6 +6183,7 @@ broken-packages: - haskell-ml - haskell-mpfr - haskell-mpi + - haskell-names - haskell-neo4j-client - haskell-openflow - haskell-overridez @@ -6242,6 +6306,7 @@ broken-packages: - haskyapi - haslo - hasloGUI + - hasmin - hasparql-client - hasql-backend - hasql-class @@ -6353,7 +6418,6 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens - - hedgehog-classes - hedgehog-fakedata - hedgehog-gen-json - hedgehog-generic @@ -6405,6 +6469,7 @@ broken-packages: - heterolist - hetris - heukarya + - hevm - hevolisa - hevolisa-dph - hex-text @@ -6418,6 +6483,7 @@ broken-packages: - hexpr - hexpress - hexquote + - hexstring - hext - hextream - heyefi @@ -6441,8 +6507,6 @@ broken-packages: - hGelf - hgen - hgeometric - - hgeometry - - hgeometry-combinatorial - hgeometry-ipe - hgeometry-svg - hgeos @@ -6459,6 +6523,7 @@ broken-packages: - HHDL - hhp - hhwloc + - hi - hi3status - hiccup - hichi @@ -6547,6 +6612,7 @@ broken-packages: - hlrdb - hlrdb-core - hls + - hls-exactprint-utils - hlwm - hly - hmark @@ -6599,6 +6665,7 @@ broken-packages: - hol - hold-em - hole + - holmes - Holumbus-Searchengine - holy-project - homeomorphic @@ -6722,6 +6789,7 @@ broken-packages: - hs-scrape - hs-snowtify - hs-speedscope + - hs-tags - hs-twitter - hs-twitterarchiver - hs-vcard @@ -6787,6 +6855,7 @@ broken-packages: - HsHyperEstraier - hsI2C - hSimpleDB + - hsimport - hsinspect - hsinspect-lsp - HsJudy @@ -6933,6 +7002,7 @@ broken-packages: - human-text - humble-prelude - hums + - hunch - HUnit-Diff - hunit-gui - hunit-rematch @@ -7021,7 +7091,6 @@ broken-packages: - ib-api - iban - ical - - iCalendar - ice40-prim - IcoGrid - iconv-typed @@ -7101,6 +7170,7 @@ broken-packages: - indentation-core - indentation-parsec - indentation-trifecta + - indents - index-core - indexation - IndexedList @@ -7151,6 +7221,7 @@ broken-packages: - interruptible - interval - IntFormats + - intricacy - intro-prelude - introduction - introduction-test @@ -7291,7 +7362,6 @@ broken-packages: - json-builder - JSON-Combinator - JSON-Combinator-Examples - - json-directory - json-encoder - json-enumerator - json-extra @@ -7301,6 +7371,7 @@ broken-packages: - json-pointer-hasql - json-pointy - json-python + - json-query - json-rpc-client - json-schema - json-sop @@ -7316,6 +7387,7 @@ broken-packages: - jsonextfilter - JsonGrammar - jsonifier + - jsonnet - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -7493,8 +7565,6 @@ broken-packages: - language-dart - language-dickinson - language-dockerfile - - language-ecmascript - - language-ecmascript-analysis - language-eiffel - language-elm - language-fortran @@ -7543,7 +7613,6 @@ broken-packages: - latex-svg-image - latex-svg-pandoc - LATS - - lattices - launchdarkly-server-sdk - launchpad-control - lawless-concurrent-machines @@ -7644,6 +7713,7 @@ broken-packages: - libxml-enumerator - libxslt - lie + - life-sync - lifetimes - lifted-base-tf - lifted-protolude @@ -7702,6 +7772,7 @@ broken-packages: - liquid-platform - liquid-prelude - liquid-vector + - liquidhaskell - liquidhaskell-cabal - Liquorice - list-fusion-probe @@ -7933,6 +8004,7 @@ broken-packages: - math-grads - math-interpolate - math-metric + - math-programming - math-programming-glpk - math-programming-tests - mathblog @@ -7997,6 +8069,8 @@ broken-packages: - memorypool - menoh - menshen + - mergeful-persistent + - mergeless-persistent - merkle-patricia-db - merkle-tree - messagepack-rpc @@ -8024,6 +8098,7 @@ broken-packages: - mi - Michelangelo - miconix-test + - micro-gateway - micro-recursion-schemes - microbase - microformats2-parser @@ -8074,6 +8149,7 @@ broken-packages: - miss-porcelain - missing-py2 - MissingPy + - mit-3qvpPyAi6mH - mix-arrows - mixed-strategies - mixpanel-client @@ -8279,6 +8355,7 @@ broken-packages: - muon - murder - murmur + - murmur3 - murmurhash3 - mushu - music-graphics @@ -8352,6 +8429,7 @@ broken-packages: - nationstates - nats-client - nats-queue + - natural - natural-number - NaturalLanguageAlphabets - NaturalSort @@ -8414,6 +8492,7 @@ broken-packages: - network-minihttp - network-msgpack-rpc - network-netpacket + - network-packet-linux - network-protocol-xmpp - network-rpca - network-server @@ -8526,6 +8605,7 @@ broken-packages: - NXTDSL - nylas - nymphaea + - nyx-game - oanda-rest-api - oasis-xrd - oauth2-jwt-bearer @@ -8592,6 +8672,7 @@ broken-packages: - OpenAFP - OpenAFP-Utils - openai-hs + - openai-servant - openapi-petstore - openapi-typed - openapi3 @@ -8689,6 +8770,7 @@ broken-packages: - pam - pan-os-syslog - panda + - pandoc-citeproc - pandoc-csv2table - pandoc-filter-graphviz - pandoc-filter-indent @@ -8759,6 +8841,7 @@ broken-packages: - parsers-megaparsec - parsestar - parsimony + - parsnip - partage - partial-lens - partial-records @@ -8849,6 +8932,7 @@ broken-packages: - persistent-odbc - persistent-protobuf - persistent-ratelimit + - persistent-redis - persistent-relational-record - persistent-template-classy - persistent-test @@ -8921,6 +9005,7 @@ broken-packages: - pipes-extra - pipes-files - pipes-illumina + - pipes-interleave - pipes-io - pipes-key-value-csv - pipes-mongodb @@ -8941,6 +9026,7 @@ broken-packages: - pivotal-tracker - pixel-printer - pixelated-avatar-generator + - pixiv - pkcs10 - pkcs7 - pkggraph @@ -8999,7 +9085,11 @@ broken-packages: - polydata-core - polynomial - polysemy-chronos + - polysemy-conc - polysemy-http + - polysemy-log + - polysemy-log-co + - polysemy-log-di - polysemy-methodology - polysemy-methodology-composite - polysemy-optics @@ -9050,6 +9140,7 @@ broken-packages: - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed + - postgresql-simple-url - postgresql-syntax - postgresql-tx-query - postgresql-tx-squeal @@ -9116,7 +9207,6 @@ broken-packages: - primitive-checked - primitive-containers - primitive-convenience - - primitive-extras - primitive-foreign - primitive-indexed - primitive-maybe @@ -9183,6 +9273,7 @@ broken-packages: - proto-lens-arbitrary - proto-lens-combinators - proto-lens-descriptors + - proto-lens-optparse - proto3-suite - proto3-wire - protobuf-native @@ -9256,6 +9347,7 @@ broken-packages: - QIO - QLearn - qlinear + - qnap-decrypt - qr-imager - qr-repa - qsem @@ -9293,6 +9385,7 @@ broken-packages: - quickcheck-string-random - quickcheck-webdriver - QuickCheckVariant + - quickjs-hs - QuickPlot - quickpull - quickset @@ -9355,6 +9448,7 @@ broken-packages: - random-stream - RandomDotOrg - Range + - range-set-list - range-space - rangemin - Ranka @@ -9412,6 +9506,7 @@ broken-packages: - read-bounded - read-ctags - read-io + - readability - readline - readline-statevar - readme-lhs @@ -9503,6 +9598,7 @@ broken-packages: - regions-monadstf - regions-mtl - register-machine-typelevel + - registry - registry-hedgehog - regress - regression-simple @@ -9516,6 +9612,7 @@ broken-packages: - reified-records - reify - relacion + - relapse - relational-postgresql8 - relational-query-postgresql-pure - relative-date @@ -9840,6 +9937,7 @@ broken-packages: - seclib - second-transfer - secp256k1 + - secp256k1-haskell - secp256k1-legacy - secret-santa - secrm @@ -9880,6 +9978,7 @@ broken-packages: - sequent-core - sequor - serialize-instances + - serialport - serokell-util - serpentine - serv @@ -10012,6 +10111,7 @@ broken-packages: - shake-extras - shake-futhark - shake-minify + - shake-minify-css - shake-pack - shake-path - shake-persist @@ -10052,6 +10152,7 @@ broken-packages: - Shpadoinkle-examples - Shpadoinkle-html - Shpadoinkle-router + - Shpadoinkle-streaming - Shpadoinkle-template - Shpadoinkle-widgets - shpider @@ -10065,7 +10166,9 @@ broken-packages: - sign - signable - signals + - signature - signed-multiset + - signify-hs - silkscreen - silvi - simd @@ -10091,6 +10194,7 @@ broken-packages: - simple-pipe - simple-rope - simple-server + - simple-sql-parser - simple-stacked-vm - simple-tabular - simple-tar @@ -10112,6 +10216,8 @@ broken-packages: - simseq - singleton-dict - singleton-typelits + - singletons-base + - singletons-th - singnal - singular-factory - sink @@ -10138,6 +10244,7 @@ broken-packages: - skype4hs - slack - slack-notify-haskell + - slack-verify - slack-web - slave-thread - sliceofpy @@ -10318,6 +10425,7 @@ broken-packages: - splaytree - spline3 - splines + - splint - split-morphism - splitter - Spock @@ -10428,9 +10536,7 @@ broken-packages: - STL - STLinkUSB - stm-chunked-queues - - stm-containers - stm-firehose - - stm-hamt - stm-promise - stm-stats - STM32-Zombie @@ -10496,6 +10602,7 @@ broken-packages: - stripe-hs - stripe-http-streams - stripe-scotty + - stripe-signature - stripe-wreq - strongswan-sql - structural-induction @@ -10543,6 +10650,8 @@ broken-packages: - supplemented - surjective - sv + - sv-cassava + - sv-core - sv-svfactor - SVD2HS - svfactor @@ -10563,6 +10672,7 @@ broken-packages: - swf - swift-lda - swiss-ephemeris + - switch - sws - syb-extras - syb-with-class-instances-text @@ -10657,11 +10767,11 @@ broken-packages: - target - task - task-distribution - - taskell - TaskMonad - tasty-auto - tasty-bdd - tasty-fail-fast + - tasty-grading-system - tasty-groundhog-converters - tasty-hedgehog-coverage - tasty-html @@ -10672,6 +10782,7 @@ broken-packages: - tasty-mgolden - tasty-silver - tasty-stats + - tasty-test-vector - tateti-tateti - Taxonomy - TaxonomyTools @@ -10922,6 +11033,8 @@ broken-packages: - trace-function-call - traced - tracetree + - tracing + - tracing-control - tracked-files - tracker - trackit @@ -11099,6 +11212,7 @@ broken-packages: - uhc-light - uhc-util - uhexdump + - uhttpc - ui-command - UMM - unagi-bloomfilter @@ -11138,7 +11252,6 @@ broken-packages: - universe-instances-base - universe-instances-extended - universe-instances-trans - - universe-reverse-instances - universe-th - unix-fcntl - unix-handle @@ -11171,6 +11284,7 @@ broken-packages: - upskirt - urbit-airlock - urbit-api + - urbit-hob - ureader - urembed - uri @@ -11264,7 +11378,6 @@ broken-packages: - vect-floating-accelerate - vect-opengl - vector-bytestring - - vector-circular - vector-clock - vector-conduit - vector-endian @@ -11387,6 +11500,7 @@ broken-packages: - waitra - waldo - wallpaper + - warc - warp-dynamic - warp-static - warp-systemd @@ -11432,7 +11546,9 @@ broken-packages: - webdriver-w3c - WeberLogic - webfinger-client + - webify - webkit-javascriptcore + - webmention - Webrexp - webserver - webshow @@ -11495,6 +11611,7 @@ broken-packages: - WordNet - WordNet-ghc74 - wordpass + - wordpress-auth - wordsearch - work-time - workdays @@ -11826,6 +11943,7 @@ broken-packages: - zoom-cache-pcm - zoom-cache-sndfile - zoom-refs + - zoovisitor - zsdd - zsh-battery - zsyntax diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 492b8ac72d..a06caa4106 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -445,6 +445,7 @@ self: super: builtins.intersectAttrs super { # requires an X11 display in test suite gi-gtk-declarative = dontCheck super.gi-gtk-declarative; + gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple; # tests depend on executable ghcide = overrideCabal super.ghcide (drv: { @@ -815,5 +816,4 @@ self: super: builtins.intersectAttrs super { # Tests access internet prune-juice = dontCheck super.prune-juice; - } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 345632ddd8..1e61e38db9 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2266,8 +2266,8 @@ self: { }: mkDerivation { pname = "C-structs"; - version = "0.2.0.1"; - sha256 = "1l7mygk0ia93wqcm61v8mdlnspxscdplxg4qpffvx4ldfafxc7x9"; + version = "0.2.0.2"; + sha256 = "0v70j2wlhj91cmlc2247z7i3yak04b28ig093xaihawlqyb6hxjg"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base doctest Glob HUnit QuickCheck template-haskell test-framework @@ -6433,8 +6433,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.7.0"; - sha256 = "0g4c8s4v3lg7bnsz8n09zrf8cwyywmxpv97wkwx6xvflknb7z0cc"; + version = "0.7.1"; + sha256 = "10js8xhp1v6gk6aagrzkn5c2c2gg4xml9vavpvhjfvj2jz77rfkm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9431,10 +9431,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.15"; - sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; - revision = "2"; - editedCabalFile = "1rkazrbxfpx7bhp6fhgx97j58i4ccyp8bxjgdhr33cpv1b2cza9b"; + version = "4000.3.16"; + sha256 = "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9498,20 +9496,6 @@ self: { }) {}; "HUnit" = callPackage - ({ mkDerivation, base, call-stack, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.6.1.0"; - sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123"; - revision = "1"; - editedCabalFile = "1pb42lix1fzhvcc2g7kz5lw8fsz6kcj9b7almr7kvv38f8vmbn5i"; - libraryHaskellDepends = [ base call-stack deepseq ]; - testHaskellDepends = [ base call-stack deepseq filepath ]; - description = "A unit testing framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "HUnit_1_6_2_0" = callPackage ({ mkDerivation, base, call-stack, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -9521,7 +9505,6 @@ self: { testHaskellDepends = [ base call-stack deepseq filepath ]; description = "A unit testing framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -10820,20 +10803,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.5.1"; - sha256 = "1np4yyiq4935p1vbf89m0ifkilzc6vzab9i8x7c21y9s7rsv4rj9"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10845,7 +10814,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -10982,8 +10950,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.0"; sha256 = "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg"; - revision = "2"; - editedCabalFile = "0sf4clxx3i3s6666w3il65fijx2xmgb1mxml9jgc5y40sj3qb3mm"; + revision = "3"; + editedCabalFile = "0vhdndyj5f07vvvnssn5ybdja5wmaydq0n2lfpihvdg4dkhczrx2"; libraryHaskellDepends = [ aeson base bytestring containers HsYAML mtl scientific text unordered-containers vector @@ -11241,6 +11209,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "IPv6Addr_2_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "2.0.1"; + sha256 = "0gkk20ngbfrr64w5szjhvlwlmali4xcx36iqa714cbxy6lpqy5cl"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -18632,6 +18619,8 @@ self: { libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; description = "Integration of the streaming library with Shpadoinkle continuations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-template" = callPackage @@ -20875,8 +20864,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.4"; - sha256 = "1v4m9b13p0sf3gs8qvdgkai4r9kb6sszw2qdyxrn6i4nq62f19zq"; + version = "0.5"; + sha256 = "1gar1xb7hbc452ck8351wikvryradna9bpphzd9kqwk0kx76nl3n"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -22033,8 +22022,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.7.1.0"; - sha256 = "12ay07rfyprdbgf6ndh4ywcklfqnjdk1gdf0xli27a96i86i7x44"; + version = "0.7.3.0"; + sha256 = "1ggxlg47m14lcxwqvs3ddldn1pz19pqxkgg6in5w6l4k62cwyhc1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -23408,6 +23397,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "A \"don't\" construct"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "acme-flipping-tables" = callPackage @@ -24451,6 +24442,8 @@ self: { pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; + revision = "1"; + editedCabalFile = "1y7ddmghsjblsxaj1wyif66wrw0vvp2dca5i7v9rqk33z1r6iryk"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -24605,8 +24598,8 @@ self: { pname = "aeson-compat"; version = "0.3.9"; sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; - revision = "5"; - editedCabalFile = "11ca16ff12jp0kndhwaq8gm3jc2irs3hbmd1lh2lwrqyq498d8k6"; + revision = "6"; + editedCabalFile = "18ni5j2zvn7qfdama9j1s84kz9ylsnjmi5ynbq68mpri5wimm448"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -24721,28 +24714,29 @@ self: { }) {}; "aeson-extra" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec - , attoparsec-iso8601, base, base-compat-batteries, bytestring - , containers, deepseq, exceptions, hashable, parsec - , quickcheck-instances, recursion-schemes, scientific, semialign - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , these, time, time-parsers, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat-batteries, bytestring, containers, deepseq + , exceptions, hashable, parsec, quickcheck-instances + , recursion-schemes, scientific, semialign, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, these, time-parsers + , unordered-containers, vector }: mkDerivation { pname = "aeson-extra"; - version = "0.4.1.3"; - sha256 = "1k15vkyf635nh904diyg931ziwdngikvp7c9c339pys3savf5qr2"; - revision = "4"; - editedCabalFile = "0gwjgxpgq7lncylfpccikmn3jk2jmz54vsgjialhwa26iv9f9n4a"; + version = "0.5"; + sha256 = "0nlp6bwb8zynfncfzr05fi9acfs8n2fkz4anm2c0g97dk2ziq213"; + revision = "1"; + editedCabalFile = "1x1fh0zgb0y3w7wf94zznbmdmbxs0b5n7prfw324g3kzhi428s3d"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec attoparsec-iso8601 base - base-compat-batteries bytestring containers deepseq exceptions - hashable parsec recursion-schemes scientific semialign - template-haskell text these time unordered-containers vector + aeson attoparsec attoparsec-iso8601 base base-compat-batteries + bytestring containers deepseq exceptions hashable parsec + recursion-schemes scientific semialign template-haskell text these + unordered-containers vector ]; testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-hunit - tasty-quickcheck time time-parsers unordered-containers vector + aeson base base-compat-batteries containers quickcheck-instances + tasty tasty-hunit tasty-quickcheck time-parsers + unordered-containers vector ]; description = "Extra goodies for aeson"; license = lib.licenses.bsd3; @@ -24992,8 +24986,8 @@ self: { pname = "aeson-optics"; version = "1.1.0.1"; sha256 = "1pfi84cl7w5bp7dwdhcyi8kchvbfjybqcp0sifqrn70dj2b50mf7"; - revision = "4"; - editedCabalFile = "02g4438a6h2l0brvj1izagrsx9mgs1gqfds98vjzdsmamaqsm8fl"; + revision = "5"; + editedCabalFile = "102mdf74ka25qnw45282j7c4ds3v4mppa3g1mp1hr0hf0f2ya3bk"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring optics-core optics-extra scientific text unordered-containers vector @@ -25374,6 +25368,8 @@ self: { ]; description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aeson-with" = callPackage @@ -25866,8 +25862,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.9"; - sha256 = "0chmrj8r1qh1k1xkp9gybadxz5zz04v2zh26byrckyx7l2bb7j8x"; + version = "5.9.1"; + sha256 = "15l6lgzl64ym21rzf6dbp927bj0s23kx9rp2z34k36ghy4sbdqjz"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -25882,8 +25878,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.3"; - sha256 = "1xb7l92vhaccfx9n83x6viamnkxy97c6a3plcf7gllijzrc4i1pf"; + version = "0.3.2"; + sha256 = "1bd85lk70h6p4a1v0h8dhbnsx5sc8cyj916kaq1hn6r0ykkrnsjd"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl mwc-random random ]; @@ -25916,8 +25912,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.3"; - sha256 = "0ch2h7scg43x5mdmvqyjabh96vhshz94r8b58pi9ikp7w4rm7wk9"; + version = "5.3.3"; + sha256 = "0ps0spjd7himcfgr9ahh27c24isdvxrihf4qv2sr7cs33n6h7hsj"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -25983,8 +25979,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.6.1"; - sha256 = "06jx9340rr8a23gpzwwzqv0baqnv62w8cf8slcmcmlr0k84lg4ca"; + version = "0.6.2"; + sha256 = "09dfb212jjyd4fwqbl1bmm5k2sndzpx47vw688vgnx37zd94jwwj"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -25999,8 +25995,8 @@ self: { }: mkDerivation { pname = "aivika-lattice"; - version = "0.6"; - sha256 = "0199d3ycs98a7gbqaakv2s4aj1paw08ix32xv3ln4p7x56avc6rn"; + version = "0.6.2"; + sha256 = "0misn0pkrkfyyzg859y57ida2xc9ibmz5ykizj1fw30zsby57skl"; libraryHaskellDepends = [ aivika aivika-transformers array base containers mtl mwc-random random @@ -26015,8 +26011,8 @@ self: { }: mkDerivation { pname = "aivika-realtime"; - version = "0.3"; - sha256 = "1qprmkklyna16n56zxkaryy0fawvc9mjws0mcw87bcl56m18npcm"; + version = "0.3.1"; + sha256 = "0wvv41ip4izwa22l7p6zz1sdr8vchlakvm5vka33r5gkq10fw6s9"; libraryHaskellDepends = [ aivika aivika-transformers async base containers mtl mwc-random random stm time vector @@ -26031,8 +26027,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.9"; - sha256 = "1vqwhjwjsnrbqp3n97arl2nz28xb0vwxvsn42iqf8fxj6xsks3y1"; + version = "5.9.1"; + sha256 = "0ii7g6a29fksg3lrk6vvlhaafdjssqypz92spksnpgjfv7iamk99"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -26991,6 +26987,30 @@ self: { ]; }) {inherit (pkgs) alsaLib;}; + "alsa-seq_0_6_0_8" = callPackage + ({ mkDerivation, alsa-core, alsaLib, array, base, bytestring + , data-accessor, enumset, extensible-exceptions, poll, transformers + , utility-ht + }: + mkDerivation { + pname = "alsa-seq"; + version = "0.6.0.8"; + sha256 = "00f7873484nifbimdav0b25sipgx3rn6xx1il6qgvz0p70pzzljv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alsa-core array base bytestring data-accessor enumset + extensible-exceptions poll transformers utility-ht + ]; + libraryPkgconfigDepends = [ alsaLib ]; + description = "Binding to the ALSA Library API (MIDI sequencer)"; + license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) alsaLib;}; + "alsa-seq-tests" = callPackage ({ mkDerivation, alsa, base }: mkDerivation { @@ -28072,6 +28092,8 @@ self: { ]; description = "Amazon Elastic Compute Cloud SDK"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "amazonka-ecr" = callPackage @@ -31734,6 +31756,8 @@ self: { ]; description = "Apple Push Notification service HTTP/2 integration"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "apotiki" = callPackage @@ -31974,6 +31998,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "apply-unordered" = callPackage + ({ mkDerivation, base, fin, ghc, ghc-tcplugins-extra, hspec + , should-not-typecheck, syb + }: + mkDerivation { + pname = "apply-unordered"; + version = "1.0"; + sha256 = "0ajvml2kndhpkcjlcb2a2aaxfi45rlbjq8brd1j9k66xymjkxigp"; + libraryHaskellDepends = [ base fin ghc ghc-tcplugins-extra syb ]; + testHaskellDepends = [ + base fin ghc ghc-tcplugins-extra hspec should-not-typecheck syb + ]; + description = "Apply a function to an argument specified by a type level Nat"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "apply-unordered-mono" = callPackage + ({ mkDerivation, base, hspec, should-not-typecheck }: + mkDerivation { + pname = "apply-unordered-mono"; + version = "1.0"; + sha256 = "1wpla9alhi0srhhy1vxv0dk5hgd0gnwwbwczm6a70w9gga3nms7z"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec should-not-typecheck ]; + description = "Apply functions to arguments in an unordered type-directed fashion"; + license = lib.licenses.bsd3; + }) {}; + "apportionment" = callPackage ({ mkDerivation, base, containers, utility-ht }: mkDerivation { @@ -32245,6 +32299,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Simple logging library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arbor-monad-metric" = callPackage @@ -32315,6 +32371,8 @@ self: { ]; description = "Convenience types and functions for postgresql-simple"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arbtt" = callPackage @@ -32327,8 +32385,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.4"; - sha256 = "18lpwhkhw0nxzif9dyc29b9s8i0v26y9vdgh0laj3z9yyp805syc"; + version = "0.11"; + sha256 = "1jxsmwi7nqgmhnx1hv7y1hcff4gpi3zsg3lrzkq3y8dj2pz29whw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32386,8 +32444,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.7.1.0"; - sha256 = "120kxjz27llinggq6qwihqjbs1f4q0wdfb79fmrb80k25pvhkn8v"; + version = "0.8.0.0"; + sha256 = "1g33ss6jvvpdgpcl0kwmbvnkawq8cngphjmsbv0jcpnh17brgf8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33974,6 +34032,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "assert4hs" = callPackage + ({ mkDerivation, base, data-default, pretty-diff, tasty, text }: + mkDerivation { + pname = "assert4hs"; + version = "0.0.0.1"; + sha256 = "141ic9k4v5qqx64ksy925ksscs2dyixqp3bpxk9rfz6m2mam5091"; + libraryHaskellDepends = [ base data-default pretty-diff text ]; + testHaskellDepends = [ base data-default pretty-diff tasty text ]; + description = "A set of assertion for writing more readable tests cases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "assert4hs-tasty" = callPackage + ({ mkDerivation, assert4hs, base, tasty }: + mkDerivation { + pname = "assert4hs-tasty"; + version = "0.0.0.1"; + sha256 = "1gdbd52laywmnyiprg4igf1hwgqna317l04n774388hsfss8gv7p"; + libraryHaskellDepends = [ assert4hs base tasty ]; + testHaskellDepends = [ assert4hs base tasty ]; + description = "Provider for tasty runner to run assert4hs tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "assertions" = callPackage ({ mkDerivation, ansi-terminal, base, containers, interpolate , process @@ -34517,6 +34603,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "atlas" = callPackage + ({ mkDerivation, base, containers, data-default, hspec, inline-c + , lens, primitive, template-haskell, transformers + }: + mkDerivation { + pname = "atlas"; + version = "0"; + sha256 = "0g98waw84hrhzpky73p1dy4mfc06vf665xfn6f2f9xv2jnxi0rgw"; + libraryHaskellDepends = [ + base containers data-default inline-c lens primitive + template-haskell transformers + ]; + testHaskellDepends = [ base hspec primitive transformers ]; + description = "Skyline rectangle packing"; + license = "(BSD-2-Clause OR Apache-2.0)"; + }) {}; + "atlassian-connect-core" = callPackage ({ mkDerivation, aeson, atlassian-connect-descriptor, base , base64-bytestring, bytestring, case-insensitive, cipher-aes @@ -34551,8 +34654,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.10.0"; - sha256 = "0nixj6cv367b6a2xa0pf37z6fcmrnwmngc27ps9qy85hc4nnl3cy"; + version = "0.4.12.0"; + sha256 = "0l8912w6iscnv3q32kd7jfnymg7gnrjpx4jrn4bxggv8bdls7raa"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -35075,6 +35178,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec_0_14_1" = 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.14.1"; + sha256 = "1cr9mlv4ppba31khpgripasy6zk1g353yf1fq1vzja0cv60qy3w7"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -35169,6 +35301,8 @@ self: { pname = "attoparsec-expr"; version = "0.1.1.2"; sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d"; + revision = "1"; + editedCabalFile = "1cpgzd24fvrpsly113ck8rhrc33pfw8qhfpk4wn85qj95763faqb"; libraryHaskellDepends = [ attoparsec base ]; description = "Port of parsec's expression parser to attoparsec"; license = lib.licenses.bsd3; @@ -35200,6 +35334,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.2.0"; sha256 = "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582"; + revision = "1"; + editedCabalFile = "1c43ynmjfljp3nsp67521nrnb0d4vzwr33dfqf15xh02gifcf9ma"; libraryHaskellDepends = [ attoparsec base base-compat-batteries text time time-compat ]; @@ -36028,8 +36164,8 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "aviation-units"; - version = "0.0.2"; - sha256 = "14m3sbic6zppg8hn1i7b6rd40bw731hz6mr393h897jjlvxygcc2"; + version = "0.0.3"; + sha256 = "1161mjw9vr7wl0isakw786xds9ajs5r8gx91rsyxn0nb9zvafdr1"; libraryHaskellDepends = [ base lens ]; description = "Units of measurements used in aviation"; license = lib.licenses.bsd3; @@ -36039,8 +36175,8 @@ self: { ({ mkDerivation, aviation-units, base, lens }: mkDerivation { pname = "aviation-weight-balance"; - version = "0.0.2"; - sha256 = "1pqkqxdhl1a3pbrmjxz9vl3wjp90kic9vi6bjjr2q9i6six1xbjw"; + version = "0.0.3"; + sha256 = "1jl51pxhll513zyvhnmahvhidx2rd6vll1in6xdqrdh9rn0q8baw"; libraryHaskellDepends = [ aviation-units base lens ]; description = "Weight and Balance structures used in aviation"; license = lib.licenses.bsd3; @@ -37231,6 +37367,8 @@ self: { benchmarkHaskellDepends = [ base criterion pipes ]; description = "Immutable disk-based B* trees"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "b9" = callPackage @@ -37927,20 +38065,17 @@ self: { broken = true; }) {}; - "base_4_14_1_0" = callPackage - ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: + "base_4_15_0_0" = callPackage + ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.14.1.0"; - sha256 = "15n0ya681yvfvccswcxxk855qv7wz886rmnabj0y6ah7mbf8aijs"; - libraryHaskellDepends = [ - ghc-prim invalid-cabal-flag-settings rts - ]; + version = "4.15.0.0"; + sha256 = "12s4v5w97vaxk66a1mgdgypv765j61lq2n2h4iiazirpggd73n3g"; + libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; - }) {invalid-cabal-flag-settings = null;}; + }) {}; "base-compat" = callPackage ({ mkDerivation, base, unix }: @@ -37997,6 +38132,8 @@ self: { ]; description = "Binary-to-text encodings (e.g. base64)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base-feature-macros" = callPackage @@ -38111,6 +38248,8 @@ self: { ]; description = "Fast RFC 4648-compliant Base16 encoding"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base16-bytestring_0_1_1_7" = callPackage @@ -38159,6 +38298,8 @@ self: { ]; description = "Optics for the Base16 library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base32" = callPackage @@ -39963,6 +40104,8 @@ self: { ]; description = "Implementation of the BGAPI serial protocol"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bgmax" = callPackage @@ -40055,6 +40198,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "bidi-icu" = callPackage + ({ mkDerivation, base, containers, data-default, ghc-prim, hspec + , icu-uc, inline-c, primitive, tasty, tasty-hspec, template-haskell + , text, transformers, vector + }: + mkDerivation { + pname = "bidi-icu"; + version = "0"; + sha256 = "000z286nmqvxjx55dxxfrz2pxjdjnwcbpjm7a7wlm5ng70704bpj"; + libraryHaskellDepends = [ + base containers data-default ghc-prim inline-c primitive + template-haskell text transformers vector + ]; + libraryPkgconfigDepends = [ icu-uc ]; + testHaskellDepends = [ + base data-default ghc-prim hspec primitive tasty tasty-hspec text + vector + ]; + description = "The unicode bidirectional algorithm via ICU"; + license = "(BSD-2-Clause OR Apache-2.0)"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {icu-uc = null;}; + "bidirectional" = callPackage ({ mkDerivation, base, hedgehog, mtl, profunctors }: mkDerivation { @@ -40671,6 +40838,25 @@ self: { license = lib.licenses.mit; }) {}; + "binary-parser_0_5_7" = callPackage + ({ mkDerivation, base, bytestring, mtl, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5.7"; + sha256 = "03w8xjy45kvakxk085234gi9mhg5vhz6394kh8bhd275qwf4g8cz"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "A highly-efficient but limited parser API specialised for bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-parsers" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-lexing, case-insensitive, criterion, deepseq @@ -42164,6 +42350,8 @@ self: { ]; description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "birch-beer" = callPackage @@ -42566,6 +42754,8 @@ self: { ]; description = "Bitcoin keys"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bitcoin-payment-channel" = callPackage @@ -42718,6 +42908,8 @@ self: { ]; description = "Provides consistent low-level types used commonly among Bitcoin implementations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bitcoind-regtest" = callPackage @@ -43126,8 +43318,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "3"; - editedCabalFile = "0sx6i1b9slicisnj53sv2jbdryyqd66amcm43xxqlv5srsqqijdm"; + revision = "4"; + editedCabalFile = "0fjcz8239fagjb4pc42digg511rjaz9r8j8fcvcb6ncxijg7g694"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -44425,6 +44617,8 @@ self: { ]; description = "Copy a directory tree, making zero-size sparse copies of big files"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bogre-banana" = callPackage @@ -45162,6 +45356,30 @@ self: { broken = true; }) {}; + "bottom" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hspec + , megaparsec, optparse-applicative, QuickCheck, text + }: + mkDerivation { + pname = "bottom"; + version = "0.2.0.0"; + sha256 = "1vsrp4vc2nd16nqwysmg2lqfjy142fgfifpa96z6ns3z47ppid49"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq megaparsec text + ]; + executableHaskellDepends = [ + base bytestring optparse-applicative text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck text ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Encoding and decoding for the Bottom spec"; + license = lib.licenses.asl20; + }) {}; + "bound" = callPackage ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad , deepseq, deriving-compat, functor-classes-compat, hashable @@ -45205,6 +45423,8 @@ self: { ]; description = "ScopeH and ScopeT extras for bound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bound-gen" = callPackage @@ -45830,8 +46050,8 @@ self: { }: mkDerivation { pname = "brittany"; - version = "0.13.1.0"; - sha256 = "0dw4s4lcb34fkv4i0rylna6zrr55rgkqs1s75lhn8zskwl7j89bs"; + version = "0.13.1.1"; + sha256 = "1z47kzmff9vdnkg4xihpdvccfy5080i05mg4j8sy3nv4mwja0ki1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47808,6 +48028,26 @@ self: { license = lib.licenses.mit; }) {}; + "bytestring-strict-builder_0_4_5_4" = callPackage + ({ mkDerivation, base, bytestring, criterion, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "bytestring-strict-builder"; + version = "0.4.5.4"; + sha256 = "1yjhxqsb96gi8ll70wf1p6islx0959f62fd6ypap4wyp4v2dr8c4"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "An efficient strict bytestring builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-substring" = callPackage ({ mkDerivation, base, bytestring, pipes, primitive }: mkDerivation { @@ -47874,6 +48114,28 @@ self: { license = lib.licenses.mit; }) {}; + "bytestring-tree-builder_0_2_7_9" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq + , QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.7.9"; + sha256 = "0lmm52716b0qqnlpqgiscc92wk9n1fckydmp4vzi58h5majzpnyb"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base-prelude bytestring QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base-prelude bytestring criterion deepseq + ]; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-trie" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -48618,6 +48880,8 @@ self: { ]; description = "Cabal utility"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cabal-file" = callPackage @@ -49124,6 +49388,28 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "cabal-rpm_2_0_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, http-client, http-client-tls, http-conduit + , optparse-applicative, process, simple-cabal, simple-cmd + , simple-cmd-args, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.0.8"; + sha256 = "18ryg2qv1ppxkylgniw4iava9gh410pp6ibm1362ij52128z6rhz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath http-client + http-client-tls http-conduit optparse-applicative process + simple-cabal simple-cmd simple-cmd-args time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50120,6 +50406,22 @@ self: { broken = true; }) {}; + "calamity-commands" = callPackage + ({ mkDerivation, base, generic-lens, lens, megaparsec, polysemy + , polysemy-plugin, text, text-show, unordered-containers + }: + mkDerivation { + pname = "calamity-commands"; + version = "0.1.0.0"; + sha256 = "0l2x65w7inib5bdfw0gzffm3pdlsylnivnjc8y82x7fi6jha8jcp"; + libraryHaskellDepends = [ + base generic-lens lens megaparsec polysemy polysemy-plugin text + text-show unordered-containers + ]; + description = "A library for declaring, parsing, and invoking text-input based commands"; + license = lib.licenses.mit; + }) {}; + "calc" = callPackage ({ mkDerivation, array, base, harpy, haskell98, mtl }: mkDerivation { @@ -50302,18 +50604,6 @@ self: { }) {}; "call-stack" = callPackage - ({ mkDerivation, base, nanospec }: - mkDerivation { - pname = "call-stack"; - version = "0.2.0"; - sha256 = "1iz0wkbcqchyji72c4j4zb72vfsfdp2ys8pf9mqqsxaq774r7ilm"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base nanospec ]; - description = "Use GHC call-stacks in a backward compatible way"; - license = lib.licenses.mit; - }) {}; - - "call-stack_0_3_0" = callPackage ({ mkDerivation, base, nanospec }: mkDerivation { pname = "call-stack"; @@ -50323,7 +50613,6 @@ self: { testHaskellDepends = [ base nanospec ]; description = "Use GHC call-stacks in a backward compatible way"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "camfort" = callPackage @@ -50684,6 +50973,8 @@ self: { pname = "capability"; version = "0.4.0.0"; sha256 = "02dnvzfvn81k15qp41fqd3pk4izg8rfbj7d5f6ry0wfa8d8payq0"; + revision = "1"; + editedCabalFile = "0dqqry8qjx9gigz7x542zchrvjbmmhpafzn4fxf1dw0yd6hqavfq"; libraryHaskellDepends = [ base constraints dlist exceptions generic-lens lens monad-control monad-unlift mtl mutable-containers primitive reflection @@ -51388,6 +51679,23 @@ self: { broken = true; }) {}; + "cases_0_1_4_1" = callPackage + ({ mkDerivation, attoparsec, base, gauge, HTF, HUnit, mwc-random + , QuickCheck, rerebase, text + }: + mkDerivation { + pname = "cases"; + version = "0.1.4.1"; + sha256 = "16bl4qzjfwkbzacrj33myakqcmg2j9fgzdnykwpnnqc2vikdpn0z"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ HTF HUnit QuickCheck rerebase ]; + benchmarkHaskellDepends = [ gauge mwc-random rerebase ]; + description = "A converter for spinal, snake and camel cases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cash" = callPackage ({ mkDerivation, base, deepseq, haskell98, HaXml, network, parallel , pretty @@ -51637,8 +51945,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "3"; - editedCabalFile = "0hq9s6662ykk2ldv222xgifwzwvmhmrs56b1llqpdzp7vf7p8b3p"; + revision = "4"; + editedCabalFile = "19rkq41r5vj8drnj850b1wqnc54mxpw0x5z54brq0nvyww5f8ai8"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -52107,6 +52415,23 @@ self: { maintainers = with lib.maintainers; [ sorki ]; }) {}; + "cayenne-lpp" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring, hspec + , hspec-discover, text, time, timerep + }: + mkDerivation { + pname = "cayenne-lpp"; + version = "0.2.0.0"; + sha256 = "0v9kd7mz9kc4m3icaz64rpp55rbw8w2x33g1j609pg870i3mgkax"; + libraryHaskellDepends = [ + base binary bytestring text time timerep + ]; + testHaskellDepends = [ base base16-bytestring hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Cayenne Low Power Payload"; + license = lib.licenses.bsd3; + }) {}; + "cayley-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson @@ -52172,8 +52497,8 @@ self: { pname = "cbor-tool"; version = "0.2.2.0"; sha256 = "0rsnnz1zh9jyjif94lrdppzaa41hypqs1r5dlyzbwlw1m75g286p"; - revision = "1"; - editedCabalFile = "1z87h65g6y1w43g76r5i9ps8wkpiabbgkqq85ni8mz1m3rjizl4n"; + revision = "2"; + editedCabalFile = "15dlsldsc7fhn7i0b0rfsrdnlddjfgjap49b8915cphjc7b17p2p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55394,6 +55719,8 @@ self: { pname = "clash-lib"; version = "1.2.5"; sha256 = "14xi0llzm6f3ymlcfwq67d16ggdkqxrxkvr6rwmykxrca3j1b6r3"; + revision = "1"; + editedCabalFile = "15pvhd19yq2m1c2n33iawxngmpc6d0jfsh02038j8fbpzx68p7bw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base binary bytestring clash-prelude @@ -55435,6 +55762,8 @@ self: { pname = "clash-lib"; version = "1.4.0"; sha256 = "1i0zmz26p35hfp89s45s6g7x2rvhyjc3lrx35r06cnllw6xvp60z"; + revision = "1"; + editedCabalFile = "0gjsc0nvaqj8f5m9nknxbs1jhb6nlwfy2cxgyj73rbwhwa4w2msk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array attoparsec base @@ -56739,6 +57068,23 @@ self: { license = lib.licenses.mit; }) {}; + "closed-intervals" = callPackage + ({ mkDerivation, base, containers, doctest-exitcode-stdio + , doctest-lib, QuickCheck, time, utility-ht + }: + mkDerivation { + pname = "closed-intervals"; + version = "0.1.0.0"; + sha256 = "1k8kbqh6w7cj7qkmzvh47v9zrpf5y465lj6fzq7vk71bq0dy59vm"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ + base containers doctest-exitcode-stdio doctest-lib QuickCheck time + utility-ht + ]; + description = "Closed intervals of totally ordered types"; + license = lib.licenses.gpl3Only; + }) {}; + "closure" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -61735,6 +62081,8 @@ self: { ]; description = "conferer's FromConfig instances for snap Config"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "conferer-source-dhall" = callPackage @@ -62401,6 +62749,17 @@ self: { license = lib.licenses.mit; }) {}; + "const" = callPackage + ({ mkDerivation, base, bytestring, primitive, ptrdiff }: + mkDerivation { + pname = "const"; + version = "0"; + sha256 = "09mckqgxpfn0kvc0niyiwix7hzmcc97vdvn9bz2nnbzfaykp0fsm"; + libraryHaskellDepends = [ base bytestring primitive ptrdiff ]; + description = "Read-only mutable primitives"; + license = "(BSD-2-Clause OR Apache-2.0)"; + }) {}; + "const-math-ghc-plugin" = callPackage ({ mkDerivation, base, containers, directory, ghc, process }: mkDerivation { @@ -62657,10 +63016,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.1.1.1"; - sha256 = "06crlqgr5dswjpb9k0d5wizfl8anyrnapqfvp10amq3lgfg3sriz"; - revision = "1"; - editedCabalFile = "1fqk2bd5n52yvqx54ck2ypq9a79m8ihp7057j22rglg3b363k8j0"; + version = "1.1.1.2"; + sha256 = "1l7ririwwr6zza5m0bdq2bp118i0qaa4x21hypcbb7hz7hn2jqwa"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -62694,10 +63051,8 @@ self: { ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.3.0.2"; - sha256 = "1n3k5ld6qzq7vlwsqwrm3gsg4z7mk11ah3amazzbvbmxwz8wviys"; - revision = "2"; - editedCabalFile = "09mdfzrmnl0mc57n7h0w68i8xgp89y5729p2d2h6qb2qj81qsfq1"; + version = "0.3.1.0"; + sha256 = "0hr1xaxypkmd2a856ha8v3jhkh4hr6g8kar0lr4vj3jsj2h6cmks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -62743,6 +63098,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "construct_0_3_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest + , cereal, directory, doctest, filepath, incremental-parser + , input-parsers, markdown-unlit, monoid-subclasses, parsers + , rank2classes, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "construct"; + version = "0.3.0.2"; + sha256 = "1qng4g9x9smzg3gydpqyxalb49n9673rfn606qh3mq1xhcvj127j"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base bytestring cereal incremental-parser input-parsers + monoid-subclasses parsers rank2classes text + ]; + testHaskellDepends = [ + attoparsec base bytestring cereal directory doctest filepath + incremental-parser monoid-subclasses rank2classes tasty tasty-hunit + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "Haskell version of the Construct library for easy specification of file formats"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, base, binary-search, complex-generic , integer-roots @@ -64688,6 +65070,17 @@ self: { broken = true; }) {}; + "cps-except" = callPackage + ({ mkDerivation, base, mtl, mtl-compat }: + mkDerivation { + pname = "cps-except"; + version = "0.0.1.2"; + sha256 = "0vr53825szvw8274vba9ylr0xqla16sn0wcpy8ap1yh55in9k24w"; + libraryHaskellDepends = [ base mtl mtl-compat ]; + description = "ExceptT replacement in CPS style"; + license = lib.licenses.bsd3; + }) {}; + "cpsa" = callPackage ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { @@ -64740,6 +65133,18 @@ self: { license = lib.licenses.mit; }) {}; + "cpuinfo_0_1_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq }: + mkDerivation { + pname = "cpuinfo"; + version = "0.1.0.2"; + sha256 = "0973bkgcfha0xyimizgq55w4a32gjgklcikfhcwkak4m9czwyynr"; + libraryHaskellDepends = [ attoparsec base bytestring deepseq ]; + description = "Haskell Library for Checking CPU Information"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "cpuperf" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -65051,6 +65456,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "crackNum_3_1" = callPackage + ({ mkDerivation, base, directory, filepath, libBF, process, sbv + , tasty, tasty-golden + }: + mkDerivation { + pname = "crackNum"; + version = "3.1"; + sha256 = "1qavlqz1ca2c0v029kijlnf51l2sdiwk6dkx8kyk6xqp97bhx8rk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath libBF process sbv tasty tasty-golden + ]; + description = "Crack various integer and floating-point data formats"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -65821,8 +66244,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "5"; - editedCabalFile = "0gyfz45izn6s7syd028bbwczp4a8qfhbkbvpir5ssfhqbql4qsv1"; + revision = "6"; + editedCabalFile = "1fkwa9vqkavy6pmig971xbk70kwn7hfpa7d1afvsp9g8sqpl52hz"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -66491,17 +66914,17 @@ self: { "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, blaze-html, bv-sized, bytestring, containers - , criterion, cryptohash-sha1, deepseq, directory, exceptions + , criterion, cryptohash-sha1, deepseq, directory, exceptions, extra , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc - , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl, panic - , parameterized-utils, pretty, process, random, sbv, simple-smt - , stm, strict, text, tf-random, time, transformers - , transformers-base, what4 + , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl + , optparse-applicative, panic, parameterized-utils, pretty, process + , random, sbv, simple-smt, stm, strict, temporary, text, tf-random + , time, transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.10.0"; - sha256 = "0qzgfd0nn070rca8mdm2gi7ah9aghn1kpr3fl4dx56kbfva23yhb"; + version = "2.11.0"; + sha256 = "05h751lxyym27b5kfrcss5vjg4ifpl4lqgxvvp6fz4mpbigm7ds3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66515,7 +66938,8 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ ansi-terminal base base-compat blaze-html containers directory - filepath haskeline monad-control text transformers + extra filepath haskeline monad-control mtl optparse-applicative + process temporary text transformers ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath sbv text @@ -67161,6 +67585,8 @@ self: { executableToolDepends = [ alex happy ]; description = "Implementation of Univalence in Cubical Sets"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cubicbezier" = callPackage @@ -67445,8 +67871,8 @@ self: { ({ mkDerivation, base, parsec, text }: mkDerivation { pname = "curly-expander"; - version = "0.2.0.3"; - sha256 = "0sfd3vmkx74fp1yvbwwbx4rw3i1g70hcvcp205mz709r8yyhr9sb"; + version = "0.3.0.0"; + sha256 = "08yw57f08rcvhnqsljndnqgbkll3zgf22xnqpjxlf1b6a8yfbqxm"; libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base parsec text ]; description = "Curly braces (brackets) expanding"; @@ -68917,6 +69343,18 @@ self: { license = lib.licenses.mit; }) {}; + "data-compat_0_1_0_3" = callPackage + ({ mkDerivation, base, constraints }: + mkDerivation { + pname = "data-compat"; + version = "0.1.0.3"; + sha256 = "1wfm561ird8hv0d52gfyx684xmvps90s4cly8knwwv31cz9r9vpg"; + libraryHaskellDepends = [ base constraints ]; + description = "Define Backwards Compatibility Schemes for Arbitrary Data"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-concurrent-queue" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -72822,6 +73260,8 @@ self: { pname = "dependent-sum"; version = "0.7.1.0"; sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; + revision = "1"; + editedCabalFile = "0h9rr26ksrqfnfjibnrzbf6hyp1mmffgzbvjjxjs6vdqylvr4h8f"; libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = lib.licenses.publicDomain; @@ -73860,6 +74300,61 @@ self: { license = lib.licenses.bsd3; }) {}; + "dhall_1_38_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.38.1"; + sha256 = "0g70x2crdrkwf41gvwr718am25dmbn9bg4cml9f9va7i1vx5rsgk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text @@ -73904,17 +74399,15 @@ self: { "dhall-docs" = callPackage ({ mkDerivation, base, bytestring, containers, cryptonite, dhall - , directory, doctest, file-embed, filepath, foldl, HaXml - , lens-family-core, lucid, megaparsec, memory, mmark, mtl - , optparse-applicative, path, path-io, pretty, prettyprinter, tasty - , tasty-hunit, tasty-silver, text, transformers, turtle + , directory, doctest, file-embed, filepath, foldl, lens-family-core + , lucid, megaparsec, memory, mmark, mtl, optparse-applicative, path + , path-io, pretty, prettyprinter, tasty, tasty-hunit, tasty-silver + , text, transformers, turtle }: mkDerivation { pname = "dhall-docs"; - version = "1.0.4"; - sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; - revision = "3"; - editedCabalFile = "116m74khdfx57ghrid1myqyj8acrhzhnjzjmxnsn3yghdan29797"; + version = "1.0.5"; + sha256 = "00s1vhwilnr6hvv56w98kc1md08lw6v80v8a7yhwrmg9qggwdc12"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73926,8 +74419,7 @@ self: { executableHaskellDepends = [ base dhall ]; testHaskellDepends = [ base bytestring containers dhall directory doctest filepath foldl - HaXml path path-io pretty tasty tasty-hunit tasty-silver text - turtle + path path-io pretty tasty tasty-hunit tasty-silver text turtle ]; description = "Generate HTML docs from a dhall package"; license = lib.licenses.bsd3; @@ -74000,6 +74492,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "dhall-json_1_7_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal + , base, bytestring, containers, dhall, exceptions, filepath + , lens-family-core, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit + , tasty-silver, text, unordered-containers, vector + }: + mkDerivation { + pname = "dhall-json"; + version = "1.7.6"; + sha256 = "1fl5ngp1qh77qr27ax5009siy20cas6fm55776zhs82zb96sli0n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty aeson-yaml base bytestring containers dhall + exceptions filepath lens-family-core optparse-applicative + prettyprinter scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring dhall exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit tasty-silver text + ]; + description = "Convert between Dhall and JSON or YAML"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -74050,6 +74572,36 @@ self: { license = lib.licenses.mit; }) {}; + "dhall-lsp-server_1_0_14" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, dhall, dhall-json, directory, doctest, filepath + , haskell-lsp, haskell-lsp-types, hslogger, lens, lsp-test + , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter + , QuickCheck, rope-utf16-splay, tasty, tasty-hspec, text + , transformers, unordered-containers, uri-encode + }: + mkDerivation { + pname = "dhall-lsp-server"; + version = "1.0.14"; + sha256 = "1jy80w3lr6c0hvn0525h5kn6fh9rj6ir942hdkilrzd9farg6qj9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default dhall + dhall-json directory filepath haskell-lsp hslogger lens megaparsec + mtl network-uri prettyprinter rope-utf16-splay text transformers + unordered-containers uri-encode + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + base directory doctest filepath haskell-lsp-types lsp-test + QuickCheck tasty tasty-hspec text + ]; + description = "Language Server Protocol (LSP) server for Dhall"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text @@ -74098,6 +74650,30 @@ self: { broken = true; }) {}; + "dhall-openapi" = callPackage + ({ mkDerivation, aeson, base, containers, dhall, directory + , filepath, megaparsec, optparse-applicative, parser-combinators + , prettyprinter, scientific, sort, text, vector + }: + mkDerivation { + pname = "dhall-openapi"; + version = "1.0.0"; + sha256 = "1dg1hj8yfm08bzzirzg6cq26vkxv6i86rrf96a73pb1hpz3jjq7j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers dhall prettyprinter scientific sort text + vector + ]; + executableHaskellDepends = [ + aeson base containers dhall directory filepath megaparsec + optparse-applicative parser-combinators prettyprinter sort text + vector + ]; + description = "Convert an OpenAPI specification to a Dhall package"; + license = lib.licenses.bsd3; + }) {}; + "dhall-recursive-adt" = callPackage ({ mkDerivation, base, data-fix, dhall, either, hedgehog , neat-interpolation, recursion-schemes, tasty, tasty-hedgehog @@ -74197,6 +74773,35 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "dhall-yaml_1_2_6" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.2.6"; + sha256 = "0v6f513hxn382h4l8hyj9gxara3xdfcrldzri0i3yjvir62bkicm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -75839,6 +76444,8 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "diophantine" = callPackage @@ -76300,8 +76907,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.3"; - sha256 = "0adpb7wzij9n5f2xxqy9j8n3rx0bjg7z1lk0p212zkygabw297mi"; + version = "1.8.5"; + sha256 = "0hp3w1d5pwfj06m72dl44cp67h99b3c43kv641vz6dff7xk75hsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82191,6 +82798,23 @@ self: { broken = true; }) {}; + "eio" = callPackage + ({ mkDerivation, base, markdown-unlit }: + mkDerivation { + pname = "eio"; + version = "0.0.0.0"; + sha256 = "0akr5h7r3c5qrbpyq52h2lzmbd22ars7mdfwgl7dwh75bgwss11l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + executableToolDepends = [ markdown-unlit ]; + description = "IO with Exceptions tracked on the type-level"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "either" = callPackage ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck , semigroupoids, test-framework, test-framework-quickcheck2 @@ -84866,6 +85490,8 @@ self: { ]; description = "Send messages to an Erlang node using Haskell"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eros" = callPackage @@ -85412,6 +86038,8 @@ self: { pname = "esqueleto"; version = "3.4.1.0"; sha256 = "1nm2xdl6an140gl5cw6ij7s6i6v2xfp98m8dwbwzns75nrgmsb73"; + revision = "1"; + editedCabalFile = "0jm10cw3ikk6gwn7qy87d7g9swwcp6lg60yy678l4jx7dnipahm0"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85428,6 +86056,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_4_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql + , mysql-simple, persistent, persistent-mysql, persistent-postgresql + , persistent-sqlite, postgresql-libpq, postgresql-simple, resourcet + , tagged, text, time, transformers, unliftio, unordered-containers + , vector + }: + mkDerivation { + pname = "esqueleto"; + version = "3.4.2.0"; + sha256 = "1gmh96a0vqvxizgs2k66p06jhjcgqrm5phbvahs7b2iavaralpr3"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec monad-logger mtl mysql mysql-simple persistent + persistent-mysql persistent-postgresql persistent-sqlite + postgresql-libpq postgresql-simple resourcet tagged text time + transformers unliftio unordered-containers vector + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -85914,6 +86571,8 @@ self: { ]; description = "Ethereum Recursive Length Prefix Encoding"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eths-rlp" = callPackage @@ -86888,8 +87547,8 @@ self: { pname = "exceptions"; version = "0.10.4"; sha256 = "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd"; - revision = "1"; - editedCabalFile = "0b5m01nmaqzvvm1d07b3dnmcn47pmy943lydb2m7ibhilqkfya8p"; + revision = "2"; + editedCabalFile = "1154g0dqil2xf4wc1v6gndzhnbf5saf2dzf77c6lcjxssx360m6j"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -87526,6 +88185,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "experimenter_0_1_0_12" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector + , conduit, containers, deepseq, directory, esqueleto, filepath + , foundation, HaTeX, hostname, hspec, lens, matrix, monad-logger + , mtl, mwc-random, parallel, persistent, persistent-postgresql + , persistent-template, process, QuickCheck, resource-pool + , resourcet, stm, text, time, transformers, unix, unliftio-core + , vector + }: + mkDerivation { + pname = "experimenter"; + version = "0.1.0.12"; + sha256 = "0sam7wl4gha9midkgj15h0q68g121pihxxvv8dlx3wgd9as1h5d6"; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-vector conduit containers + deepseq directory esqueleto filepath HaTeX hostname lens matrix + monad-logger mtl mwc-random parallel persistent + persistent-postgresql persistent-template process resource-pool + resourcet stm text time transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + aeson base bytestring cereal cereal-vector conduit containers + deepseq directory esqueleto filepath foundation HaTeX hostname + hspec lens matrix monad-logger mtl mwc-random parallel persistent + persistent-postgresql persistent-template process QuickCheck + resource-pool resourcet stm text time transformers unix + unliftio-core vector + ]; + description = "Perform scientific experiments stored in a DB, and generate reports"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "expiring-cache-map" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, time , unordered-containers @@ -87712,8 +88404,8 @@ self: { ({ mkDerivation, base, containers, fgl, mtl, transformers }: mkDerivation { pname = "exploring-interpreters"; - version = "0.2.0.0"; - sha256 = "1q2i68isdyc1fmxz9hcrjy8k3z8ji6xb2xrn4pc3wn0mrlnj1dka"; + version = "0.3.0.0"; + sha256 = "0h39si80s4q4n6599qj95z19jy3yc0101pphm4apvalm6wmppgpz"; libraryHaskellDepends = [ base containers fgl mtl transformers ]; description = "A generic exploring interpreter for exploratory programming"; license = lib.licenses.bsd3; @@ -89158,6 +89850,8 @@ self: { ]; description = "Haskell bindings to the fastpbkdf2 C library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "fastsum" = callPackage @@ -89238,8 +89932,6 @@ self: { executableHaskellDepends = [ base mtl optparse-applicative split ]; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-base" = callPackage @@ -89252,8 +89944,6 @@ self: { libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-builder" = callPackage @@ -89287,8 +89977,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-geoposition" = callPackage @@ -89301,8 +89989,6 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "W3C compliant implementation of GeoPosition API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-hsx" = callPackage @@ -89329,8 +90015,6 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "jQuery bindings for Fay"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-ref" = callPackage @@ -89343,8 +90027,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Like IORef but for Fay"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-simplejson" = callPackage @@ -89373,8 +90055,6 @@ self: { libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-uri" = callPackage @@ -89387,8 +90067,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Persistent FFI bindings for using jsUri in Fay"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fay-websockets" = callPackage @@ -89401,8 +90079,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Websockets FFI library for Fay"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fb" = callPackage @@ -89484,8 +90160,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "0.7.2"; - sha256 = "1xly3vjd8ylxwnc16y6hcrbg1chr4cxx60f3i3r9cyv1vrvf7l1k"; + version = "0.7.3"; + sha256 = "0fm9ymfl01k8fs5p4aa5kjjj6gziwl35z5yywbhygd32704lcqnz"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -92105,8 +92781,8 @@ self: { pname = "fixed-vector-hetero"; version = "0.6.0.0"; sha256 = "1gc40wh887hd6am6kjswkxn9qnzxp30ni6larnq6ghrs5zalg67r"; - revision = "1"; - editedCabalFile = "041rz3cd2yi2k49crcbrqq1vkr4g6m5mczf2qik2avj124krq77f"; + revision = "3"; + editedCabalFile = "0gzmjn7cw1ywggfwqz8i5i46q93blg8l4fx7ifhzwwzarpxgkpkj"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; testHaskellDepends = [ base doctest fixed-vector ]; @@ -92114,6 +92790,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "fixed-vector-hetero_0_6_1_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, fixed-vector, primitive }: + mkDerivation { + pname = "fixed-vector-hetero"; + version = "0.6.1.0"; + sha256 = "1simmps9qz8q4kfx8vz26ww0xy70vahrsgphvfrf9ww8fk9yg518"; + libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; + testHaskellDepends = [ base doctest fixed-vector ]; + description = "Library for working with product types generically"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed-width" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -92402,6 +93091,8 @@ self: { ]; description = "Verify FLAC files ripped form CD using AccurateRip™"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "flags-applicative" = callPackage @@ -92611,8 +93302,8 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.1.1.1"; - sha256 = "19k1336hf23n440bk5fjw296bs7kqccfa4mhl4wsvfvbsyrzlp09"; + version = "0.2.0.0"; + sha256 = "0f7nhspfj90ypylwvya3c3dzvipvc462zyc6191xd1x40wn7qms9"; libraryHaskellDepends = [ base bytestring containers template-haskell ]; @@ -93796,8 +94487,8 @@ self: { }: mkDerivation { pname = "foldl-transduce"; - version = "0.6.0.0"; - sha256 = "177ar0c66lzp5rnnpbia0v3ri9aspc97qnj9yjwh3bz2drn01q0y"; + version = "0.6.0.1"; + sha256 = "1nbq27cs7jngg83ylc7rfmr8qs8xlr0dqkb9d978jsv4dblbs1gh"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl free monoid-subclasses profunctors semigroupoids semigroups split text @@ -94200,6 +94891,35 @@ self: { broken = true; }) {}; + "forex2ledger" = callPackage + ({ mkDerivation, aeson, base, containers, currency-codes + , hledger-lib, hspec, hspec-expectations-pretty-diff, HTTP + , optparse-applicative, relude, text, time, tomland + , unordered-containers, url + }: + mkDerivation { + pname = "forex2ledger"; + version = "1.0.0.0"; + sha256 = "0rsaw9l3653kfp3hfszdyq7xqfmr38xwvlwk7mdr7sqhqs2xxbaq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers currency-codes hledger-lib HTTP relude text + time tomland unordered-containers url + ]; + executableHaskellDepends = [ + base optparse-applicative relude text + ]; + testHaskellDepends = [ + aeson base containers currency-codes hspec + hspec-expectations-pretty-diff relude time + ]; + description = "Print Forex quotes in Ledger format"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "forger" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -94373,21 +95093,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "formatting_7_1_1" = callPackage - ({ mkDerivation, base, clock, double-conversion, ghc-prim, hspec - , integer-gmp, old-locale, scientific, text, time, transformers + "formatting_7_1_2" = callPackage + ({ mkDerivation, base, clock, criterion, double-conversion + , ghc-prim, hspec, old-locale, QuickCheck, scientific, text, time + , transformers }: mkDerivation { pname = "formatting"; - version = "7.1.1"; - sha256 = "1abqyd2k46vrr8xxk6sgcjfm8h7x3d2hk11p8kypi85zplab4rsp"; + version = "7.1.2"; + sha256 = "13sdc3wc8ahf18g5yld9bqi5yhbbg1w1r69rims93c5bxhiw3f9f"; libraryHaskellDepends = [ - base clock double-conversion ghc-prim integer-gmp old-locale - scientific text time transformers + base clock double-conversion ghc-prim old-locale scientific text + time transformers ]; - testHaskellDepends = [ - base clock double-conversion ghc-prim hspec integer-gmp old-locale - scientific text time transformers + testHaskellDepends = [ base ghc-prim hspec scientific text ]; + benchmarkHaskellDepends = [ + base criterion ghc-prim QuickCheck text ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = lib.licenses.bsd3; @@ -94568,6 +95289,27 @@ self: { broken = true; }) {}; + "fortran-src-extras" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, filepath, fortran-src, GenericPretty, hspec + , hspec-discover, optparse-applicative, silently, text, uniplate + }: + mkDerivation { + pname = "fortran-src-extras"; + version = "0.1.0"; + sha256 = "0q4wrif8mx5h6i2wsw2qa1hqdn95ii7211fnk8vj5g9ki3vrnlk8"; + libraryHaskellDepends = [ + aeson base binary bytestring containers directory filepath + fortran-src GenericPretty optparse-applicative text uniplate + ]; + testHaskellDepends = [ base fortran-src hspec silently uniplate ]; + testToolDepends = [ hspec-discover ]; + description = "Common functions and utils for fortran-src"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fortytwo" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, hspec, text }: mkDerivation { @@ -95172,8 +95914,8 @@ self: { }: mkDerivation { pname = "free-category"; - version = "0.0.4.2"; - sha256 = "1nnf7y0m5pv36ka54vmfbhj6v0354gk36r539ss4zzp6jc8mzvdl"; + version = "0.0.4.3"; + sha256 = "0jla6y9bjnprbwr9nl415rf3kcf709vpg4hg59xi3bfylnhd06bd"; libraryHaskellDepends = [ base free-algebras ]; testHaskellDepends = [ base free-algebras QuickCheck tasty tasty-quickcheck @@ -96380,6 +97122,8 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hspec ]; description = "Transfer files with FTP and FTPS"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ftp-client-conduit" = callPackage @@ -96396,6 +97140,8 @@ self: { testHaskellDepends = [ base ]; description = "Transfer file with FTP and FTPS with Conduit"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ftp-conduit" = callPackage @@ -96684,25 +97430,26 @@ self: { }) {}; "funcons-tools" = callPackage - ({ mkDerivation, base, bv, containers, directory, funcons-values - , gll, mtl, multiset, random-strings, regex-applicative, split - , text, TypeCompose, vector + ({ mkDerivation, base, bv, containers, directory + , exploring-interpreters, funcons-values, gll, haskeline, mtl + , multiset, random-strings, regex-applicative, split, text + , transformers, TypeCompose, vector }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.9"; - sha256 = "0k3560521kf1krj5j1wgbcipqcnvjq3igb9fymfdsswwqr1wpx67"; - revision = "1"; - editedCabalFile = "0h68688dy1x2wj5m5gi5lc3xhskzpdnfqfk3i4bzkxvh87mak7l4"; + version = "0.2.0.11"; + sha256 = "1gi7db5mjq25xwl27ihsrg0ya1jgw5zhki5c1431rizj72yx5ji9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bv containers directory funcons-values gll mtl multiset - random-strings regex-applicative split text TypeCompose vector + base bv containers directory funcons-values gll haskeline mtl + multiset random-strings regex-applicative split text TypeCompose + vector ]; executableHaskellDepends = [ - base bv containers directory funcons-values gll mtl multiset - random-strings regex-applicative split text TypeCompose vector + base bv containers directory exploring-interpreters funcons-values + gll haskeline mtl multiset random-strings regex-applicative split + text transformers TypeCompose vector ]; description = "A modular interpreter for executing funcons"; license = lib.licenses.mit; @@ -97132,21 +97879,20 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, tasty, tasty-hedgehog - , tasty-hunit, transformers + ({ mkDerivation, base, containers, hedgehog, hedgehog-fn + , inspection-testing, markdown-unlit, tasty-bench, transformers }: mkDerivation { pname = "fused-effects"; - version = "1.1.1.0"; - sha256 = "0z83iw3bysfk13pda44lasgyg3nlnrxv6bz1f9mpdyymq3vnb9d7"; + version = "1.1.1.1"; + sha256 = "1hd7sslc28fgx3l59afjzfdx3qya6ilc46mla16idm0z8i0avhh5"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing tasty - tasty-hedgehog tasty-hunit transformers + base containers hedgehog hedgehog-fn inspection-testing + transformers ]; testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base gauge transformers ]; + benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; }) {}; @@ -97348,8 +98094,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.19.2"; - sha256 = "0pkb9yqvfbahmq3lmp7ia0c4sfzx1cghnhk4b7z41xbf20qcakrx"; + version = "0.19.4"; + sha256 = "1d4704pmknv39yw2bjxkp5n2wl9a14n3pn221m3src5z237lchq7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97695,6 +98441,8 @@ self: { libraryHaskellDepends = [ base bytestring serialport ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "g-npm" = callPackage @@ -98653,21 +99401,20 @@ self: { }) {}; "gemini-textboard" = callPackage - ({ mkDerivation, base, cache, clock, gemini-router, gemini-server - , language-gemini, network-uri, nonce, sqlite-simple, text, time - , transformers + ({ mkDerivation, base, base64, cache, clock, cryptohash-sha256 + , gemini-router, gemini-server, HsOpenSSL, language-gemini + , network-uri, nonce, sqlite-simple, text, time, transformers }: mkDerivation { pname = "gemini-textboard"; - version = "0.1.0.0"; - sha256 = "1z8nkrkar4das4kpgsg03hsgg3i5y2639h7sik8cjdvyvwi8dpsn"; - revision = "1"; - editedCabalFile = "1h1fxigslzpbsjskrdaqa3gd063r4c7z6vvwaa6dk5d3mf67dbwq"; + version = "0.2.0.1"; + sha256 = "1yvizcxafq943q9fbz08mq2x50dw9ykdz5vy6hr6ps2g47j4wfa0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cache clock gemini-router gemini-server language-gemini - network-uri nonce sqlite-simple text time transformers + base base64 cache clock cryptohash-sha256 gemini-router + gemini-server HsOpenSSL language-gemini network-uri nonce + sqlite-simple text time transformers ]; description = "A barebones textboard for the Gemini protocol"; license = lib.licenses.bsd3; @@ -98862,8 +99609,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.7.0.0"; - sha256 = "0jvrwjry0kgw27qhnqxm5zvpks69cvvj0iz1ipvdsd5hi16dxarb"; + version = "0.7.1.0"; + sha256 = "0pj7dfvizjkjfrnhc2kgb99ygrjxjgbisaj1fszhznn305b879c1"; libraryHaskellDepends = [ base binary cereal lens linear spatial-math TypeCompose ]; @@ -98892,6 +99639,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-aeson_0_2_0_12" = callPackage + ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl + , tagged, text, unordered-containers, vector + }: + mkDerivation { + pname = "generic-aeson"; + version = "0.2.0.12"; + sha256 = "17br2dl9gd2hyflgp0fzqs5ghp4my4l234pjfvvnhk9n4szxzcr3"; + libraryHaskellDepends = [ + aeson attoparsec base generic-deriving mtl tagged text + unordered-containers vector + ]; + description = "Derivation of Aeson instances using GHC generics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-arbitrary" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -100113,6 +100877,8 @@ self: { ]; description = "GenValidity support for Persistent"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "genvalidity-property" = callPackage @@ -100795,32 +101561,42 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_8_8_3" = callPackage - ({ mkDerivation, base, binary, bytestring, directory, filepath - , ghc-boot-th + "ghc-bignum" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-bignum"; + version = "1.0"; + sha256 = "0xl848q8z6qx2bi6xil0d35lra7wshwvysyfblki659d7272b1im"; + description = "GHC BigNum library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ghc-boot_9_0_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.8.3"; - sha256 = "0h4nayld1qa08aly5y3z91z4n778g25s92fggvcxga8bxs49sh50"; - revision = "1"; - editedCabalFile = "0rzc0759sy8n7dp4csy464vb8kvaapzvxzjr1scmwh2gk9v3s1lk"; + version = "9.0.1"; + sha256 = "1qrxb762dj8p1brfpyididhjnwjk34nr6cq4j80rkhaf7pki08ik"; libraryHaskellDepends = [ - base binary bytestring directory filepath ghc-boot-th + base binary bytestring containers directory filepath ghc-boot-th ]; description = "Shared functionality between GHC and its boot libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_8_10_2" = callPackage + "ghc-boot-th_9_0_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.10.2"; - sha256 = "1jic3l319b02f8b4r87c48645xhn5784vhgz2mp7d0zi2srrsfcz"; + version = "9.0.1"; + sha256 = "1y3kpfczcs507md56ijw943pwvia86fh83mr2c0bq28yhd0kw8gl"; libraryHaskellDepends = [ base ]; - description = "Shared functionality between GHC and the `template-haskell` library"; + description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -101163,6 +101939,18 @@ self: { broken = true; }) {}; + "ghc-heap_9_0_1" = callPackage + ({ mkDerivation, base, ghc-prim, rts }: + mkDerivation { + pname = "ghc-heap"; + version = "9.0.1"; + sha256 = "01wz87jpd5b39lh9hymx8zd0r86insvk65lwhmdgj3yv4ldyrydn"; + libraryHaskellDepends = [ base ghc-prim rts ]; + description = "Functions for walking GHC's heap"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-heap-view" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, filepath, ghc-heap, template-haskell, transformers @@ -101288,15 +102076,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_0_1_20210207" = callPackage + "ghc-lib_9_0_1_20210324" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "9.0.1.20210207"; - sha256 = "1fi62pq18s63w4y6xrjq9zlcra8dk5xqjax8kyyvfrjaaxqci8qk"; + version = "9.0.1.20210324"; + sha256 = "1qzsm132jk84nvkyrmhmnhpccb2f07miwdcq7h11ljmd3c4c577a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -101328,17 +102116,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_0_1_20210207" = callPackage + "ghc-lib-parser_9_0_1_20210324" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.0.1.20210207"; - sha256 = "1gikdcgcgw1paxs5igxgxdfvpjp23963f6vn83m0a6vr88n2haah"; - revision = "1"; - editedCabalFile = "1fkh3xc2pq4k0mz1x92xhby5sqamfsnfm4rlq38p5shybkan7qgl"; + version = "9.0.1.20210324"; + sha256 = "1hl20lz8r9yhgh6hlakmbqp637h49mq3sdxciy4vsz3nhzy7nqqm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -101612,17 +102398,19 @@ self: { broken = true; }) {}; - "ghc-prim_0_6_1" = callPackage - ({ mkDerivation, rts }: + "ghc-prim_0_7_0" = callPackage + ({ mkDerivation, base, c, Cabal, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.6.1"; - sha256 = "06nc87f4mcqcddllysb75qj942y5mmdwss7h9z3m0m93lbxxy6a2"; + version = "0.7.0"; + sha256 = "189mr2v8b338lzdhr0r1p4wqz4gm47gqw93fziawwvlj4g6k8mw9"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ rts ]; + librarySystemDepends = [ c ]; description = "GHC primitives"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {}; + }) {c = null;}; "ghc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath @@ -102788,6 +103576,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_23" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.23"; + sha256 = "05zwlcqx334is27h1v9x89a05srb6zp7mx0viccmij1cqhyfvsmf"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -102811,6 +103619,30 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.25"; + sha256 = "0ybf8y8xbjfcaw67l22dfkx0528j5f1if3jm808ccssgdwyy3vc4"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -102879,6 +103711,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenu_0_4_9" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenu"; + version = "0.4.9"; + sha256 = "1n2bxi7cwj32ncalqwid3igk0ssh4pc81z132255216apryszq13"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdbusmenu ]; + description = "Dbusmenu bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk @@ -102903,6 +103755,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-dbusmenugtk3_0_4_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk + , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu-gtk3, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenugtk3"; + version = "0.4.10"; + sha256 = "1hq7v2lii8n6nn1dhdg42z2d3in8xahkhm6xk4hmfj7abzfghz7z"; + setupHaskellDepends = [ + base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib + gi-gobject gi-gtk haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf + gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; + description = "DbusmenuGtk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -102927,7 +103804,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_2" = callPackage + "gi-gdk_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -102935,8 +103812,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.2"; - sha256 = "0271n81jqwcl7g0li4yv6x42jkcmx4cjs2b6b60g1mz0qq8klhbn"; + version = "4.0.3"; + sha256 = "1bpg4x0hl9kdh1phplk1j616rjzf9gby1g23vm9xg93xfmaafr89"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -102973,6 +103850,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkpixbuf_2_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.25"; + sha256 = "18iz6rmqcf5q098hzv8p8hhk6ib8k99phmmnzp64j37c3x71c27b"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk-pixbuf ]; + description = "GdkPixbuf bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi @@ -102995,15 +103894,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_2" = callPackage + "gi-gdkx11_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.2"; - sha256 = "1z510v5p515i2fyd5kjxcfnyf5lsd0kzgzsnnqw4km186b241fc5"; + version = "4.0.3"; + sha256 = "13m2dvab8hqwa7h648asjg3llvdnpwdf1rli9i44nb6n1dfk7jbv"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -103039,6 +103938,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libgit2-glib;}; + "gi-ggit_1_0_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libgit2-glib, text, transformers + }: + mkDerivation { + pname = "gi-ggit"; + version = "1.0.10"; + sha256 = "1rfmvml0wfw522c9gzzpjsg5ajbsbnzylc5rf2x3qqhb1x9y3bd2"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libgit2-glib ]; + description = "libgit2-glib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libgit2-glib;}; + "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base @@ -103058,6 +103979,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_28" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.28"; + sha256 = "0bb6ciikk9mf64azbcgnybcjidxwdpjzanarf5ganbb4bb3l5d2h"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base @@ -103077,6 +104018,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gobject-introspection;}; + "gi-girepository_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-girepository"; + version = "1.0.24"; + sha256 = "1sj68k3wih2345gkmv0jb1smka73pxnjy8jwmk2ifgl407f3hhfw"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gobject-introspection ]; + description = "GIRepository (gobject-introspection) bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gobject-introspection;}; + "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -103096,6 +104057,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.25"; + sha256 = "0xki14pipyl45q6c0bwllkadbnqjm08ik24aw5gcmrvnjzag5gd7"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -103115,6 +104096,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_26" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.26"; + sha256 = "1kddnhdpnm21zma1zr9hpb2krrm5ksri85nzh2s9fc9c2c90xkpz"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base @@ -103136,23 +104137,44 @@ self: { broken = true; }) {graphene-gobject = null;}; + "gi-graphene_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-graphene"; + version = "1.0.3"; + sha256 = "06sh52338kqqbj6251xdz4yn0601nmxzl4z95w6a70dxs66js03c"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ graphene-gobject ]; + description = "Graphene bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {graphene-gobject = null;}; + "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gdk, gi-glib, gi-gobject, gi-graphene, gi-pango, gtk4 - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-graphene, gi-pango + , gtk4, haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-gsk"; - version = "4.0.2"; - sha256 = "1jc5jxni87zg475rgjrxv85rpyr20bwxdyfjw060dx4gvnyhxnfs"; + version = "4.0.3"; + sha256 = "16qbmjshl8nz5xkkzas7c4a0w996mbzqkjn1w8crc1fz1v27ckg2"; setupHaskellDepends = [ - base Cabal gi-cairo gi-gdk gi-glib gi-gobject gi-graphene gi-pango - haskell-gi + base Cabal gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-graphene gi-pango haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-gdk gi-glib gi-gobject - gi-graphene gi-pango haskell-gi haskell-gi-base + base bytestring containers gi-cairo gi-gdk gi-gdkpixbuf gi-glib + gi-gobject gi-graphene gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk4 ]; @@ -103181,6 +104203,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gstreamer;}; + "gi-gst_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gst"; + version = "1.0.24"; + sha256 = "01xbjxwipg1s93fkswag8gp8s696z1l1gaazl2w4wnpyykx4hh8s"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gstreamer ]; + description = "GStreamer bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.gst_all_1) gstreamer;}; + "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi @@ -103188,8 +104230,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.22"; - sha256 = "17x0nmzawr9mqfjjbgk9s35102y4nsvxym9hwgwhh88ijnbhshhs"; + version = "1.0.23"; + sha256 = "1gzs1niw45qjxiadj4xwg4fr6d71rb5k18y4plm4jj6iyvd67s72"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -103225,6 +104267,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; + "gi-gstbase_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gstbase"; + version = "1.0.24"; + sha256 = "0b8k2xk3ha6b79kkw72kgdmj8vjyh40r26saavin54gznlgd5xh8"; + setupHaskellDepends = [ + base Cabal gi-glib gi-gobject gi-gst haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-gst haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; + description = "GStreamerBase bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; + "gi-gstpbutils" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo @@ -103233,8 +104297,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.22"; - sha256 = "1kq86zc9rcla6xhgi0vf32y6bs3adi5xgkpknld6zl4dq7s70plk"; + version = "1.0.23"; + sha256 = "1j7ml51gnpkcir75wybx93qgs4rll3i5vlhzbqk26xhqkbfzqsf7"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -103258,8 +104322,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.22"; - sha256 = "0jpqj5kggg2ahvbrnmacjk6n9zg31v0klybkygz4i6i4d6absvf6"; + version = "1.0.23"; + sha256 = "17nwiin58kgl3psbwf2ymy2pz87crlasllg1wsabmcbv1dj38sgi"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -103295,6 +104359,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; + "gi-gstvideo_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gstvideo"; + version = "1.0.24"; + sha256 = "0qjfjk5jnpy1f4grn8i68kwdd1yvnq1yc55rk6yxhlj7wks1d35h"; + setupHaskellDepends = [ + base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; + description = "GStreamerVideo bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; + "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -103319,7 +104405,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_3" = callPackage + "gi-gtk_4_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -103327,8 +104413,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.3"; - sha256 = "1zfqnjnzlrry7cbrzfamrh5465h06y6px0b1xh1yz7iaacg0739z"; + version = "4.0.4"; + sha256 = "18c27hnfyyn3ajx73zy1laflv95xjafdm249ra6z9nynx9gqws6c"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -103366,8 +104452,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -103389,8 +104473,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gi-gtk-hs" = callPackage @@ -103410,6 +104492,24 @@ self: { license = lib.licenses.lgpl21Only; }) {}; + "gi-gtk-hs_0_3_10" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.10"; + sha256 = "00vhnkblvvq7qjs65rmfy0q2rs388954p6yd1lga2y79lc2xr6fw"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -103483,6 +104583,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtksourceview3;}; + "gi-gtksource_3_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtksource"; + version = "3.0.24"; + sha256 = "0bnwqcn7y5a3z3lkl9l886m9albvc602nb7qsh2jkiilf0ng64dp"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-gtk gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtksourceview3 ]; + description = "GtkSource bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtksourceview3;}; + "gi-handy" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi @@ -103491,8 +104616,8 @@ self: { }: mkDerivation { pname = "gi-handy"; - version = "0.0.7"; - sha256 = "0vdmby4wzxzhy9cbpi6i29r2ywq75ndcjpra3nvkavp91ba1y1c1"; + version = "0.0.8"; + sha256 = "1k7czb0gszjif2ynz9p7r765ims5m3q5kb9npf97psw88zq6l965"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -103528,6 +104653,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; + "gi-harfbuzz_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-harfbuzz"; + version = "0.0.4"; + sha256 = "0h3dgz914n55x7rhwayxscfkhhhj7qgw5a7fh0j2fn18c201klwm"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; + description = "HarfBuzz bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; + "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -103549,6 +104694,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) ibus;}; + "gi-ibus_1_5_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, ibus, text, transformers + }: + mkDerivation { + pname = "gi-ibus"; + version = "1.5.3"; + sha256 = "1gbpbxcdl9f5di2vpnkx3zsy54dkfhz81h3yxss91r65lp9fwrm8"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ ibus ]; + description = "IBus bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) ibus;}; + "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -103569,6 +104736,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; + "gi-javascriptcore_4_0_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "4.0.23"; + sha256 = "0r6jmhiq9jij72yz1z6sfjh3dk7g77q07kyvz3ayndqsbn3xrwi7"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) webkitgtk;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -103590,6 +104777,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libnotify;}; + "gi-notify_0_7_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libnotify, text, transformers + }: + mkDerivation { + pname = "gi-notify"; + version = "0.7.23"; + sha256 = "00p10lw9v9q8mh6630ijpz8smnpz5hiiw8kxk1fv8497akssxjsh"; + setupHaskellDepends = [ + base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gdkpixbuf gi-glib gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libnotify ]; + description = "Libnotify bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libnotify;}; + "gi-ostree" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -103614,6 +104823,31 @@ self: { ]; }) {inherit (pkgs) ostree;}; + "gi-ostree_1_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, ostree, text, transformers + }: + mkDerivation { + pname = "gi-ostree"; + version = "1.0.14"; + sha256 = "08jglqkq0h497iv83rc0br83qrf000gm202hp0j1pnhwvdgp7d0f"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ ostree ]; + description = "OSTree bindings"; + license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) ostree;}; + "gi-pango" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base @@ -103639,6 +104873,32 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pango_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.24"; + sha256 = "0qvz1r3xc4rz2fvaw1mimwn39xim55zn6zhbkavw2n5jm6xnydkh"; + setupHaskellDepends = [ + base Cabal gi-glib gi-gobject gi-harfbuzz haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-harfbuzz + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi @@ -103665,6 +104925,33 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo_1_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi + , haskell-gi-base, haskell-gi-overloading, pango, text + , transformers + }: + mkDerivation { + pname = "gi-pangocairo"; + version = "1.0.25"; + sha256 = "1w7sdwxfsymysazv9b045li97mjj2xspgrfyhm74x7sd7b4jl4aa"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-glib gi-gobject gi-pango + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "PangoCairo bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -103672,8 +104959,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.24"; - sha256 = "1n69xzw5w3y27x0vz4i4hi7ypr714ilj9i985ym713kvdfdyz12g"; + version = "0.18.25"; + sha256 = "0hl7wljszc1jpjcpl0ax6qidjynr2dh063m1j9xn718f1yqgldix"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -103709,6 +104996,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsecret;}; + "gi-secret_0_0_13" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsecret, text, transformers + }: + mkDerivation { + pname = "gi-secret"; + version = "0.0.13"; + sha256 = "0n37sdm4q6q807j4wgwwsl28knc71d8jiyx4prxbl2d69gg6i2ka"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libsecret ]; + description = "Libsecret bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsecret;}; + "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -103730,6 +105039,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsoup;}; + "gi-soup_2_4_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsoup, text, transformers + }: + mkDerivation { + pname = "gi-soup"; + version = "2.4.24"; + sha256 = "148ksnsfadbx3as23c79nmmsrkzfcvncbvvqqmhygwkm9mxsv9sr"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libsoup ]; + description = "Libsoup bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsoup;}; + "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi @@ -103754,6 +105085,31 @@ self: { license = lib.licenses.lgpl21Only; }) {vte_291 = pkgs.vte;}; + "gi-vte_2_91_28" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , vte_291 + }: + mkDerivation { + pname = "gi-vte"; + version = "2.91.28"; + sha256 = "06bgl5r1r4ri22c43an4h538p0b3icrb8nq1w7fw8cmxqj7y5m33"; + setupHaskellDepends = [ + base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango + haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers + ]; + libraryPkgconfigDepends = [ vte_291 ]; + description = "Vte bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {vte_291 = pkgs.vte;}; + "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -103802,6 +105158,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; + "gi-webkit2_4_0_27" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk + , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-webkit2"; + version = "4.0.27"; + sha256 = "05ka1i4afd9j5kyyd1z9xxv9vmbmq2wziir3pln9a692zga0f2h1"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-javascriptcore gi-soup haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "WebKit2 bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) webkitgtk;}; + "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-gobject, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi @@ -103810,8 +105191,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.25"; - sha256 = "0vdzhnaj6d03cgxz3i886cahkfhl8xgcrm37wdcxqydkxx2ybh6h"; + version = "4.0.26"; + sha256 = "0fa2x9dzcaiv5f5kzf4ql27fr8zgq5fky3gzhj8py0m2pnahpa6v"; setupHaskellDepends = [ base Cabal gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -103835,8 +105216,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.9"; - sha256 = "1cy1nzld3220rg0f1gzr5cw756s5vm9las8p8xyqhjmk3awy0cbp"; + version = "3.0.10"; + sha256 = "1q3fncvd7ic0ri2v883xlqlfxm5hiwj0sn750505q73lqllx5wqw"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi ]; @@ -103871,6 +105252,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) xlibsWrapper;}; + "gi-xlib_2_0_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , xlibsWrapper + }: + mkDerivation { + pname = "gi-xlib"; + version = "2.0.10"; + sha256 = "1h6kpg0mm16b5rz7ixi5qj8y0is96cwkkpgwcl8m8ycjscsgfj88"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; + description = "xlib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) xlibsWrapper;}; + "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , directory, extra, filemanip, filepath, mtl, process, semigroups @@ -104139,8 +105540,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210310"; - sha256 = "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx"; + version = "8.20210330"; + sha256 = "07dhxlmnj48drgndcplafc7xhby0w3rks68fz9wsppxan929240p"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -105047,10 +106448,8 @@ self: { }: mkDerivation { pname = "gitlib"; - version = "3.1.2"; - sha256 = "1r973cpkp4h8dfjrkqgyy31a3x4bbqi7zhpck09ix2a9i597b345"; - revision = "1"; - editedCabalFile = "09v2acn2cxagyfnn7914faz9nzzi2j48w8v55lj1fxwgspc44w8g"; + version = "3.1.3"; + sha256 = "02gk4z3q1hrr6wl7c2989ib2nqf8wcsx9msq6nbsfhxjsmc7qds7"; libraryHaskellDepends = [ base base16-bytestring bytestring conduit conduit-combinators containers directory exceptions filepath hashable mtl resourcet @@ -110529,6 +111928,38 @@ self: { broken = true; }) {}; + "graphql-client_1_1_1" = callPackage + ({ mkDerivation, aeson, aeson-schemas, base, bytestring, file-embed + , http-client, http-client-tls, http-types, mtl + , optparse-applicative, path, path-io, tasty, tasty-hunit + , template-haskell, text, transformers, typed-process + , unliftio-core + }: + mkDerivation { + pname = "graphql-client"; + version = "1.1.1"; + sha256 = "1d00ib9c8ps8vv1qgrkjfzrjbgbsdnp1jiz7779bwm76j88vggb4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + template-haskell text transformers unliftio-core + ]; + executableHaskellDepends = [ + aeson aeson-schemas base bytestring file-embed http-client + http-client-tls http-types mtl optparse-applicative path path-io + template-haskell text transformers typed-process unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + tasty tasty-hunit template-haskell text transformers unliftio-core + ]; + description = "A client for Haskell programs to query a GraphQL API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "graphql-utils" = callPackage ({ mkDerivation, aeson, aeson-helper, base, graphql, text , unordered-containers, vector @@ -111312,6 +112743,8 @@ self: { ]; description = "MySQL backend for the groundhog library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "groundhog-postgresql" = callPackage @@ -114068,6 +115501,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Hackage and Portage integration tool"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hactor" = callPackage @@ -114331,29 +115766,32 @@ self: { }) {}; "hadolint" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, colourista - , containers, cryptonite, deepseq, directory, filepath, gitrev - , hspec, HsYAML, HUnit, ilist, language-docker, megaparsec, mtl - , optparse-applicative, parallel, ShellCheck, split, text, void + ({ mkDerivation, aeson, base, bytestring, Cabal, colourista + , containers, cryptonite, deepseq, directory, email-validate + , filepath, foldl, gitrev, hspec, HsYAML, HUnit, ilist + , language-docker, megaparsec, mtl, network-uri + , optparse-applicative, parallel, parsec, semver, ShellCheck, spdx + , split, text, time, timerep, void }: mkDerivation { pname = "hadolint"; - version = "1.23.0"; - sha256 = "09aaxdi1g199cgaxvv5v2cynvd8rm91mnpaw2a5ppbzc7cgh6rca"; + version = "2.1.0"; + sha256 = "0hvn6kq6pasyh9mvnxn4crhg4fxmw7xrcfxa77wkxni8q1a94xxs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring colourista containers cryptonite - deepseq directory filepath HsYAML ilist language-docker megaparsec - mtl parallel ShellCheck split text void + aeson base bytestring Cabal colourista containers cryptonite + deepseq directory email-validate filepath foldl HsYAML ilist + language-docker megaparsec mtl network-uri parallel parsec semver + ShellCheck spdx split text time timerep void ]; executableHaskellDepends = [ base containers gitrev language-docker megaparsec optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring hspec HsYAML HUnit language-docker megaparsec - ShellCheck split text + aeson base bytestring containers foldl hspec HsYAML HUnit + language-docker megaparsec ShellCheck split text ]; description = "Dockerfile Linter JavaScript API"; license = lib.licenses.gpl3Only; @@ -115159,8 +116597,8 @@ self: { }: mkDerivation { pname = "hakyll-filestore"; - version = "0.1.8"; - sha256 = "02lza2nkq2y2m9zb03ipmgd0cnfjv38cyym7jbakg7v8arkymcrc"; + version = "0.1.9"; + sha256 = "1lxm78w2n81wsbi6axyrqjv2ikdprf7vvx1r2ricqd6h7dwjsalr"; libraryHaskellDepends = [ base filestore hakyll time time-locale-compat ]; @@ -115445,8 +116883,8 @@ self: { }: mkDerivation { pname = "halive"; - version = "0.1.6"; - sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh"; + version = "0.1.8"; + sha256 = "1zh0jykh1a9lxfsz1vjyr6n56y2y0g1gc16vxnjakyqz131xp7kn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116112,6 +117550,37 @@ self: { license = lib.licenses.mit; }) {}; + "hapistrano_0_4_1_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, directory + , filepath, formatting, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, process, QuickCheck + , silently, stm, temporary, time, transformers, typed-process, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.4.1.3"; + sha256 = "1sk5z0kf9ybhk17y36zf90ljn51j82pyf8rja0cv64ah9bg5zbgq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base filepath gitrev mtl path process stm time + transformers typed-process yaml + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process QuickCheck + silently temporary yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A deployment library for Haskell applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -118709,6 +120178,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_25_0" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.25.0"; + sha256 = "1bxybi1bj9jwfmyj57cb3471s0wczlp6m1qz893kbz17k96mpin8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -118721,6 +120213,19 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_25_0" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.25.0"; + sha256 = "140f6amq69r39vj54i1p4c9q0ysxkvb3yjcrlbrrayf66bhw8mqy"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading" = callPackage ({ mkDerivation }: mkDerivation { @@ -118952,36 +120457,6 @@ self: { license = lib.licenses.mit; }) {}; - "haskell-lsp_0_23_0_0" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hashable - , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl - , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay - , sorted-list, stm, temporary, text, time, unordered-containers - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.23.0.0"; - sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - directory filepath hashable haskell-lsp-types hslogger lens mtl - network-uri rope-utf16-splay sorted-list stm temporary text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -119051,24 +120526,6 @@ self: { license = lib.licenses.mit; }) {}; - "haskell-lsp-types_0_23_0_0" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, data-default - , deepseq, filepath, hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.23.0.0"; - sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7"; - libraryHaskellDepends = [ - aeson base binary bytestring data-default deepseq filepath hashable - lens network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text @@ -119186,6 +120643,8 @@ self: { ]; description = "Name resolution library for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskell-neo4j-client" = callPackage @@ -121211,8 +122670,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.51.0"; - sha256 = "0wgf4j28f3g8anm6xpi0qn1as8lw7b6gwsp92xpc0f2yvv38gm4d"; + version = "0.52.3"; + sha256 = "12yk4545m9fh6961kd4k7mi8dz3zdqv58nbravr7ziz53m6ydlwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121258,8 +122717,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.51.0"; - sha256 = "12p8caxi77hqy420bix3h3a427m5hq4vwwwgf1g4cmava7c0p7wq"; + version = "0.52.0"; + sha256 = "0fgjmyps858dvx8i2mzn8kqmms869wamldrdlmy2y27wcmrzzj51"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -122091,6 +123550,8 @@ self: { benchmarkHaskellDepends = [ base criterion directory text ]; description = "CSS Minifier"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasparql-client" = callPackage @@ -122146,6 +123607,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_4_5_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.4.5.1"; + sha256 = "0y23qk29bq419rjdzpvlr6hkml8fzk3sgl7dzvkvjpdycrzphlzl"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -122331,6 +123819,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasql-notifications_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, contravariant, hasql, hasql-pool + , hspec, postgresql-libpq, QuickCheck, text + }: + mkDerivation { + pname = "hasql-notifications"; + version = "0.2.0.0"; + sha256 = "1zizvdvhb0nd126k24j4k62lzkx3qh1vp4976f2n7ri7ga5y6cxi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring contravariant hasql hasql-pool postgresql-libpq + text + ]; + executableHaskellDepends = [ base hasql ]; + testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; + description = "LISTEN/NOTIFY support for Hasql"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -122518,6 +124027,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-transaction_1_0_0_2" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rerebase + , transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "1.0.0.2"; + sha256 = "1ig6fny9c90cmfsh6kcdhj9ps2arn1y80ic2w7ps6mn8wgl0cr82"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + description = "Composable abstraction over retryable transactions for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-url" = callPackage ({ mkDerivation, base, bytestring, hasql, network-uri, split, tasty , tasty-quickcheck @@ -124400,17 +125928,6 @@ self: { }) {}; "heaps" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "heaps"; - version = "0.3.6.1"; - sha256 = "0vg39qm8g69n10ys9v9knnaq5dqdjndj6ffy0xb78bwrr3rm5mci"; - libraryHaskellDepends = [ base ]; - description = "Asymptotically optimal Brodal/Okasaki heaps"; - license = lib.licenses.bsd3; - }) {}; - - "heaps_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "heaps"; @@ -124419,7 +125936,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "heapsize" = callPackage @@ -124792,8 +126308,6 @@ self: { ]; description = "Hedgehog will eat your typeclass bugs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hedgehog-corpus" = callPackage @@ -126352,6 +127866,8 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -126596,15 +128112,15 @@ self: { }) {}; "hexpat-streamparser" = callPackage - ({ mkDerivation, base, bytestring, hexpat, hspec, List, mtl - , parser-combinators, text, transformers + ({ mkDerivation, base, bytestring, cps-except, hexpat, hspec, List + , mtl, parser-combinators, text, transformers }: mkDerivation { pname = "hexpat-streamparser"; - version = "0.1.1"; - sha256 = "13wn89aw2fqhirrdshmdh1xqhihx4h5pgmp4x9lspy2jfrpga9f5"; + version = "0.1.2"; + sha256 = "03gxahl0lxi30k1ihni7j5xsbzmhlwxdgckw37lm5m2p6xfyagii"; libraryHaskellDepends = [ - base bytestring hexpat List mtl parser-combinators text + base bytestring cps-except hexpat List mtl parser-combinators text transformers ]; testHaskellDepends = [ base hexpat hspec ]; @@ -126689,6 +128205,8 @@ self: { testHaskellDepends = [ base binary bytestring hspec text ]; description = "Fast and safe representation of a hex string"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hext" = callPackage @@ -126785,8 +128303,8 @@ self: { }: mkDerivation { pname = "heyting-algebras"; - version = "0.0.2.0"; - sha256 = "027gdi1lqlj3xcsl4zzfflfswlz76an7in63xvjsx0gs9pxqny1j"; + version = "0.2.0.1"; + sha256 = "0k1sf6wj9r8c4rlaxj31x7yafl4wacx2kang9qs4253v0z7n1303"; libraryHaskellDepends = [ base containers free-algebras hashable lattices semiring-simple tagged universe-base unordered-containers @@ -127147,8 +128665,6 @@ self: { ]; description = "Geometric Algorithms, Data structures, and Data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgeometry-combinatorial" = callPackage @@ -127183,8 +128699,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Data structures, and Data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hgeometry-ipe" = callPackage @@ -127538,6 +129052,8 @@ self: { ]; description = "Generate scaffold for cabal project"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hi-file-parser" = callPackage @@ -127554,6 +129070,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, rio, vector }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.1.0"; + sha256 = "1wb79m6vx7dz4hrvyk2h1iv6q36g9hhywls5ygam7pmw9c4rs3sq"; + revision = "2"; + editedCabalFile = "1495j6ky44r660yr5szy2ln96rdhakh0fhnw749g2yyx5l0gwcrs"; + libraryHaskellDepends = [ base binary bytestring rio vector ]; + testHaskellDepends = [ base binary bytestring hspec rio vector ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -127677,6 +129208,23 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) systemd;}; + "hidapi_0_1_6" = callPackage + ({ mkDerivation, base, bytestring, deepseq, deepseq-generics + , systemd + }: + mkDerivation { + pname = "hidapi"; + version = "0.1.6"; + sha256 = "1dy5sbfh8rkzrjpn5ls5xbr32ja0h6bgigzya512advc4c21af2b"; + libraryHaskellDepends = [ + base bytestring deepseq deepseq-generics + ]; + librarySystemDepends = [ systemd ]; + description = "Haskell bindings to HIDAPI"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) systemd;}; + "hidden-char" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -127964,8 +129512,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.4.1.0"; - sha256 = "1z67vip2appsl4f2qf70pqdnyjp6byaa4n3x8scp1aa94hg1xj3h"; + version = "0.4.1.1"; + sha256 = "1aqln8y055ysnzw3sqfdi6rm63a4a8c3n3f4fgv1rqmx76vsvsaz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ barbies base generic-lens generic-lens-core named QuickCheck @@ -128210,6 +129758,8 @@ self: { pname = "hills"; version = "0.1.2.7"; sha256 = "0zq402ycyxaw9rpxlgj0307xz80qw1159albzw1q0sr4lxfxykcv"; + revision = "1"; + editedCabalFile = "1wjln7r8q8dhvq4i5svlhk4zfypibi1cjx75jffc1aq54xy0qq3s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129932,7 +131482,7 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsass;}; - "hlint" = callPackage + "hlint_3_2_7" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc, ghc-boot, ghc-boot-th @@ -129955,9 +131505,10 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "hlint_3_3" = callPackage + "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex @@ -129980,7 +131531,6 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hlint-test" = callPackage @@ -130170,6 +131720,8 @@ self: { ]; description = "Common utilities to interaction between ghc-exactprint and HLS plugins"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-explicit-imports-plugin" = callPackage @@ -130947,19 +132499,18 @@ self: { "hmp3-ng" = callPackage ({ mkDerivation, array, base, binary, bytestring, clock, containers - , directory, filepath, hscurses, monad-extras, mtl, ncurses - , pcre-light, process, random, unix, utf8-string, zlib + , directory, filepath, hscurses, mtl, ncurses, pcre-light, process + , random, unix, utf8-string, zlib }: mkDerivation { pname = "hmp3-ng"; - version = "2.11.0"; - sha256 = "1wxjxx7ijw7fsvsfjvfdss5cg8yyd885i3wpnzryv0bhqqa96i1d"; + version = "2.12.1"; + sha256 = "15fm6kgdlhzz8y9mhfvmhh0dqzicifv6apsiwm964qbxhgv0ww4y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base binary bytestring clock containers directory filepath - hscurses monad-extras mtl pcre-light process random unix - utf8-string zlib + hscurses mtl pcre-light process random unix utf8-string zlib ]; executableSystemDepends = [ ncurses ]; description = "A 2019 fork of an ncurses mp3 player written in Haskell"; @@ -131743,6 +133294,8 @@ self: { testToolDepends = [ markdown-unlit tasty-discover ]; description = "Tools and combinators for solving constraint problems"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "holy-project" = callPackage @@ -131845,6 +133398,8 @@ self: { pname = "homotuple"; version = "0.2.0.0"; sha256 = "17vr2g8jv71k2bwv5x973xjjxacr5br4xlngxjpzbq6xk9n37laf"; + revision = "1"; + editedCabalFile = "02l2bna56psk6zlpa1wxcvizh7y1rrwsm8mgnzv77kvym80d92cy"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; description = "Homotuple, all whose elements are the same type"; @@ -133340,6 +134895,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hpc-codecov_0_3_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath, hpc + , process, tasty, tasty-hunit + }: + mkDerivation { + pname = "hpc-codecov"; + version = "0.3.0.0"; + sha256 = "0999qfm9866gwqk4sx6av21rwbbirvdj5lr4ffl25zimwvirsbd2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring directory filepath hpc + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit + ]; + description = "Generate codecov report from hpc data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -133570,8 +135147,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.6.3"; - sha256 = "0gnmkh0m640qc71bp63p4qkcbcyy1j9z0x6svfbd36cpqb6kdivs"; + version = "0.6.4"; + sha256 = "0hkdpd4rlc0z3sfj4ymvk751csfdvqf56y9np9qyzh4ndaw9sj78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133624,8 +135201,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.10.4.0"; - sha256 = "0qlxhq4vkr0qq1ckazb0lng9mbnljh32xsmcpbp5qm01bngadz56"; + version = "1.11.0.0"; + sha256 = "0574ma8b149rhpdk9mdg5sawhl3db4d0qxs5az31g83i93hf4mwq"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -134132,6 +135709,29 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; + "hruby_0_3_8_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , process, QuickCheck, ruby, scientific, stm, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hruby"; + version = "0.3.8.1"; + sha256 = "00lp02wy7yxhh17dyq1acc6gfrwh145900ib42vz52lzsj5ivlcj"; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring scientific stm text + unordered-containers vector + ]; + librarySystemDepends = [ ruby ]; + testHaskellDepends = [ + aeson attoparsec base QuickCheck text vector + ]; + description = "Embed a Ruby intepreter in your Haskell program !"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) ruby;}; + "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: mkDerivation { @@ -134908,6 +136508,8 @@ self: { ]; description = "Create tag files (ctags and etags) for Haskell code"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hs-twitter" = callPackage @@ -136529,6 +138131,8 @@ self: { doHaddock = false; description = "Extend the import list of a Haskell source file"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsini" = callPackage @@ -137281,6 +138885,22 @@ self: { license = lib.licenses.mit; }) {}; + "hspec_2_7_9" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.7.9"; + sha256 = "03k8djbzkl47x1kgsplbjjrwx8qqdb31zg9aw0c6ii3d8r49gkyn"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -137365,6 +138985,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-core_2_7_9" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.7.9"; + sha256 = "0lqqvrdya7jszdxkzjnwd5g02w1ggmlfkh67bpcmzch6h0v609yj"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -137402,6 +139050,26 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-discover_2_7_9" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.7.9"; + sha256 = "1zr6h8r8ggi4482hnx0p2vsrkirfjimq8zy9yfiiyn5mkcqzxl4v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -137634,6 +139302,41 @@ self: { broken = true; }) {}; + "hspec-junit-formatter" = callPackage + ({ mkDerivation, base, conduit, directory, exceptions, hashable + , hspec, hspec-core, resourcet, temporary, text, xml-conduit + , xml-types + }: + mkDerivation { + pname = "hspec-junit-formatter"; + version = "1.0.0.0"; + sha256 = "1dr7khaib95r7db94gcjb9jd781wxc3d41dcvgk6fyw3a9zx2rms"; + libraryHaskellDepends = [ + base conduit directory exceptions hashable hspec hspec-core + resourcet temporary text xml-conduit xml-types + ]; + description = "A JUnit XML runner/formatter for hspec"; + license = lib.licenses.mit; + }) {}; + + "hspec-junit-formatter_1_0_0_1" = callPackage + ({ mkDerivation, base, conduit, directory, exceptions, hashable + , hspec, hspec-core, resourcet, temporary, text, xml-conduit + , xml-types + }: + mkDerivation { + pname = "hspec-junit-formatter"; + version = "1.0.0.1"; + sha256 = "146y4y3q047a5g8dif1vdjsn8jz6kafq0yzd7x5wpg7daccbxami"; + libraryHaskellDepends = [ + base conduit directory exceptions hashable hspec hspec-core + resourcet temporary text xml-conduit xml-types + ]; + description = "A JUnit XML runner/formatter for hspec"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-laws" = callPackage ({ mkDerivation, base, hspec, markdown-unlit, QuickCheck }: mkDerivation { @@ -139250,6 +140953,20 @@ self: { license = lib.licenses.mit; }) {}; + "html-entities_1_1_4_5" = callPackage + ({ mkDerivation, attoparsec, base, text, unordered-containers }: + mkDerivation { + pname = "html-entities"; + version = "1.1.4.5"; + sha256 = "190yh4ijg0pgy4y0jvkyjf8a0z7qxy1mly7c6589qx6lrx66r3rv"; + libraryHaskellDepends = [ + attoparsec base text unordered-containers + ]; + description = "A codec library for HTML-escaped text and HTML-entities"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "html-entity" = callPackage ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, doctest , text, unordered-containers @@ -139673,8 +141390,8 @@ self: { pname = "http-api-data"; version = "0.4.3"; sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz"; - revision = "1"; - editedCabalFile = "0vy4glhjc036m2lmkc1ls0s48pcxga2qqc1jbpj4139v9j8h158m"; + revision = "2"; + editedCabalFile = "1ihz467bn26cszgdk82l49mz2428r7y11693fj2x75fp2h2ml01i"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -140095,8 +141812,8 @@ self: { }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.1.3"; - sha256 = "12fv42jnh2glnav082a1d67za9ya9v0zpnxsphxhcy90b4s4rr6x"; + version = "1.1.4"; + sha256 = "1p6g04ysmd7v5fwsg78q4cqdaix88pv8nhc05r49dsqk9nbnn4y2"; libraryHaskellDepends = [ base bytestring data-default HsOpenSSL http-client http-client-openssl http-types network network-uri text time zlib @@ -141323,6 +143040,8 @@ self: { ]; description = "CSS-like syntax for file system manipulation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hunit-dejafu" = callPackage @@ -141823,8 +143542,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.1"; sha256 = "16v36fj5aawnx6glarzljl3yb93zkn06ij5cg40zba5rp8jhpg7z"; - revision = "1"; - editedCabalFile = "0jh79y6wl0ml4fc59icbg35nvcz7zi0fqbbg0p6y7nkxnhv4yc0j"; + revision = "3"; + editedCabalFile = "1myzy3wjwjaqlm31pa90msr8rl26vczd5yqd29mx0gy7p4x2dmgi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141969,8 +143688,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; - revision = "3"; - editedCabalFile = "066vlpy361f6r5k74b3myi6lc2g8lxm7cz23i5hhyi319yjp1jxh"; + revision = "5"; + editedCabalFile = "0dzysj8fzyfg4ggda5ramq1zad8jb810rg2nncnzv95xmnlwakgl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142010,8 +143729,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; - revision = "3"; - editedCabalFile = "16wpfpmxp3r1nrzfmcihzfcfhaiwrlq7x7z9kf68aib5zqmdxzwf"; + revision = "5"; + editedCabalFile = "1rkz578hcn7s9i08n5jc557vph7k017m8vbk6ijf5psa189w1dkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142045,8 +143764,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; - revision = "3"; - editedCabalFile = "1g6w3j4azxvikiycjnb4rjsaw8pyica3m17yhsrxq24pms4n35pl"; + revision = "5"; + editedCabalFile = "0w8kikrrkv8v1drnrjfabzflbgs768qbrfv8n17y4id76aqazml5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142208,8 +143927,8 @@ self: { pname = "hw-ip"; version = "2.4.2.0"; sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; - revision = "2"; - editedCabalFile = "19x9s7hdch768annsss3paz7sqxqr3flz01wky1vijf18abakk3l"; + revision = "4"; + editedCabalFile = "0pjry2xjnhfl3jii8j9dqmqz88hw7g8wkwy4fqnajnchrxb8f06w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142243,8 +143962,8 @@ self: { pname = "hw-json"; version = "1.3.2.2"; sha256 = "03h5zv94ndsz4vh0jql8rg8pl95rbf8xkyzvr3r55i3kpmb85sbg"; - revision = "1"; - editedCabalFile = "1ivm89r5kqflpsayl941xq0q3izjklakfqzr2f6nl78wpa3ykkiq"; + revision = "4"; + editedCabalFile = "0ys0xlmw2xdrrjjdjx1gwlh0qpig8b4ljqwrp2yhp3aihzsb5304"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142288,8 +144007,8 @@ self: { pname = "hw-json-lens"; version = "0.2.1.0"; sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; - revision = "2"; - editedCabalFile = "0n6cxjr2r7w2i735c1dz2cflgvbgcdspzzzg8w3knhl1kgiyi2ih"; + revision = "3"; + editedCabalFile = "0svnn3wdm8adcyw1phk0k9ddzlk3ni1dar681vpq61xwd1xmgjgb"; libraryHaskellDepends = [ aeson base bytestring containers hw-json lens scientific text word8 ]; @@ -142316,8 +144035,8 @@ self: { pname = "hw-json-simd"; version = "0.1.1.0"; sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; - revision = "2"; - editedCabalFile = "1amvva0pqidwcjdd4snywm8m614ygc2zn6036fh4v1ps20pyq2l9"; + revision = "3"; + editedCabalFile = "0f7y8kaj2bv3l1fscwxdnqj7378mrls1mcnsm23cpb5dizy3p2nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -142347,8 +144066,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; - revision = "4"; - editedCabalFile = "0mpjnc99yi474h9qvgg48kjcl3hxxhl58gar72bzcf5rx12pyn9w"; + revision = "6"; + editedCabalFile = "1ws3mcyvba05s0wvwzbig54wxkw37pp55c5jwbsc96inic8cfq3y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142387,8 +144106,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.3.1"; sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; - revision = "2"; - editedCabalFile = "1qc0nxcahlc0zn4ycfxhhj1qplxc0r8qh20zmq4m2n7wyghlb3hc"; + revision = "4"; + editedCabalFile = "18x3vinc6j5nnq3j5x7zdcy3ys6b2clmb7lhz6qg1wklnfcyjxsb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142502,8 +144221,8 @@ self: { pname = "hw-mquery"; version = "0.2.1.0"; sha256 = "1qhd8jcwffr57mjraw0g3xj9kb0jd75ybqaj1sbxw31lc2hr9w9j"; - revision = "1"; - editedCabalFile = "15jji7wzx2ws58nqd965r6bycdgl09qlp4rrcd81y57mq24h27mb"; + revision = "2"; + editedCabalFile = "1996bn28l3s2bgjgll17gpryvp61vxjz0d3zi5py6kk40hsb4y6z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ]; @@ -142527,8 +144246,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; - revision = "3"; - editedCabalFile = "1zn1aqkyzsa0mk9b7igvnmxas0907h9if96c9km1gjrndnjvxkyd"; + revision = "5"; + editedCabalFile = "0pnrjx4sbbxpr1fvib5z95cxjgfif2iay1j6hk5ysavwn6i2qxqx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142559,8 +144278,8 @@ self: { pname = "hw-parser"; version = "0.1.1.0"; sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa"; - revision = "1"; - editedCabalFile = "0yh06ypgvag83h32czz8dpsrc9a4w0pqy3m4jvds8sbgnj45havs"; + revision = "2"; + editedCabalFile = "15r5ydza7dawa5b7y3xi80016pa3s5sb706hvsqvn82fhqp5dziw"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim text ]; @@ -142650,8 +144369,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; - revision = "3"; - editedCabalFile = "14awklhpnw53jalxfq0446aidndmanpnwjxp1136imjv7p270pvn"; + revision = "5"; + editedCabalFile = "1jbfanh0028sxj0arx92w753dwgpazs8j2flqjq9svc91rpk82px"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142716,8 +144435,8 @@ self: { pname = "hw-simd"; version = "0.1.2.0"; sha256 = "1r202xzqprb1v8ajd9n6ixckjfdy17mn8jibx4j2xgknx595v24f"; - revision = "1"; - editedCabalFile = "0vl82knb53njkp7n6jrwp4fpipfkc7s4lsi2cqd6w2xkgmlc0rxv"; + revision = "2"; + editedCabalFile = "05rax91afykkmwnxnyi6bmmjh0n9ryw006k9k3klwnvy8h2yaf4m"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base transformers vector @@ -142863,8 +144582,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; - revision = "3"; - editedCabalFile = "1cdrikiyw13brabbjrf4v7hqaim3apx84i3xapda29f1rw8f5f3q"; + revision = "5"; + editedCabalFile = "07mir09f9h35f3cajsi68nnmk45fah1730wxi2kbmb8ya28ny0kj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142915,8 +144634,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; - revision = "4"; - editedCabalFile = "1hnbcr376pncgzzrbilffxwz5sk67c4d9hzjix3xa94cja09w1ny"; + revision = "7"; + editedCabalFile = "1rikq6wxjg4h5pfg9miw14np7b1h2vf036gawyazq5c4d6l2wfzv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -143252,6 +144971,25 @@ self: { license = lib.licenses.mit; }) {}; + "hxt_9_3_1_22" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , directory, filepath, hxt-charproperties, hxt-regex-xmlschema + , hxt-unicode, mtl, network-uri, parsec + }: + mkDerivation { + pname = "hxt"; + version = "9.3.1.22"; + sha256 = "1n9snbdl46x23ka7bbsls1vsn0plpmfmbpbl0msjfm92fkk2yq7g"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq directory filepath + hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri + parsec + ]; + description = "A collection of tools for processing XML with Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hxt-binary" = callPackage ({ mkDerivation, base, binary, bytestring, bzlib, deepseq , haskell98, hxt @@ -144345,8 +146083,7 @@ self: { ]; description = "iCalendar data types, parser, and printer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "iException" = callPackage @@ -144452,15 +146189,15 @@ self: { }) {}; "ice40-prim" = callPackage - ({ mkDerivation, base, Cabal, clash-prelude, ghc-typelits-extra + ({ mkDerivation, base, clash-prelude, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, interpolate }: mkDerivation { pname = "ice40-prim"; - version = "0.3.0.0"; - sha256 = "0qrpaqmgas3czhw2ppc1f1m4m7y2hc93za2g0rvfw80ncbrkl83s"; + version = "0.3.1.0"; + sha256 = "11q09jyckl9q84qv6xxypf5kalxgbrpgq65bqysa26i6xll4p4d0"; libraryHaskellDepends = [ - base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat + base clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise interpolate ]; description = "Lattice iCE40 Primitive IP"; @@ -146644,6 +148381,8 @@ self: { testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; description = "indentation sensitive parser-combinators for parsec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "index-core" = callPackage @@ -147104,6 +148843,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "influxdb_1_9_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, raw-strings-qq + , scientific, tagged, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.9.1.2"; + sha256 = "0adrfaimjfrhfx2542wynjpd810yqxnjr3q4hhw8gz75v70f44nn"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + base containers doctest lens raw-strings-qq tasty tasty-hunit + template-haskell time vector + ]; + description = "InfluxDB client library for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -147440,6 +149207,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "input-parsers_0_2_2" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , monoid-subclasses, parsec, parsers, text, transformers + }: + mkDerivation { + pname = "input-parsers"; + version = "0.2.2"; + sha256 = "1kb70nxg8bji7bd0y0w81bqyhx62xrbv3y2vib6sp3jkz7yriarz"; + libraryHaskellDepends = [ + attoparsec base binary bytestring monoid-subclasses parsec parsers + text transformers + ]; + description = "Extension of the parsers library with more capability and efficiency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -147742,6 +149526,36 @@ self: { broken = true; }) {}; + "instrument" = callPackage + ({ mkDerivation, array, async, base, bytestring, cereal + , cereal-text, conduit, containers, csv-conduit, data-default + , errors, exceptions, hedis, hostname, HUnit, mtl, network, path + , path-io, QuickCheck, quickcheck-instances, retry, safe-exceptions + , safecopy, safecopy-hunit, statistics, stm, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unix, vector, zlib + }: + mkDerivation { + pname = "instrument"; + version = "0.6.0.0"; + sha256 = "12wjxd8yi4dg8ca3q96rc2pvdx83hwx5a9zx1i7picl4bm5gq7a4"; + libraryHaskellDepends = [ + array base bytestring cereal cereal-text conduit containers + csv-conduit data-default errors exceptions hedis hostname mtl + network retry safe-exceptions safecopy statistics text time + transformers unix vector zlib + ]; + testHaskellDepends = [ + async base bytestring cereal containers data-default hedis HUnit + path path-io QuickCheck quickcheck-instances safe-exceptions + safecopy safecopy-hunit stm tasty tasty-hunit tasty-quickcheck + transformers + ]; + description = "Easy stats/metrics instrumentation for Haskell programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {safecopy-hunit = null;}; + "instrument-chord" = callPackage ({ mkDerivation, array, base, containers, music-diatonic }: mkDerivation { @@ -148449,6 +150263,8 @@ self: { executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "intrinsic-superclasses" = callPackage @@ -149122,6 +150938,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "ip6addr_1_0_2" = callPackage + ({ mkDerivation, base, cmdargs, IPv6Addr, text }: + mkDerivation { + pname = "ip6addr"; + version = "1.0.2"; + sha256 = "0bj9hr085hg8a8x4dcwvf4cf1876acylrl7bnqpmdrpq1n1rb9sp"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base cmdargs IPv6Addr text ]; + description = "Commandline tool to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ipa" = callPackage + ({ mkDerivation, attoparsec, base, hspec, text, unicode-transforms + }: + mkDerivation { + pname = "ipa"; + version = "0.3"; + sha256 = "0cm9ahqaf2kdqny6nmk9ff1h413v0iqbfsf6glrr5vkhmx60h9qm"; + revision = "2"; + editedCabalFile = "1jafvzz7vdbkcwywdhx49g2q1f0gah0bz921kia6lbi5jnyaail1"; + libraryHaskellDepends = [ + attoparsec base text unicode-transforms + ]; + testHaskellDepends = [ base hspec text ]; + description = "Internal Phonetic Alphabet (IPA)"; + license = lib.licenses.bsd3; + }) {}; + "ipatch" = callPackage ({ mkDerivation, base, bytestring, darcs, directory, filepath , hashed-storage, process, unix @@ -151863,6 +153710,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "jose-jwt_0_9_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal + , containers, criterion, cryptonite, hspec, HUnit, memory, mtl + , QuickCheck, text, time, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "jose-jwt"; + version = "0.9.2"; + sha256 = "1iwzrpgd9lhp0c2hhyv3nfcv5pw344vp1llqf9vdw5mliz116jn4"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal containers cryptonite + memory mtl text time transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cryptonite hspec HUnit memory mtl QuickCheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; + description = "JSON Object Signing and Encryption Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "jot" = callPackage ({ mkDerivation, base, data-default, dhall, docopt, extra, filepath , process, time, turtle, yaml @@ -152410,8 +154282,6 @@ self: { ]; description = "Load JSON from files in a directory structure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "json-encoder" = callPackage @@ -152656,6 +154526,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "json-query" = callPackage + ({ mkDerivation, array-chunks, base, bytebuild, byteslice + , bytestring, json-syntax, neat-interpolation, primitive + , scientific-notation, tasty, tasty-hunit, text, text-short + , transformers + }: + mkDerivation { + pname = "json-query"; + version = "0.1.0.0"; + sha256 = "0i1lw40j6qdfcj44mzp5g99plqwdwbh4ab3rfvv24v2c2fq20kqm"; + libraryHaskellDepends = [ + array-chunks base bytebuild bytestring json-syntax primitive + scientific-notation text-short transformers + ]; + testHaskellDepends = [ + array-chunks base bytebuild byteslice bytestring json-syntax + neat-interpolation primitive tasty tasty-hunit text text-short + ]; + description = "Kitchen sink for querying JSON"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "json-rpc" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl @@ -152843,17 +154737,17 @@ self: { "json-syntax" = callPackage ({ mkDerivation, aeson, array-builder, array-chunks, base , bytebuild, byteslice, bytesmith, bytestring, gauge - , neat-interpolation, primitive, scientific, scientific-notation - , tasty, tasty-hunit, text, text-short, unordered-containers - , vector + , neat-interpolation, primitive, run-st, scientific + , scientific-notation, tasty, tasty-hunit, text, text-short + , unordered-containers, vector }: mkDerivation { pname = "json-syntax"; - version = "0.1.2.0"; - sha256 = "0i0b54ykfd530wl8gmqw13wjwj5m6wdfgc1nyxxdz1abydxy5bpn"; + version = "0.2.0.0"; + sha256 = "0gmi2g0bx9aiv9ll97cgdb0fhzcjyd2kxrfc025kscmjv44c1v5w"; libraryHaskellDepends = [ array-builder array-chunks base bytebuild byteslice bytesmith - bytestring primitive scientific-notation text-short + bytestring primitive run-st scientific-notation text-short ]; testHaskellDepends = [ aeson array-chunks base bytebuild byteslice bytestring @@ -153126,6 +155020,41 @@ self: { broken = true; }) {}; + "jsonnet" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , containers, data-fix, deriving-compat, directory, exceptions + , filepath, hashable, megaparsec, mtl, optparse-applicative + , parser-combinators, scientific, semigroupoids, tasty + , tasty-golden, tasty-hunit, template-haskell, text + , transformers-compat, unbound-generics, unordered-containers + , vector + }: + mkDerivation { + pname = "jsonnet"; + version = "0.2.0.0"; + sha256 = "0ns2yij8yl555n5rb0pahxpqrwxgzfvdr4ajp0dy5amqsv13hhmh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers data-fix + deriving-compat directory exceptions filepath hashable megaparsec + mtl optparse-applicative parser-combinators scientific + semigroupoids template-haskell text transformers-compat + unbound-generics unordered-containers vector + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base bytestring mtl optparse-applicative text + ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring filepath mtl tasty tasty-golden + tasty-hunit text + ]; + description = "Jsonnet implementaton in pure Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "jsonpath" = callPackage ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring , file-embed, hspec, hspec-attoparsec, hspec-discover, text @@ -155108,8 +157037,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.0"; - sha256 = "1wgbjk1iyb4njcr957lipxnypk3c08c98v9czk3xld9dqzq9xxf1"; + version = "0.2.0.1"; + sha256 = "1xs2jism3r2pgvir1rr318dfrjagkagvzzdrs7n9070xzv3p3c5q"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -155127,7 +157056,7 @@ self: { process tasty tasty-golden tasty-hunit temporary text ]; benchmarkHaskellDepends = [ - base bytestring criterion prettyprinter text + base bytestring criterion prettyprinter temporary text ]; doHaddock = false; description = "Kempe compiler"; @@ -155624,22 +157553,6 @@ self: { }) {}; "kind-generics-th" = callPackage - ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "kind-generics-th"; - version = "0.2.2.1"; - sha256 = "014dzqs8n15vvj0vypd0ws1yxn1vy92gbk2zvi5m660wsgrj62aa"; - libraryHaskellDepends = [ - base ghc-prim kind-generics template-haskell th-abstraction - ]; - testHaskellDepends = [ base kind-generics template-haskell ]; - description = "Template Haskell support for generating `GenericK` instances"; - license = lib.licenses.bsd3; - }) {}; - - "kind-generics-th_0_2_2_2" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction }: @@ -155653,7 +157566,6 @@ self: { testHaskellDepends = [ base kind-generics template-haskell ]; description = "Template Haskell support for generating `GenericK` instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "kinds" = callPackage @@ -157991,8 +159903,6 @@ self: { ]; description = "JavaScript parser and pretty-printer library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-ecmascript-analysis" = callPackage @@ -158008,8 +159918,6 @@ self: { ]; description = "JavaScript static analysis library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "language-eiffel" = callPackage @@ -158242,12 +160150,12 @@ self: { ({ mkDerivation, base, hspec, parsec }: mkDerivation { pname = "language-js"; - version = "0.2.0"; - sha256 = "0j87w6sqyl67ad9qar2q240kbzksds3a301cdykjfa3n6a0r81z1"; + version = "0.3.0"; + sha256 = "0f5ql9cqfn443r63g8waar3g5jmfx0xr3kanwrcj54ra1psqm8p1"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "javascript parser for es6 and es7"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; }) {}; "language-kort" = callPackage @@ -159290,8 +161198,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "launchdarkly-server-sdk" = callPackage @@ -160481,6 +162387,8 @@ self: { pname = "lens-aeson"; version = "1.1.1"; sha256 = "1g37c8p25by3hvy5lmq4rqyl9wxmxmci2h16rj4i5jcp7slf3mvg"; + revision = "1"; + editedCabalFile = "16n6id5l84v2n3yd8n5i2my4s4p8m0z85hgbzfrpm3rhr1haja00"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -161599,6 +163507,22 @@ self: { broken = true; }) {}; + "libiserv_9_0_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , ghci, unix + }: + mkDerivation { + pname = "libiserv"; + version = "9.0.1"; + sha256 = "1f7q09xyxv0q9rjmr0a9f96am44rjsy0r5iy9b8lkrch67xfjd3v"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghci unix + ]; + description = "Provides shared functionality between iserv and iserv-proxy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "libjenkins" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit , containers, directory, doctest, filepath, free, hspec @@ -162447,6 +164371,8 @@ self: { ]; description = "Synchronize personal configs across multiple machines"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lifetimes" = callPackage @@ -162524,6 +164450,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "lifted-async_0_10_2" = 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.2"; + sha256 = "0alhvrvxp4f4srllyq5br3waiba4c93cc4nxm7jd23440swr6a31"; + 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 @@ -163884,8 +165832,8 @@ self: { }: mkDerivation { pname = "lion"; - version = "0.1.0.0"; - sha256 = "0sxj7rjx9xzrmzy0q415b7vhxvj5fp38av1qs3sx54frmzbm0x20"; + version = "0.2.0.0"; + sha256 = "0i0sr8jiaigpfhy4wnvblnrx5bl7l1vbh0pzjpdzks6r3g07h58f"; libraryHaskellDepends = [ base Cabal clash-prelude generic-monoid ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ice40-prim lens mtl @@ -164141,6 +166089,8 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -164485,6 +166435,8 @@ self: { pname = "list-tuple"; version = "0.1.3.0"; sha256 = "1qd5pr7i9xsym09ly6am3a0id3cwbb8w4xphbsjkv3wrlfv9z9v0"; + revision = "1"; + editedCabalFile = "1xmim80y3mcj81ak2xh3mpy1g2kqwqy4q7rh8n69ipbwsldqcfwg"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; testHaskellDepends = [ @@ -166852,8 +168804,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.10.0"; - sha256 = "15kgnw8f52i30xxw1q6mxlyhkpfpq5hyjsvfklg334iqr5w0nby2"; + version = "0.11.0"; + sha256 = "0mnxch3bz5hpbykfpgjvq521a596g59lkzydijwqccj9cganmr55"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -167151,6 +169103,37 @@ self: { license = lib.licenses.mit; }) {}; + "lsp_1_2_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, dependent-map, directory, filepath + , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, QuickCheck, quickcheck-instances, random + , rope-utf16-splay, scientific, sorted-list, stm, text, time + , transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.2.0.0"; + sha256 = "0ca8s84xlh9kmi1lx47d6z3c8c827q30spmbxi1nl37dn35ib4b6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + dependent-map directory filepath hashable hslogger lens lsp-types + mtl network-uri random scientific sorted-list stm text time + transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -167178,34 +169161,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_7" = 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 - , unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.11.0.7"; - sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn"; - 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 - ]; - testHaskellDepends = [ - aeson base data-default directory filepath haskell-lsp hspec lens - text unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-test_0_13_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -167234,6 +169189,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lsp-test_0_14_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, extra, filepath, Glob, hspec, lens, lsp + , lsp-types, mtl, parser-combinators, process, some, text, time + , transformers, unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.14.0.0"; + sha256 = "1pa6cial43d6dgkabk3ak4jyfznia5bliww7r9126qahj9dxgpcr"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson async base data-default directory filepath hspec lens lsp mtl + parser-combinators process text unliftio unordered-containers + ]; + testToolDepends = [ lsp ]; + benchmarkHaskellDepends = [ base extra lsp process ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, dependent-sum, dependent-sum-template @@ -167257,6 +169240,28 @@ self: { license = lib.licenses.mit; }) {}; + "lsp-types_1_2_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, 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.2.0.0"; + sha256 = "1axl62yafkxh414dxr5i7pwqw0s3kkqphs7b259qk33vin3qayk3"; + libraryHaskellDepends = [ + aeson base binary bytestring 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 + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -168400,8 +170405,8 @@ self: { ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { pname = "machines-binary"; - version = "0.3.0.3"; - sha256 = "0lh6q99xfmxl53gkxlrbjh1pfbkff8faxr9fycks98cfcmnlbzv0"; + version = "7.0.0.0"; + sha256 = "15zds0g91cn5kckkbfjl17dgi6jikv13c9gwr99fawmq056y29b8"; libraryHaskellDepends = [ base binary bytestring machines ]; description = "Binary utilities for the machines library"; license = lib.licenses.asl20; @@ -168428,8 +170433,8 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.1.0"; - sha256 = "1d6yfh26g9gs406ywc42ascnxcfcz2isfa6j921xikzndzdhg744"; + version = "7.0.0.0"; + sha256 = "0wkbnw79b4gsxwyk0hymny0q0z3xqy0kbl1mcnv1rlk1xssxyy1q"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; @@ -168458,8 +170463,8 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.13"; - sha256 = "1m7mm3s7inyiy07w8idgwb99k2a9cd1768hkm7ygryllkrg9smsd"; + version = "7.0.0.0"; + sha256 = "1d7dxx4g1027v41i1rmaa5s7r5dxcjx271rzh6v671gcxpqm6ysn"; libraryHaskellDepends = [ base bytestring chunked-data machines transformers ]; @@ -168474,8 +170479,8 @@ self: { }: mkDerivation { pname = "machines-process"; - version = "0.2.0.8"; - sha256 = "0bgs9zhx66dij8mipw6llkvyr1q18gsz78s0d71sqmh7lwl965bs"; + version = "7.0.0.1"; + sha256 = "0pf1prahz3kcqkcqi7zj1rpbfyvahslknm2m6kwxmmzw0b9d3br9"; libraryHaskellDepends = [ base chunked-data machines machines-io process ]; @@ -170636,6 +172641,30 @@ self: { license = lib.licenses.bsd2; }) {}; + "math-functions_0_3_4_2" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, gauge + , primitive, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.4.2"; + sha256 = "18y1hlc8p6yyxa14zdbm84aaq58kksbrlfp3rj2bd4ilsb00mrf1"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector + ]; + testHaskellDepends = [ + base data-default-class deepseq erf primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector vector-th-unbox + ]; + benchmarkHaskellDepends = [ + base data-default-class gauge random vector + ]; + description = "Collection of tools for numeric computations"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "math-grads" = callPackage ({ mkDerivation, aeson, array, base, bimap, containers, hspec , ilist, lens, linear, matrix, mtl, random, vector @@ -170697,6 +172726,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A library for formulating and solving math programs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "math-programming-glpk" = callPackage @@ -172666,6 +174697,8 @@ self: { ]; description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mergeless" = callPackage @@ -172704,6 +174737,8 @@ self: { ]; description = "Support for using mergeless from persistent-based databases"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "merkle-log" = callPackage @@ -173311,6 +175346,8 @@ self: { ]; description = "A Micro service gateway"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "micro-recursion-schemes" = callPackage @@ -175038,21 +177075,32 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, directory, process - , record-dot-preprocessor, record-hasfield, text, text-ansi, unix + ({ mkDerivation, base, base64, clock, directory, free, process + , record-dot-preprocessor, record-hasfield, temporary, text + , text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "2"; - sha256 = "1cdax4sjjpv7jiszv1319b7n26510pcir1icl6rfq4qbynrg4l00"; - isLibrary = false; + version = "3"; + sha256 = "0yy7j1ddnny5wq8ywkkmdas9qlfsi26pk0adklmh2c0kqfss4s3f"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base base64 clock directory process record-dot-preprocessor + record-hasfield text text-ansi unix + ]; executableHaskellDepends = [ base base64 clock directory process record-dot-preprocessor record-hasfield text text-ansi unix ]; + testHaskellDepends = [ + base base64 clock directory free process record-dot-preprocessor + record-hasfield temporary text text-ansi unix + ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "miv" = callPackage @@ -175410,8 +177458,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.3.1.0"; - sha256 = "06n8vxqafc698ahml782klb41g9bfsvqdrl4k0blnn3m3vavnzxy"; + version = "0.3.2.0"; + sha256 = "0xp6mh3rwvxvy9x194x4ya6vd127b5b5z095gdhp5gagsbj7zx0l"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = lib.licenses.mit; @@ -175421,8 +177469,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn2-array"; - version = "0.1.1.0"; - sha256 = "0dcvs5s11s840fvl17h5qrz5x6fmzvvjkfxmbk8r0p13n4k2a0ny"; + version = "0.1.3.0"; + sha256 = "12sr98mwmqvljv5npcp3qjafrd7hwjwpswpqw6lyqmnjii3hwqmn"; libraryHaskellDepends = [ base ]; description = "A library with less dependencies that can be used for multiple Ord a => a -> b transformations"; license = lib.licenses.mit; @@ -175768,8 +177816,8 @@ self: { pname = "mod"; version = "0.1.2.1"; sha256 = "0fjcjk9jxwc2d1fm3kzamh9gi3lwnl2g6kz3z2hd43dszkay1mn1"; - revision = "1"; - editedCabalFile = "012slncmwh9i4fh31mdxn5xnpl9l309swrm5vlnibrxj3pxhmrxv"; + revision = "2"; + editedCabalFile = "0h4dff2r9q5619pfahdm4bb6xmsqvv5b6d0na1i2sg7zq58ac2bq"; libraryHaskellDepends = [ base deepseq integer-gmp primitive semirings vector ]; @@ -178295,6 +180343,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; + revision = "1"; + editedCabalFile = "0hg0qa1bja05ls9l0aascqxx65nxvm1rwyvgis93ajwrbqpbi9j5"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -178466,8 +180516,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.13.0"; - sha256 = "1jbjmri2k7z5fh96i0yx28wpcp0l3fchkk3iwvq0vdwcrb78bndb"; + version = "1.14.0"; + sha256 = "1rajgkgmckiy54mdilbq21df5h3ij9a1n1v6jahgrgy9hyyg8qcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178501,13 +180551,46 @@ self: { ({ mkDerivation, base-noprelude, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.3.0"; - sha256 = "1nrwrz54xg0v9v8f1caccpdav1d0nnjqy8r8wmj5cgf9y30jfzjf"; + version = "0.4.0"; + sha256 = "1g2ng8d5s32xwflbcfl1fsr2c2lzyh3vvyqslk76w9jn3nln164l"; libraryHaskellDepends = [ base-noprelude universum ]; description = "A custom prelude used in Morley"; - license = lib.licenses.agpl3Plus; + license = lib.licenses.mit; }) {}; + "morley-upgradeable" = callPackage + ({ mkDerivation, base-noprelude, cleveland, colourista, constraints + , containers, first-class-families, fmt, hedgehog, hex-text, hspec + , HUnit, lens, lorentz, morley, morley-client, morley-prelude, mtl + , optparse-applicative, singletons, tasty, tasty-discover + , tasty-hspec, tasty-hunit-compat, text, vinyl, with-utf8 + }: + mkDerivation { + pname = "morley-upgradeable"; + version = "0.3"; + sha256 = "1rl36a686n8dv3bnvnfcr1xiqb8c3diadk5m6wr6axj4h7w0a8cc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base-noprelude cleveland colourista constraints containers + first-class-families fmt hedgehog hex-text HUnit lens lorentz + morley morley-client morley-prelude mtl singletons text vinyl + ]; + executableHaskellDepends = [ + base-noprelude constraints fmt lorentz morley morley-client + morley-prelude optparse-applicative with-utf8 + ]; + testHaskellDepends = [ + base-noprelude cleveland containers hedgehog hspec HUnit lorentz + morley morley-prelude tasty tasty-hspec tasty-hunit-compat + ]; + testToolDepends = [ tasty-discover ]; + description = "Upgradeability infrastructure based on Morley"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {cleveland = null; morley-client = null;}; + "morloc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , docopt, extra, filepath, haskell-src-meta, megaparsec, mtl @@ -181241,6 +183324,8 @@ self: { ]; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "murmurhash3" = callPackage @@ -181928,8 +184013,8 @@ self: { pname = "mwc-random"; version = "0.15.0.1"; sha256 = "1p8c5g4hb72k90ai39rgpn6cr942i6636l1y0zfp9xgjb3v0a2q3"; - revision = "1"; - editedCabalFile = "1ay26mvzxqw6rzw3hkib1j12gk6fa2hsilz12q8vhp646bqqc744"; + revision = "2"; + editedCabalFile = "0si7d23ycyg1072w10v06zh1xx4yy5jxwmrrs65inrs7fhdb1r28"; libraryHaskellDepends = [ base math-functions primitive random time vector ]; @@ -182729,8 +184814,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "1"; - editedCabalFile = "01hay5wlp803f35qp3wab1gjxrcv5lyk1hgz4r80k22xkh6dax99"; + revision = "2"; + editedCabalFile = "03g6y6viakybmxpv9jnlbhq5yvchwdp2f1cvcdvlm10c5wkl71a1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -183306,6 +185391,8 @@ self: { ]; description = "Natural number"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "natural-arithmetic" = callPackage @@ -185224,26 +187311,23 @@ self: { }) {}; "network-packet-linux" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-discover, HUnit - , network, QuickCheck, vendored-network, vendored-network-test + ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover + , HUnit, network, QuickCheck }: mkDerivation { pname = "network-packet-linux"; - version = "0.1.0.0"; - sha256 = "17096sa20jijq37nr0bn4bcnpilh5yx4pdwqb4c2vk4i0lkwg58m"; - revision = "2"; - editedCabalFile = "0w3ca2z3ppj7b8ifafh4y42zv6wpkdd0mmfsvmvcdmfprlsh244b"; - libraryHaskellDepends = [ base network vendored-network ]; + version = "0.1.1.0"; + sha256 = "0d86g04qpbqf97lwcmp3grqq7i62xmn1ki9px2dbpl4abgclljdb"; + libraryHaskellDepends = [ base network ]; testHaskellDepends = [ - base bytestring hspec HUnit network QuickCheck - vendored-network-test + base bytestring directory hspec HUnit network QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Types for working with Linux packet sockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {vendored-network = null; vendored-network-test = null;}; + }) {}; "network-pgi" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base @@ -186279,10 +188363,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.6.2.0"; - sha256 = "01r6b7xsgn2dd42jh3xnvds21sccq5lchyiikk5v1vr055dddmpm"; - revision = "1"; - editedCabalFile = "0sab8vs3zycm4ykcayrynvd0rmyar9bmvd8b60dq1fzmnbmzzgg9"; + version = "0.7.0.0"; + sha256 = "0d7p227s33sg5g1ck5s9pmcwnwvvpanbzyq2qc54bzpawpvn5kwi"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types network @@ -186593,8 +188675,8 @@ self: { pname = "nix-derivation"; version = "1.1.1"; sha256 = "1jcgq7c0x6q33ddq3ns4w69z23r31cvb2qxj04v2pyd5v8rwls9d"; - revision = "1"; - editedCabalFile = "1ink37s91kbrq8p0sqyi1i90xp2jimyg1cnzy9ydjh3iv21f7pi5"; + revision = "2"; + editedCabalFile = "1s5xjz62bhmf8y6m7mggag8r9jvg0m2wq20h7k04a7yz3k778mnr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186610,6 +188692,30 @@ self: { maintainers = with lib.maintainers; [ sorki ]; }) {}; + "nix-derivation_1_1_2" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , filepath, pretty-show, QuickCheck, text, vector + }: + mkDerivation { + pname = "nix-derivation"; + version = "1.1.2"; + sha256 = "0248xbxq4889hc3qp9z0yr21f97j3lxrjjx2isxdf8ah4hpidzy7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers deepseq filepath text vector + ]; + executableHaskellDepends = [ attoparsec base pretty-show text ]; + testHaskellDepends = [ + attoparsec base filepath QuickCheck text vector + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text ]; + description = "Parse and render *.drv files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ sorki ]; + }) {}; + "nix-diff" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, mtl , nix-derivation, optparse-applicative, patience, text, unix @@ -186617,8 +188723,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.12"; - sha256 = "1w994nxgmg9cyrvqz13d5qjp3dqprdh16w2adcc5mbs3nqm9nmrc"; + version = "1.0.13"; + sha256 = "1zdssxzzwdaf12j2817clbv3r6pbwbsvzprxlnm0ipfnf66z63lz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -186774,24 +188880,23 @@ self: { "nix-tree" = callPackage ({ mkDerivation, aeson, base, brick, bytestring, clock, containers - , deepseq, directory, filepath, hashable, hedgehog, hrfsize - , protolude, text, transformers, typed-process - , unordered-containers, vty + , deepseq, directory, filepath, hashable, hedgehog, hrfsize, relude + , text, transformers, typed-process, unordered-containers, vty }: mkDerivation { pname = "nix-tree"; - version = "0.1.6"; - sha256 = "0v8ll12z073g1c9zrgniljvrvniv1nf8p2ak6f24sixnhr8f2hhl"; + version = "0.1.7"; + sha256 = "17w0lcfr2rxyfzrdhbw9lci9k5xs1566jypip910r78373c72nbj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base brick bytestring clock containers deepseq directory - filepath hashable hrfsize protolude text transformers typed-process + filepath hashable hrfsize relude text transformers typed-process unordered-containers vty ]; testHaskellDepends = [ aeson base brick bytestring clock containers deepseq directory - filepath hashable hedgehog hrfsize protolude text transformers + filepath hashable hedgehog hrfsize relude text transformers typed-process unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; @@ -188030,6 +190135,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-env-parser_0_1_0_6" = callPackage + ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text + }: + mkDerivation { + pname = "nri-env-parser"; + version = "0.1.0.6"; + sha256 = "1hmq6676w3f5mpdpd4jbd1aa6g379q6yyidcvdyhazqxcb0dhirh"; + libraryHaskellDepends = [ + base modern-uri network-uri nri-prelude text + ]; + description = "Read environment variables as settings to build 12-factor apps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-observability" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, directory, hostname, http-client, http-client-tls @@ -188054,6 +190174,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-observability_0_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs + , bytestring, directory, hostname, http-client, http-client-tls + , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text + , time, unordered-containers + }: + mkDerivation { + pname = "nri-observability"; + version = "0.1.0.1"; + sha256 = "02baq11z5qq9lq9yh8zc29s44i44qz1m593ypn3qd8rgc1arrfjj"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers + ]; + description = "Report log spans collected by nri-prelude"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-prelude" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async , auto-update, base, bytestring, containers, directory, exceptions @@ -188080,6 +190225,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_5_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-exceptions, terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.5.0.2"; + sha256 = "1g96nf1nslynqywkqzb4x0k17v0fcw37jidrp7yzkmz16yhqxh1n"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-exceptions terminal-size text + time vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-exceptions terminal-size text + time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -189023,6 +191195,8 @@ self: { ]; description = "A bullet-hell game made with SDL2"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "o-clock" = callPackage @@ -190597,20 +192771,21 @@ self: { "openai-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, casing, containers, cpphs , hspec, http-client, http-client-tls, http-types, openai-servant - , servant, servant-client, servant-client-core, text, vector + , servant, servant-client, servant-client-core, servant-multipart + , text, vector }: mkDerivation { pname = "openai-hs"; - version = "0.1.1.0"; - sha256 = "0cfcw1jlsvzzyvxi2wmqn3klh0fr8rpi8ai6sg315ml7ignyfxz5"; + version = "0.2.0.0"; + sha256 = "0pgwq1mfsmaqr7vxlii9rj8mhp2z5iwbf6pi4pj495khpnb877lc"; libraryHaskellDepends = [ - aeson base casing cpphs http-client http-types openai-servant - servant servant-client text + aeson base bytestring casing cpphs http-client http-types + openai-servant servant servant-client servant-multipart text ]; testHaskellDepends = [ aeson base bytestring casing containers cpphs hspec http-client http-client-tls http-types openai-servant servant servant-client - servant-client-core text vector + servant-client-core servant-multipart text vector ]; description = "Unofficial OpenAI client"; license = lib.licenses.bsd3; @@ -190619,17 +192794,21 @@ self: { }) {}; "openai-servant" = callPackage - ({ mkDerivation, aeson, base, casing, servant, text, time, vector + ({ mkDerivation, aeson, base, bytestring, casing, servant + , servant-multipart, text, time, vector }: mkDerivation { pname = "openai-servant"; - version = "0.1.0.0"; - sha256 = "0fn8ram1rnf9qgs7iwl579gdz8z1qfjy6hhgk0n2z1dh28lhgq6d"; + version = "0.2.0.0"; + sha256 = "08r3jpbxqm36lsdz6zva6ps0j1xdlvqnrwhmk7141njsb4k3xxad"; libraryHaskellDepends = [ - aeson base casing servant text time vector + aeson base bytestring casing servant servant-multipart text time + vector ]; description = "Unofficial OpenAI servant types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openapi-petstore" = callPackage @@ -192815,8 +194994,8 @@ self: { }: mkDerivation { pname = "ory-kratos"; - version = "0.0.5.9"; - sha256 = "1c4vn8zyv9lakchiip6w80cfxkz7zsgfiwd5mq5dnc6fcsri3c6h"; + version = "0.0.5.10"; + sha256 = "0cn52z8d4l7z08xnz8dxiazbd109zsnl7qpy38biwvfsmzh9s46w"; libraryHaskellDepends = [ aeson base containers exceptions http-api-data http-client http-client-tls http-types mtl network-uri servant servant-client @@ -193836,6 +196015,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_13" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, xml + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.13"; + sha256 = "1f725bbazqw81gfw3wn8ii8pb4qj5z49jibl1l4l972gsgfbmgrh"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-transforms unix unordered-containers xml xml-conduit + zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -193869,6 +196107,8 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -193899,6 +196139,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.10.0"; sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; + revision = "1"; + editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -194596,6 +196838,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_1_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.1.5"; + sha256 = "18pnihbybgnaa1hs9pcz8vvvzlfn3wv8p2rnnf1p2w6m63n8vf9a"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -195255,8 +197539,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.2.0"; - sha256 = "0ksyhlg8vmrmdayzi2zpb33xggb7mv7vgbm6kgzr0knxbh3nm7jc"; + version = "2.1.3.0"; + sha256 = "1222lsdf4jbxwinv88g0sdnmbfyyxjmhfiinmasi5qbgkay4907l"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables lens mtl template-haskell text th-abstraction vector @@ -195383,8 +197667,8 @@ self: { }: mkDerivation { pname = "parconc-examples"; - version = "0.4.7"; - sha256 = "1r05ai6n6dgkqlcv4qlb10yzrjj86408ybz5zlh63qi2y34h9ga7"; + version = "0.4.8"; + sha256 = "0v247qwlmfa27xpmn25rllgxxbdy28hfylsyp90irbd8vmaxy8sk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -195962,6 +198246,8 @@ self: { pname = "parsers"; version = "0.12.10"; sha256 = "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p"; + revision = "1"; + editedCabalFile = "15pcq6iz3mbcwlknzxxfgd1myhyl41fs4j3m80pkif6dm5g18rv3"; libraryHaskellDepends = [ attoparsec base base-orphans binary charset containers mtl parsec scientific semigroups text transformers unordered-containers @@ -196050,6 +198336,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "parsnip" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, ghc-prim, primitive + }: + mkDerivation { + pname = "parsnip"; + version = "0"; + sha256 = "0xkgrpjnc4g2yhjxaa1n7rpzdwav95mkv0jp0gwx7xmp3pzwahgi"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default ghc-prim + primitive + ]; + description = "A fast, minimal parser"; + license = "(BSD-2-Clause OR Apache-2.0)"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "partage" = callPackage ({ mkDerivation, base, containers, data-lens-light, data-partition , dawg-ord, HUnit, mmorph, mtl, pipes, PSQueue, random, tasty @@ -196932,6 +199236,20 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "pava_0_1_1_1" = callPackage + ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: + mkDerivation { + pname = "pava"; + version = "0.1.1.1"; + sha256 = "11jlhc1cqsn0r82rbwnf323s0w1ir3vf4ija0r39j58y19blc8zv"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec vector ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + description = "Greatest convex majorants and least concave minorants"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "paymill" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -197328,6 +199646,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pcre-utils_0_1_8_2" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, HUnit, mtl + , regex-pcre-builtin, vector + }: + mkDerivation { + pname = "pcre-utils"; + version = "0.1.8.2"; + sha256 = "1plawzvgxww9m0vjawmkf59bfxzxf0l93g7hfwyqjq4hcc8pwq2l"; + libraryHaskellDepends = [ + array attoparsec base bytestring mtl regex-pcre-builtin vector + ]; + testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ]; + description = "Perl-like substitute and split for PCRE regexps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pcre2" = callPackage ({ mkDerivation, base, containers, criterion, hspec , microlens-platform, mtl, pcre-light, regex-pcre-builtin @@ -198569,8 +200904,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.11.0.2"; - sha256 = "09dvwh9hdc50zr6yvbzp8a9n70yjqwa2kzvjm80l9m34p29v8kkc"; + version = "2.11.0.4"; + sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl @@ -198587,28 +200922,36 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_11_0_4" = callPackage + "persistent_2_12_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, fast-logger, hspec - , http-api-data, monad-logger, mtl, path-pieces, resource-pool - , resourcet, scientific, shakespeare, silently, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector + , blaze-html, bytestring, conduit, containers, criterion, deepseq + , deepseq-generics, fast-logger, file-embed, hspec, http-api-data + , monad-logger, mtl, path-pieces, QuickCheck, resource-pool + , resourcet, scientific, shakespeare, silently, template-haskell + , text, th-lift-instances, time, transformers, unliftio + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent"; - version = "2.11.0.4"; - sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn"; + version = "2.12.0.2"; + sha256 = "0wnrpwcdfrwm6kmvq7z9b65q3qid6f1gqdk46j8m1vh3x2qchlcv"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently text time - transformers unliftio unliftio-core unordered-containers vector + path-pieces resource-pool resourcet scientific silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - containers hspec http-api-data path-pieces scientific shakespeare - text time transformers unordered-containers vector + conduit containers fast-logger hspec http-api-data monad-logger mtl + path-pieces QuickCheck resource-pool resourcet scientific + shakespeare silently template-haskell text th-lift-instances time + transformers unliftio unliftio-core unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics file-embed template-haskell + text ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; @@ -198817,15 +201160,14 @@ self: { "persistent-mongoDB" = callPackage ({ mkDerivation, aeson, base, blaze-html, bson, bytestring, cereal , conduit, containers, hspec, http-api-data, HUnit, mongoDB - , network, path-pieces, persistent, persistent-qq - , persistent-template, persistent-test, process, QuickCheck - , resource-pool, resourcet, template-haskell, text, time - , transformers, unliftio-core + , network, path-pieces, persistent, persistent-qq, persistent-test + , process, QuickCheck, resource-pool, resourcet, template-haskell + , text, time, transformers, unliftio-core }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.11.0.0"; - sha256 = "19szqr1f028hqhzigvb7sa6r2vm8q9pi5fhvx483ag0agcypmhhb"; + version = "2.12.0.0"; + sha256 = "1s49d4c4kiqcblkap96wcrp3nc0179vpzbqp4fdibljq9ylzxmzg"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -198833,9 +201175,8 @@ self: { ]; testHaskellDepends = [ base blaze-html bytestring containers hspec HUnit mongoDB - persistent persistent-qq persistent-template persistent-test - process QuickCheck template-haskell text time transformers - unliftio-core + persistent persistent-qq persistent-test process QuickCheck + template-haskell text time transformers unliftio-core ]; description = "Backend for the persistent library using mongoDB"; license = lib.licenses.mit; @@ -198844,31 +201185,6 @@ self: { }) {}; "persistent-mtl" = callPackage - ({ mkDerivation, base, bytestring, conduit, containers - , monad-logger, mtl, persistent, persistent-postgresql - , persistent-sqlite, persistent-template, resource-pool, resourcet - , resourcet-pool, tasty, tasty-golden, tasty-hunit, text - , transformers, unliftio, unliftio-core - }: - mkDerivation { - pname = "persistent-mtl"; - version = "0.2.0.0"; - sha256 = "0c22frczi2km3z108iz211gl023m69cjc284dwbknabsrl3yg4l5"; - libraryHaskellDepends = [ - base conduit containers mtl persistent resource-pool resourcet - resourcet-pool text transformers unliftio unliftio-core - ]; - testHaskellDepends = [ - base bytestring conduit containers monad-logger persistent - persistent-postgresql persistent-sqlite persistent-template - resource-pool resourcet tasty tasty-golden tasty-hunit text - unliftio - ]; - description = "Monad transformer for the persistent API"; - license = lib.licenses.bsd3; - }) {}; - - "persistent-mtl_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , monad-logger, mtl, persistent, persistent-postgresql , persistent-sqlite, persistent-template, resource-pool, resourcet @@ -198891,7 +201207,6 @@ self: { ]; description = "Monad transformer for the persistent API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-mysql" = callPackage @@ -198922,6 +201237,32 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-mysql_2_12_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, HUnit, monad-logger, mysql + , mysql-simple, persistent, persistent-qq, persistent-test + , QuickCheck, quickcheck-instances, resource-pool, resourcet, text + , time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.12.0.0"; + sha256 = "0bvwlkch8pr94dv1fib85vdsdrjpdla1rm4lslrmpg0dysgni9p3"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring containers fast-logger hspec HUnit monad-logger + mysql persistent persistent-qq persistent-test QuickCheck + quickcheck-instances resourcet text time transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -199041,6 +201382,38 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_12_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , HUnit, monad-logger, mtl, persistent, persistent-qq + , persistent-test, postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.12.0.0"; + sha256 = "1mc9d4qdx0w49g6sgaq3ld30xkfwz76w6xpq79hhrds7hxalxqrc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations HUnit monad-logger persistent persistent-qq + persistent-test QuickCheck quickcheck-instances resourcet text time + transformers unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -199081,6 +201454,28 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-qq_2_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, fast-logger + , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent + , persistent-sqlite, resourcet, template-haskell, text, unliftio + }: + mkDerivation { + pname = "persistent-qq"; + version = "2.12.0.0"; + sha256 = "1mw565rwnzdsw0vc0gs31z4l4pw8qxb70l898invj7dfnq5vj62f"; + libraryHaskellDepends = [ + base haskell-src-meta mtl persistent template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring fast-logger haskell-src-meta hspec HUnit + monad-logger mtl persistent persistent-sqlite resourcet + template-haskell text unliftio + ]; + description = "Provides a quasi-quoter for raw SQL for persistent"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -199096,25 +201491,26 @@ self: { "persistent-redis" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, hedis - , http-api-data, mtl, path-pieces, persistent, persistent-template - , scientific, template-haskell, text, time, transformers - , utf8-string + , http-api-data, mtl, path-pieces, persistent, scientific + , template-haskell, text, time, transformers, utf8-string }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2.5"; - sha256 = "0h2bwr5svj36n3axnrgnrzkysg4ywf9d97x4fwwsjgn01gwr262k"; + version = "2.12.0.0"; + sha256 = "0zibmgvlpkx4knh23jnz2vam1la6w57x2cibrdn17h0zd3s872p5"; libraryHaskellDepends = [ aeson base binary bytestring hedis http-api-data mtl path-pieces persistent scientific text time transformers utf8-string ]; testHaskellDepends = [ aeson base binary bytestring hedis http-api-data mtl path-pieces - persistent persistent-template scientific template-haskell text - time transformers utf8-string + persistent scientific template-haskell text time transformers + utf8-string ]; description = "Backend for persistent library using Redis"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persistent-refs" = callPackage @@ -199207,6 +201603,39 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.12.0.0"; + sha256 = "0qwh2zrg1dqrv7i752jkqgqfxwjbdvkxmdgnzhcfzhgn6bq1018m"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + mtl persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data @@ -199218,6 +201647,8 @@ self: { pname = "persistent-template"; version = "2.9.1.0"; sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca"; + revision = "2"; + editedCabalFile = "1lyrnh2lskkbvpjhbjiyh2ibndldsr8zgaiws7n37pa3vnmfx0qw"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -199235,6 +201666,20 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_12_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "persistent-template"; + version = "2.12.0.0"; + sha256 = "0c9cs27j43azimj74s2m2cdks87682ibpy1xbyzvygipgmb8nj6w"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "Type-safe, non-relational, multi-backend persistence"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-template-classy" = callPackage ({ mkDerivation, base, lens, persistent, persistent-sqlite , persistent-template, template-haskell, text @@ -199282,6 +201727,31 @@ self: { broken = true; }) {}; + "persistent-test_2_12_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, mtl, path-pieces, persistent + , QuickCheck, quickcheck-instances, random, resourcet, text, time + , transformers, transformers-base, unliftio, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-test"; + version = "2.12.0.0"; + sha256 = "0vn6f8wmax68qg27ifw2sfr3d0zk12p6gaax5xshwmb5ypamrc50"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger mtl + path-pieces persistent QuickCheck quickcheck-instances random + resourcet text time transformers transformers-base unliftio + unliftio-core unordered-containers + ]; + description = "Tests for Persistent"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , http-api-data, monad-logger, path-pieces, persistent @@ -199306,6 +201776,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-typed-db_0_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec + , http-api-data, monad-logger, path-pieces, persistent + , persistent-template, resource-pool, resourcet, template-haskell + , text, transformers + }: + mkDerivation { + pname = "persistent-typed-db"; + version = "0.1.0.3"; + sha256 = "15x4qfk4bwafqa495y8dsywa5mrcfnmqm7pyn419p20yngnyhzn8"; + libraryHaskellDepends = [ + aeson base bytestring conduit http-api-data monad-logger + path-pieces persistent resource-pool resourcet template-haskell + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring conduit esqueleto hspec http-api-data + monad-logger path-pieces persistent persistent-template + resource-pool resourcet template-haskell text transformers + ]; + description = "Type safe access to multiple database schemata"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-vector" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2, transformers @@ -200825,8 +203320,8 @@ self: { }: mkDerivation { pname = "pinboard-notes-backup"; - version = "1.0.5.2"; - sha256 = "0lhccldfya4pj5446kh23ahyb7vrd33jxrf1xgk4i3xiwv9bvpyy"; + version = "1.0.5.3"; + sha256 = "03a05xl9jllqihbicnas5awhm6sz1ly3wp8vqdq06jvvr5n111j4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -201647,8 +204142,8 @@ self: { pname = "pipes-group"; version = "1.0.12"; sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk"; - revision = "3"; - editedCabalFile = "1mqqwv9w65c59lv97k9185rw8dvfcm4bk5n4z18hhgsrcjyr76n9"; + revision = "4"; + editedCabalFile = "16y13pmwwfj0cgwdjf9nglxgfxv3fkznjp1bf344jfvjm14vwg43"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -201702,6 +204197,8 @@ self: { libraryHaskellDepends = [ base containers heaps pipes ]; description = "Interleave and merge streams of elements"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pipes-io" = callPackage @@ -201980,6 +204477,20 @@ self: { broken = true; }) {}; + "pipes-pulse-simple" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-safe, pulse-simple + }: + mkDerivation { + pname = "pipes-pulse-simple"; + version = "0.1.0.0"; + sha256 = "003arf5cdbk2iwhqjbd8zaw12i7fd01h218r953cdxfrc902gy0q"; + libraryHaskellDepends = [ + base bytestring pipes pipes-safe pulse-simple + ]; + description = "Pipes for pulse-simple audio"; + license = lib.licenses.asl20; + }) {}; + "pipes-random" = callPackage ({ mkDerivation, base, mwc-random, pipes, vector }: mkDerivation { @@ -202311,8 +204822,8 @@ self: { ({ mkDerivation, base, JuicyPixels, lens, optparse-applicative }: mkDerivation { pname = "pixel-printer"; - version = "0.1.1"; - sha256 = "179r8715rmd7njan4jl0g3jy0w0xq420nmkw9arvp50my8ag610f"; + version = "0.1.2"; + sha256 = "1pnwpql4myy2ax607wxxbrfl5jg8yz2dx8nivaxa23k79wshwbfh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base JuicyPixels lens ]; @@ -202395,6 +204906,8 @@ self: { ]; description = "Pixiv API binding based on servant-client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "piyo" = callPackage @@ -202517,6 +205030,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "place-cursor-at" = callPackage + ({ mkDerivation, base, base-unicode-symbols, libXinerama, X11 }: + mkDerivation { + pname = "place-cursor-at"; + version = "1.0.1"; + sha256 = "0mgxyyi8zdhiarp75jshfsq5rrk6b2a7630bwvwyw06richykk9z"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base base-unicode-symbols X11 ]; + executableSystemDepends = [ libXinerama ]; + description = "A utility for X11 that moves the mouse cursor using the keyboard"; + license = lib.licenses.gpl3Only; + }) {inherit (pkgs.xorg) libXinerama;}; + "placeholders" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -203761,6 +206288,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "poll_0_0_0_2" = callPackage + ({ mkDerivation, base, enumset, utility-ht }: + mkDerivation { + pname = "poll"; + version = "0.0.0.2"; + sha256 = "1bllh4yr96p7k44bc10zyhdx2zdh3brl0im3gnn5a1m6irsx6j42"; + libraryHaskellDepends = [ base enumset utility-ht ]; + description = "Bindings to poll.h"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "poly" = callPackage ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty @@ -203969,8 +206508,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.4.0.0"; - sha256 = "1zbfx3l390kqxq45lb1wms72cxckwh3sl7vk52q68d0l7j5cvn8n"; + version = "1.5.0.0"; + sha256 = "1d8qllllnwwjrjdaadgk4h07d7n2whw6hl8q3ikd474kfdagbiwz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl QuickCheck stm syb @@ -204023,8 +206562,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.0.0"; - sha256 = "1a4rm41x225kvmyfcrvqk0aw89fy16hzms3l1gij0b2xh5c5lfyw"; + version = "0.1.2.0"; + sha256 = "1xv5nlr89jb0yzqzfb3dj2phi3ywvrazjilzd491892z3qbwvz5d"; libraryHaskellDepends = [ aeson base chronos containers polysemy polysemy-plugin polysemy-time text @@ -204039,6 +206578,31 @@ self: { broken = true; }) {}; + "polysemy-conc" = callPackage + ({ mkDerivation, async, base, containers, hedgehog, polysemy + , polysemy-test, polysemy-time, relude, stm, stm-chans + , string-interpolate, tasty, tasty-hedgehog, template-haskell, text + , time, unix + }: + mkDerivation { + pname = "polysemy-conc"; + version = "0.1.0.1"; + sha256 = "1p8zhnf28zdmmfrmxixqvih5waididvm8h0vh5wvmjglhf5k35x5"; + libraryHaskellDepends = [ + async base containers polysemy polysemy-time relude stm stm-chans + string-interpolate template-haskell text time unix + ]; + testHaskellDepends = [ + async base containers hedgehog polysemy polysemy-test polysemy-time + relude stm stm-chans string-interpolate tasty tasty-hedgehog + template-haskell text time unix + ]; + description = "Polysemy Effects for Concurrency"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "polysemy-extra" = callPackage ({ mkDerivation, base, containers, exceptions, extra, polysemy , polysemy-zoo @@ -204089,18 +206653,18 @@ self: { , case-insensitive, co-log-core, co-log-polysemy, composition , containers, data-default, either, hedgehog, http-client , http-client-tls, http-types, lens, network, polysemy - , polysemy-plugin, relude, servant, servant-client, servant-server - , string-interpolate, tasty, tasty-hedgehog, template-haskell, text - , time, warp + , polysemy-log, polysemy-plugin, relude, servant, servant-client + , servant-server, string-interpolate, tasty, tasty-hedgehog + , template-haskell, text, time, warp }: mkDerivation { pname = "polysemy-http"; - version = "0.3.0.0"; - sha256 = "0ahx7rxl8xa1v48i35bvjpz1wnbcl63k6xxzikrh13z3fd0ci704"; + version = "0.4.0.1"; + sha256 = "0yhv295kjnrk9d2i59y9x8fgaxnsiwgmbk6x7calysqkw195sa44"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default either - http-client http-client-tls http-types lens polysemy + http-client http-client-tls http-types lens polysemy polysemy-log polysemy-plugin relude string-interpolate template-haskell text time ]; @@ -204108,9 +206672,9 @@ self: { aeson ansi-terminal base bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default either hedgehog http-client http-client-tls http-types lens network polysemy - polysemy-plugin relude servant servant-client servant-server - string-interpolate tasty tasty-hedgehog template-haskell text time - warp + polysemy-log polysemy-plugin relude servant servant-client + servant-server string-interpolate tasty tasty-hedgehog + template-haskell text time warp ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; @@ -204134,6 +206698,80 @@ self: { license = lib.licenses.mit; }) {}; + "polysemy-log" = callPackage + ({ mkDerivation, ansi-terminal, async, base, hedgehog, polysemy + , polysemy-conc, polysemy-test, polysemy-time, relude, stm + , stm-chans, string-interpolate, tasty, tasty-hedgehog + , template-haskell, text, time + }: + mkDerivation { + pname = "polysemy-log"; + version = "0.2.0.1"; + sha256 = "1zidk2i6mvd7i4dr83rdjhnw9v4603gig8qr3d5b7r6q4bvvm0va"; + libraryHaskellDepends = [ + ansi-terminal async base polysemy polysemy-conc polysemy-time + relude stm stm-chans string-interpolate template-haskell text time + ]; + testHaskellDepends = [ + ansi-terminal async base hedgehog polysemy polysemy-conc + polysemy-test polysemy-time relude stm stm-chans string-interpolate + tasty tasty-hedgehog template-haskell text time + ]; + description = "Polysemy effects for logging"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "polysemy-log-co" = callPackage + ({ mkDerivation, base, co-log, co-log-core, co-log-polysemy + , hedgehog, polysemy, polysemy-conc, polysemy-log, polysemy-test + , polysemy-time, relude, string-interpolate, tasty, tasty-hedgehog + , text, time + }: + mkDerivation { + pname = "polysemy-log-co"; + version = "0.2.0.1"; + sha256 = "0jqyn96n7mdffyhbq7fxj8rl8prpcfmjl4wdhw4bax404bbm9v2n"; + libraryHaskellDepends = [ + base co-log co-log-core co-log-polysemy polysemy polysemy-conc + polysemy-log polysemy-time relude string-interpolate text time + ]; + testHaskellDepends = [ + base co-log co-log-core co-log-polysemy hedgehog polysemy + polysemy-conc polysemy-log polysemy-test polysemy-time relude + string-interpolate tasty tasty-hedgehog text time + ]; + description = "polysemy-log interpreter for co-log"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "polysemy-log-di" = callPackage + ({ mkDerivation, base, di-polysemy, hedgehog, polysemy + , polysemy-conc, polysemy-log, polysemy-test, polysemy-time, relude + , string-interpolate, tasty, tasty-hedgehog, text, time + }: + mkDerivation { + pname = "polysemy-log-di"; + version = "0.2.0.1"; + sha256 = "0n486xv9wayapk2bviik7mmqsrfzzdiq6rr7r1asjqygzksn48lv"; + libraryHaskellDepends = [ + base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time + relude string-interpolate text time + ]; + testHaskellDepends = [ + base di-polysemy hedgehog polysemy polysemy-conc polysemy-log + polysemy-test polysemy-time relude string-interpolate tasty + tasty-hedgehog text time + ]; + description = "polysemy-log interpreter for di"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "polysemy-methodology" = callPackage ({ mkDerivation, base, co-log-polysemy, polysemy, polysemy-plugin , polysemy-zoo @@ -204222,8 +206860,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.5.2"; - sha256 = "13qfbgwn187vgdqs2rkl5lhcfbaw992qnlpz90pr9nw64k2ylcmp"; + version = "0.3.0.0"; + sha256 = "0pcy476nndcvszkl57d5sd2m64zvjzvvxz4ldg2bdg6mdi4apl23"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -204265,8 +206903,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.3.0.2"; - sha256 = "16xkg6iwb7ms3k7mbrwa152izgs520x6jvc5bwp9pl0mk70qx3nw"; + version = "0.3.1.0"; + sha256 = "0a55kdfcjngdgl2is9qnhm7akrrjy03qsiihxgczabflcmqyazcb"; libraryHaskellDepends = [ base containers either hedgehog path path-io polysemy polysemy-plugin relude string-interpolate tasty tasty-hedgehog @@ -204291,8 +206929,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.1.0"; - sha256 = "1az7mf2jvd0vhsjpswa37rxrj760n5n3vhxpb4rlx28g8nx2jmkj"; + version = "0.1.2.0"; + sha256 = "01z8y3jn63s8rkx27vj09hj6rl0ba4yjcc52yj7cvsvyi64s6ya3"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -204576,38 +207214,49 @@ self: { "pontarius-xmpp" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary - , bytestring, Cabal, conduit, configurator, containers, criterion - , crypto-api, crypto-random, cryptohash, cryptohash-cryptoapi - , data-default, derive, directory, dns, exceptions, filepath - , hslogger, hspec, hspec-expectations, HUnit, iproute, lens - , lens-family, lifted-base, mtl, network, profunctors, pureMD5 - , QuickCheck, quickcheck-instances, random, ranges, resourcet - , smallcheck, split, stm, stringprep, tasty, tasty-hspec - , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text - , tls, transformers, unbounded-delays, void, x509-system - , xml-conduit, xml-picklers, xml-types + , bytestring, Cabal, conduit, containers, criterion, crypto-api + , crypto-random, cryptohash, cryptohash-cryptoapi, data-default + , dns, exceptions, generic-arbitrary, hslogger, hspec + , hspec-expectations, iproute, lens, lens-family, lifted-base, mtl + , network, profunctors, pureMD5, QuickCheck, quickcheck-instances + , random, ranges, resourcet, smallcheck, split, stm, stringprep + , tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, tls, transformers, unbounded-delays, void + , x509-system, xml-conduit, xml-picklers, xml-types }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.6.3"; - sha256 = "0zfl6brikkb4pjgvl4lfvjjylmiq6gyv46mi21nrlk3vmdni9dd5"; + version = "0.5.6.4"; + sha256 = "1izcyk30r527p4zx8yyi42r1xsl01gc5jpdrpkz1lksnjc6vzxq3"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi - data-default dns exceptions hslogger iproute lens-family + data-default dns exceptions hslogger iproute lens lens-family lifted-base mtl network profunctors pureMD5 random resourcet split stm stringprep template-haskell text tls transformers unbounded-delays void x509-system xml-conduit xml-picklers xml-types ]; testHaskellDepends = [ - async base Cabal conduit configurator containers data-default - derive directory filepath hslogger hspec hspec-expectations HUnit - lens mtl network QuickCheck quickcheck-instances ranges smallcheck - stm stringprep tasty tasty-hspec tasty-hunit tasty-quickcheck - tasty-th text tls transformers xml-picklers xml-types + async attoparsec base base64-bytestring binary bytestring Cabal + conduit containers crypto-api crypto-random cryptohash + cryptohash-cryptoapi data-default dns exceptions generic-arbitrary + hslogger hspec hspec-expectations iproute lens lens-family + lifted-base mtl network profunctors pureMD5 QuickCheck + quickcheck-instances random ranges resourcet smallcheck split stm + stringprep tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-th + template-haskell text tls transformers unbounded-delays void + x509-system xml-conduit xml-picklers xml-types + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers criterion crypto-api crypto-random cryptohash + cryptohash-cryptoapi data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void x509-system xml-conduit + xml-picklers xml-types ]; - benchmarkHaskellDepends = [ base criterion ]; description = "An XMPP client library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -204620,8 +207269,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.6"; - sha256 = "12av8vgnj9iy0bdcb13gc4x28n3c7ahb3221xla78sss5r4rhq0z"; + version = "0.1.0.7"; + sha256 = "0kcb0fvbs340cpqzh9vxi7vkisgkv2afnvr5fjq647lwisncbxgz"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -205456,6 +208105,34 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_12_4" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances + , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.4"; + sha256 = "1im0wfssg8f31rdis86qxhz0cqra1bdgiyxgsbqxf78qi3w05f4c"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -205659,6 +208336,8 @@ self: { pname = "postgresql-placeholder-converter"; version = "0.2.0.0"; sha256 = "0jpsa6c2m0m8d9abki585krf9pvj5p4rsayg1qs963r4vg1m8p23"; + revision = "1"; + editedCabalFile = "008gnpj16xnbmrzqjm9mqyycdvmzlbnsrsz3kfa42sf3fnq1g1f6"; libraryHaskellDepends = [ attoparsec base bytestring either-result mtl utf8-string ]; @@ -205672,46 +208351,40 @@ self: { ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , Cabal, cassava, clock, containers, convertible, cryptohash-md5 , data-default-class, deepseq, directory, doctest - , double-conversion, filepath, HDBC, HDBC-postgresql, HDBC-session - , homotuple, hourglass, hspec, hspec-core, HUnit, list-tuple - , memory, mtl, network, old-time, OneTuple, Only - , optparse-applicative, persistable-record, postgresql-binary - , postgresql-libpq, postgresql-placeholder-converter - , postgresql-simple, pretty-hex, QuickCheck, random-shuffle - , relational-query, relational-query-HDBC, relational-record - , safe-exceptions, scientific, single-tuple, text, time - , utf8-string, vector + , double-conversion, either-result, filepath, HDBC, HDBC-postgresql + , HDBC-session, homotuple, hourglass, hspec, hspec-discover, HUnit + , list-tuple, memory, mtl, network, old-time, OneTuple, Only + , optparse-applicative, postgresql-binary, postgresql-libpq + , postgresql-placeholder-converter, postgresql-simple + , postgresql-typed, pretty-hex, random-shuffle, relational-query + , relational-query-HDBC, safe-exceptions, scientific, single-tuple + , text, time, utf8-string }: mkDerivation { pname = "postgresql-pure"; - version = "0.2.2.0"; - sha256 = "16k03m1yy8ca5rik4av76p883nvmk0w4ak9pva2i5l57vv8d8hc6"; + version = "0.2.3.0"; + sha256 = "0lcnsrz612i240l7xw48zq1f70y1hjjbjl7h7yrdjwk2drihqx3x"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers convertible - cryptohash-md5 data-default-class double-conversion HDBC homotuple - list-tuple memory mtl network OneTuple Only postgresql-binary - postgresql-placeholder-converter pretty-hex safe-exceptions - scientific single-tuple text time utf8-string - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring bytestring containers convertible - cryptohash-md5 data-default-class doctest double-conversion HDBC - HDBC-postgresql HDBC-session homotuple hspec hspec-core HUnit - list-tuple memory mtl network old-time OneTuple Only - persistable-record postgresql-binary - postgresql-placeholder-converter pretty-hex QuickCheck - relational-query relational-query-HDBC relational-record + cryptohash-md5 data-default-class deepseq double-conversion HDBC + homotuple list-tuple memory mtl network OneTuple Only + postgresql-binary postgresql-placeholder-converter pretty-hex safe-exceptions scientific single-tuple text time utf8-string ]; + testHaskellDepends = [ + attoparsec base bytestring containers convertible + data-default-class doctest either-result HDBC HDBC-postgresql + HDBC-session homotuple hspec HUnit network old-time Only + postgresql-placeholder-converter relational-query + relational-query-HDBC safe-exceptions time utf8-string + ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - attoparsec base base16-bytestring bytestring cassava clock - containers convertible cryptohash-md5 data-default-class deepseq - double-conversion HDBC homotuple hourglass list-tuple memory mtl - network OneTuple Only optparse-applicative postgresql-binary - postgresql-libpq postgresql-placeholder-converter postgresql-simple - pretty-hex random-shuffle safe-exceptions scientific single-tuple - text time utf8-string vector + attoparsec base bytestring cassava clock data-default-class deepseq + homotuple hourglass Only optparse-applicative postgresql-libpq + postgresql-simple postgresql-typed random-shuffle scientific time + utf8-string ]; description = "pure Haskell PostgreSQL driver"; license = lib.licenses.bsd3; @@ -205783,8 +208456,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "1"; - editedCabalFile = "017qfhml58psv72qnyb2hg6r8jl1mj8jmr2q5p3hgd0lcsxiq0qi"; + revision = "2"; + editedCabalFile = "1kwjlj0bsc1yd4dgfc0ydawq9acfjlf0bymwc830dryp16wpj9zv"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -205983,6 +208656,8 @@ self: { ]; description = "Parse postgres:// url into ConnectInfo"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-syntax" = callPackage @@ -206143,6 +208818,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "postgresql-typed_0_6_2_0" = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring + , containers, convertible, criterion, cryptonite, data-default + , haskell-src-meta, HDBC, HUnit, memory, network, old-locale + , postgresql-binary, QuickCheck, scientific, template-haskell, text + , time, tls, utf8-string, uuid, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "postgresql-typed"; + version = "0.6.2.0"; + sha256 = "0v38c5ai3plc1vlgz536a41yflz2d7nm9laks28lnqvxaqim27aw"; + libraryHaskellDepends = [ + aeson array attoparsec base binary bytestring containers cryptonite + data-default haskell-src-meta HDBC memory network old-locale + postgresql-binary scientific template-haskell text time tls + utf8-string uuid x509 x509-store x509-validation + ]; + testHaskellDepends = [ + base bytestring containers convertible HDBC HUnit network + QuickCheck time tls + ]; + benchmarkHaskellDepends = [ + base bytestring criterion network time tls + ]; + description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-typed-lifted" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, exceptions , lens, monad-control, postgresql-typed, transformers-base @@ -208127,8 +210831,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "primitive-foreign" = callPackage @@ -210124,6 +212826,8 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "proto-lens-protobuf-types" = callPackage @@ -210840,8 +213544,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.7.2"; - sha256 = "0d00albfv3zbbq54x9i8riwbpi61mpz7ymr8y1whag2lrw4diyna"; + version = "0.16.8.1"; + sha256 = "1ij3jhvavy19jjy6zx1q3jm2zq3n4qjxng653m5rr0rlfmwmanhp"; libraryHaskellDepends = [ base bytestring contravariant profunctors text time vector ]; @@ -210870,6 +213574,17 @@ self: { broken = true; }) {}; + "ptrdiff" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ptrdiff"; + version = "0"; + sha256 = "1qfa6n1xd2xgcr9qbqdf3y8gj8yfiiladg3l4sp72v7wvqbvgvyw"; + libraryHaskellDepends = [ base ]; + description = "Type-checked pointer diffs"; + license = "(BSD-2-Clause OR Apache-2.0)"; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -212394,6 +215109,8 @@ self: { ]; description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "qq-literals" = callPackage @@ -212635,6 +215352,18 @@ self: { license = lib.licenses.mit; }) {}; + "qualified-imports-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, syb, text }: + mkDerivation { + pname = "qualified-imports-plugin"; + version = "0.0.1"; + sha256 = "075m9p02yz5zss64sli2c44id65z9m6f0vzwmpp21ra366s7l8rx"; + libraryHaskellDepends = [ base containers ghc syb ]; + testHaskellDepends = [ base text ]; + description = "GHC plugin to automatically insert qualified imports"; + license = lib.licenses.bsd3; + }) {}; + "quandl-api" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , http-conduit, http-types, syb, text, time, time-locale-compat @@ -213529,6 +216258,8 @@ self: { ]; description = "Wrapper for the QuickJS Javascript Engine"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "quicklz" = callPackage @@ -215233,6 +217964,8 @@ self: { ]; description = "Memory efficient sets with ranges of elements"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "range-space" = callPackage @@ -215819,17 +218552,16 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, HUnit, text - , transformers }: mkDerivation { pname = "rattletrap"; - version = "11.0.0"; - sha256 = "10xr9fv0xdiz173i5apz29sh66bvya3ris2c7ig2qs8dfbqi165s"; + version = "11.0.1"; + sha256 = "1s9n89i6mh3lw9mni5lgs8qnq5c1981hrz5bv0n9cffnnp45av6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array base bytestring containers filepath - http-client http-client-tls text transformers + http-client http-client-tls text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring filepath HUnit ]; @@ -216138,6 +218870,25 @@ self: { license = lib.licenses.mit; }) {}; + "rdf_0_1_0_5" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , dlist, fgl, text, transformers + }: + mkDerivation { + pname = "rdf"; + version = "0.1.0.5"; + sha256 = "1jrnmy9fdj3d3pnhycxl5smn6pjdm44b862wfp6hlb82vyl4556s"; + libraryHaskellDepends = [ + attoparsec base bytestring deepseq dlist fgl text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Representation and Incremental Processing of RDF Data"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rdf4h" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base, binary , bytestring, containers, criterion, deepseq, directory, exceptions @@ -216760,6 +219511,8 @@ self: { ]; description = "Extracts text of main article from HTML document"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "readable" = callPackage @@ -217049,22 +219802,22 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_10_0_1" = callPackage + "rebase_1_12_0_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers - , contravariant, contravariant-extras, deepseq, dlist, either - , hashable, hashable-time, mtl, profunctors, scientific, selective - , semigroupoids, stm, text, time, transformers - , unordered-containers, uuid, vector, vector-instances, void + , contravariant, deepseq, dlist, either, hashable, hashable-time + , mtl, profunctors, scientific, selective, semigroupoids, stm, text + , time, transformers, unordered-containers, uuid, vector + , vector-instances, void }: mkDerivation { pname = "rebase"; - version = "1.10.0.1"; - sha256 = "1b0fdihl5lg567ik7ysiiz9sxiknzj4vsxqhj3x9hcv7b1xh69d7"; + version = "1.12.0.1"; + sha256 = "1yl09702psialskvm39i9rl3sag853qr1237jhs79yk7nhvdlaqx"; libraryHaskellDepends = [ - base bifunctors bytestring comonad containers contravariant - contravariant-extras deepseq dlist either hashable hashable-time - mtl profunctors scientific selective semigroupoids stm text time - transformers unordered-containers uuid vector vector-instances void + base bifunctors bytestring comonad containers contravariant deepseq + dlist either hashable hashable-time mtl profunctors scientific + selective semigroupoids stm text time transformers + unordered-containers uuid vector vector-instances void ]; description = "A more progressive alternative to the \"base\" package"; license = lib.licenses.mit; @@ -217363,8 +220116,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.2.2"; - sha256 = "02p1blgxd0nyzrgqw8ghm2a680f2a05rn1nrqqcjyh1whksl2g3x"; + version = "5.2.2.1"; + sha256 = "1nq23ybrbkcgd9rsva4bsvzxl78987qfy0qmxxlvlq2mvs2jkqxy"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -219727,6 +222480,37 @@ self: { testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "registry_0_2_0_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.2.0.2"; + sha256 = "1lq8r382xm1m5b7i0jfjaj3f1jr98rdvjpn0h77i4i0i1wy529c1"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "registry-hedgehog" = callPackage @@ -219737,8 +222521,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.3.0.0"; - sha256 = "0ardmwsaxlk9g062bf2xiigbjbnqbf7iz9s8xwjzj8nh8rrs252z"; + version = "0.4.0.0"; + sha256 = "0mq5x9a8z70ibq78wx1p1za2f4r1mgrpdy78p5yvxvlzcazwqnp6"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -219968,6 +222752,8 @@ self: { ]; description = "Sensible RLP encoding"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "relation" = callPackage @@ -221356,12 +224142,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_10_0_1" = callPackage + "rerebase_1_12_0_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.10.0.1"; - sha256 = "0kqcd80a4z1hynmdwb78dzif0iim6gwk9pdzkgzspf8kxir5adf3"; + version = "1.12.0.1"; + sha256 = "0kh0022hfviywa4rkwnrqygc7s3vg8qvr9znh66v5c1i3gaibzq5"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -221518,8 +224304,8 @@ self: { pname = "resolv"; version = "0.1.2.0"; sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; - revision = "1"; - editedCabalFile = "19pm4cg28viyl7r0viz4wfmm9w4nqxkjlb6kknfqcajjqmdacqad"; + revision = "2"; + editedCabalFile = "0nn5dalsl9sradkpv4awsb90v8cvcqvw4hd58yvpp4vpfybnk90h"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -226952,8 +229738,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "8.12"; - sha256 = "0qr9z5vm4py072a23nc263ma7k5hg6n9xy2pq9pra8z16sq4bnb3"; + version = "8.14"; + sha256 = "1yf350daksxwz084j81ngamr53jpz7y2fi4cnpni6vy16mb0sxz1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -226981,8 +229767,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.12"; - sha256 = "1c413kqbznl1cc3l4lbpk3d8c2jzl62znf7zm89x5dcw7wyfpz0y"; + version = "9.0.1"; + sha256 = "1hg1sxnspyxjpj98c2h7hzf93m9acw8cjiva4wsnxl1gspln4gwb"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -228482,6 +231268,18 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "scroll-list" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "scroll-list"; + version = "1.0.0.1"; + sha256 = "1qz4b04jkfkz9w6bz4g4zad5hj2nkl63y0klq0z5lgllf2f6ryw3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "This package provides functions for relocate an item within a list"; + license = lib.licenses.bsd3; + }) {}; + "scrypt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -229268,6 +232066,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "secp256k1-legacy" = callPackage @@ -230582,8 +233382,8 @@ self: { pname = "serialise"; version = "0.2.3.0"; sha256 = "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69"; - revision = "1"; - editedCabalFile = "1pg6hkim1qcrnkj2rqw8xz5mxkrh0jadlsgwm2v1xgkpgfi1dk1r"; + revision = "2"; + editedCabalFile = "1qcsp15v0swxy2qlvc40fil09zq32y3wl00y3passc2a4b4yhmr4"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -230644,12 +233444,14 @@ self: { ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { pname = "serialport"; - version = "0.5.1"; - sha256 = "1ys3rjw1a3cghd2slnn43hvc3pdgwfy3rs19j1kjfshasr7d375m"; + version = "0.5.2"; + sha256 = "1wxi4arxbcvaacrm6phfnd3dvmy5h2bfcwlqis7x1bgyqpzxcq4b"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serokell-util" = callPackage @@ -233911,13 +236713,25 @@ self: { pname = "setlocale"; version = "1.0.0.9"; sha256 = "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv"; - revision = "2"; - editedCabalFile = "0l0hlxhjspm05hxd06972ilw4c3ni72mnzcyljg3a01i8pxi53cl"; + revision = "3"; + editedCabalFile = "10ikb40vv1n3rk7cczhgpi2h4wmv2s0wzq5xkgjqvsqwl1pxkidw"; libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; license = lib.licenses.bsd3; }) {}; + "setlocale_1_0_0_10" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "setlocale"; + version = "1.0.0.10"; + sha256 = "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings to setlocale"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "setoid" = callPackage ({ mkDerivation, base, containers, mtl, smallcheck, tasty , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -234727,6 +237541,8 @@ self: { ]; description = "Shake rules for CSS"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "shake-pack" = callPackage @@ -235402,6 +238218,24 @@ self: { license = lib.licenses.mpl20; }) {}; + "shellmet_0_0_4_0" = callPackage + ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text + }: + mkDerivation { + pname = "shellmet"; + version = "0.0.4.0"; + sha256 = "1nrva50knx3ca0m6f84f1yim4apj949fqqmmrxqmxhlixjzafl8v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process text ]; + executableHaskellDepends = [ base text ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Out of the shell solution for scripting in Haskell"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "shellout" = callPackage ({ mkDerivation, async, base, stm, text, typed-process }: mkDerivation { @@ -236263,6 +239097,8 @@ self: { ]; description = "Hmac sha256 signature json and http payload"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "signed-multiset" = callPackage @@ -236278,6 +239114,31 @@ self: { broken = true; }) {}; + "signify-hs" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , cryptohash-sha512, cryptonite, eccrypto, filepath + , optparse-applicative, parsec + }: + mkDerivation { + pname = "signify-hs"; + version = "0.1.0.1"; + sha256 = "1a8ipdyc4c79waf1mgpwbmj1wrghmc5x49ksbxiwnkz6ini61kny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptohash-sha512 cryptonite + eccrypto parsec + ]; + executableHaskellDepends = [ + base base64-bytestring bytestring cryptohash-sha512 cryptonite + eccrypto filepath optparse-applicative parsec + ]; + description = "A Haskell clone of OpenBSD signify"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "silently" = callPackage ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: mkDerivation { @@ -236887,6 +239748,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-parser" = callPackage + ({ mkDerivation, base, containers, list-t, mmorph, mtl + , nonempty-containers, scientific, tasty, tasty-hunit, tasty-th + , text, text-builder + }: + mkDerivation { + pname = "simple-parser"; + version = "0.3.0"; + sha256 = "05a4aakq93nqmm632mijd64vjq07dlpcb1m2a57z6k1mhqinwxc5"; + libraryHaskellDepends = [ + base containers list-t mmorph mtl nonempty-containers scientific + text text-builder + ]; + testHaskellDepends = [ + base containers list-t mmorph mtl nonempty-containers scientific + tasty tasty-hunit tasty-th text text-builder + ]; + description = "Simple parser combinators"; + license = lib.licenses.bsd3; + }) {}; + "simple-pascal" = callPackage ({ mkDerivation, base, containers, filepath, mtl, parsec , simple-stacked-vm @@ -237034,8 +239916,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.9.5"; - sha256 = "0bwb3r2gqm81nmf0hc0mgj8vp2a48kmzx0h7h42lprp4d4irwmy2"; + version = "0.9.6"; + sha256 = "1smr9lbr46nghbyk39j5v2s53zw1k2v1sbwwzj5js5h61xj33zs9"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = lib.licenses.bsd3; @@ -237053,6 +239935,8 @@ self: { testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ]; description = "A parser for SQL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "simple-src-utils" = callPackage @@ -237514,6 +240398,8 @@ self: { pname = "single-tuple"; version = "0.1.1.0"; sha256 = "1cviix5did4pm4bimg12v2qa9ms5icf19k3iz13g07d5q9jyiwji"; + revision = "1"; + editedCabalFile = "0gmki1bz7sn1lw5f1f1zp3rfphwba03fv6825djlidybln8snld0"; libraryHaskellDepends = [ base OneTuple Only ]; testHaskellDepends = [ base hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; @@ -237653,6 +240539,8 @@ self: { ]; description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "singletons-presburger" = callPackage @@ -237686,6 +240574,8 @@ self: { ]; description = "A framework for generating singleton types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "singnal" = callPackage @@ -238280,8 +241170,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.10.4.1"; - sha256 = "1a1s0fvfbq9q4fy72192mh9sdxz81cpl2z6ghsbh7prfl2kbqsiv"; + version = "0.10.5"; + sha256 = "09f21wkw8n5bjdn5bbrqphq4f44gipd1cb9b0ikjn9zrggglfnx9"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -238295,14 +241185,14 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "skylighting_0_10_5" = callPackage + "skylighting_0_10_5_1" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.10.5"; - sha256 = "09f21wkw8n5bjdn5bbrqphq4f44gipd1cb9b0ikjn9zrggglfnx9"; + version = "0.10.5.1"; + sha256 = "11y2j9c4gw0x5h974jrp0yppy5dys9i0nxdbzm374nwx8mjwdl4w"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -238327,8 +241217,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.4.1"; - sha256 = "07pnwixyi4v24412j6fs2j5kip2j2rx5fakpdiczffwma4jagv73"; + version = "0.10.5"; + sha256 = "1iaisswfg8ab6rd11002390jfxr309qyvlm85h57mi8svwxk09x2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238348,7 +241238,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_10_5" = callPackage + "skylighting-core_0_10_5_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -238358,8 +241248,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.5"; - sha256 = "1iaisswfg8ab6rd11002390jfxr309qyvlm85h57mi8svwxk09x2"; + version = "0.10.5.1"; + sha256 = "14mz7krfkidgplhp49w84ryz74jrsdqll44wqd0my0m28v2vg9ka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238564,6 +241454,8 @@ self: { ]; description = "Slack API Request Verification HMAC"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "slack-web" = callPackage @@ -238707,8 +241599,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "1.1.0.0"; - sha256 = "1a6zsp308ikqzdxy26phb04bk4hr8lmw1i73mwydg65yd42c8zjx"; + version = "1.1.1.0"; + sha256 = "19zqg85j3685hsbax5sv96zfqxih7rmcjd65z88vynmiv718147d"; libraryHaskellDepends = [ aeson base bytestring directory extra mustache pandoc shake text unordered-containers @@ -238777,18 +241669,6 @@ self: { }) {}; "slist" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "slist"; - version = "0.1.1.0"; - sha256 = "046v580i8kxx9fpsvavwpydyfsffky3m735c45dafixrkbhjz55d"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Sized list"; - license = lib.licenses.mpl20; - }) {}; - - "slist_0_2_0_0" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec , hspec-hedgehog }: @@ -238802,7 +241682,6 @@ self: { ]; description = "Sized list"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "sloane" = callPackage @@ -239270,6 +242149,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "smash_0_1_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, deepseq, hashable, mtl + , template-haskell + }: + mkDerivation { + pname = "smash"; + version = "0.1.2"; + sha256 = "178ja9c88py31059i0fqv81b1dbgfyv2v64z9ak2k5p79946aa0w"; + revision = "1"; + editedCabalFile = "0i5ba4zn11b075fy32pawfhjy81731pjiy5f88f6z8zzbbgwfyny"; + libraryHaskellDepends = [ + base bifunctors binary deepseq hashable mtl template-haskell + ]; + description = "Smash products, wedge products, and pointed products"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "smash-aeson" = callPackage ({ mkDerivation, aeson, base, smash, unordered-containers }: mkDerivation { @@ -239320,6 +242217,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "smawk" = callPackage + ({ mkDerivation, base, primitive, semigroupoids, transformers }: + mkDerivation { + pname = "smawk"; + version = "0"; + sha256 = "0w0hzn4zmziwxm88y6ra2p6ld29jfga9wnbcgrhw0snf10cnnqyc"; + libraryHaskellDepends = [ + base primitive semigroupoids transformers + ]; + description = "Linear time row minima for totally monotone matrices"; + license = "(BSD-2-Clause OR Apache-2.0)"; + }) {}; + "smcdel" = callPackage ({ mkDerivation, ansi-terminal, array, base, containers, criterion , cudd, directory, file-embed, filepath, graphviz, HasCacBDD, hspec @@ -243237,6 +246147,21 @@ self: { libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "splint_1_0_1_4" = callPackage + ({ mkDerivation, base, containers, ghc, hlint, stm }: + mkDerivation { + pname = "splint"; + version = "1.0.1.4"; + sha256 = "1s7m43y4m074wk73scakb7ynf8na0fx1bnggj8v4l59bxa5mqsmm"; + libraryHaskellDepends = [ base containers ghc hlint stm ]; + description = "HLint as a GHC source plugin"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "split" = callPackage @@ -246567,8 +249492,7 @@ self: { ]; description = "Containers for STM"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "stm-delay" = callPackage @@ -246638,8 +249562,6 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "stm-incremental" = callPackage @@ -247751,6 +250673,18 @@ self: { broken = true; }) {}; + "streaming-nonempty" = callPackage + ({ mkDerivation, base, hspec, streaming }: + mkDerivation { + pname = "streaming-nonempty"; + version = "0.1.0.0"; + sha256 = "0ykw92p2v8v0dlq68733wyh211dh7cd8s3iirnkbnabm0vyc20y6"; + libraryHaskellDepends = [ base streaming ]; + testHaskellDepends = [ base hspec streaming ]; + description = "Add support for non empty streams to Streaming lib"; + license = lib.licenses.bsd3; + }) {}; + "streaming-osm" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , resourcet, streaming, streaming-attoparsec, streaming-bytestring @@ -248998,6 +251932,8 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stripe-tests" = callPackage @@ -250440,6 +253376,8 @@ self: { ]; description = "Integration to use sv with cassava's parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sv-core" = callPackage @@ -250467,6 +253405,8 @@ self: { ]; description = "Encode and decode separated values (CSV, PSV, ...)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sv-svfactor" = callPackage @@ -250979,6 +253919,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "switch" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, GPipe, GPipe-GLFW + , hidapi, linear + }: + mkDerivation { + pname = "switch"; + version = "0.1.0.0"; + sha256 = "169dvy7vqbjza24456azdmjb8yyrkr18z04azwhkl08b9wx9wvz5"; + libraryHaskellDepends = [ attoparsec base bytestring hidapi ]; + testHaskellDepends = [ + attoparsec base bytestring GPipe GPipe-GLFW hidapi linear + ]; + description = "Nintendo Switch Controller Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sws" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, hourglass @@ -252439,6 +255397,18 @@ self: { license = lib.licenses.mit; }) {}; + "system-info_0_5_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "system-info"; + version = "0.5.2"; + sha256 = "0k1mc0axh3iwy3d7svxl31b629c9s482bq7mshhs6glh9pv6cg74"; + libraryHaskellDepends = [ base ]; + description = "Get the name of the operating system"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "system-inotify" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -253976,8 +256946,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "taskpool" = callPackage @@ -254007,8 +256975,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "3"; - editedCabalFile = "1dma42d3fkiqphya8ksqy55nbyqk45hm65rrnj2y5sn2my5vncq9"; + revision = "4"; + editedCabalFile = "1rwlyw01i07xryhja4h7jadlj5rdznmb1jwl74qllkrhrvqjfmrg"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid @@ -254110,19 +257078,19 @@ self: { ({ mkDerivation, base, containers, deepseq, tasty }: mkDerivation { pname = "tasty-bench"; - version = "0.2.2"; - sha256 = "0x6kg8n778nysv3b7j31bnh62h5srid35nhmvr76bzba4qdgx258"; + version = "0.2.3"; + sha256 = "16273rxlvjh960mdlhkpggx8rbza1n18fxl9m9yi8dhkli4g0w6a"; libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; }) {}; - "tasty-bench_0_2_3" = callPackage + "tasty-bench_0_2_5" = callPackage ({ mkDerivation, base, containers, deepseq, tasty }: mkDerivation { pname = "tasty-bench"; - version = "0.2.3"; - sha256 = "16273rxlvjh960mdlhkpggx8rbza1n18fxl9m9yi8dhkli4g0w6a"; + version = "0.2.5"; + sha256 = "146i1vkp9008hik7qyi8m9qq3ij5kji84qscsf598rzjmjga7igd"; libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; @@ -254256,6 +257224,8 @@ self: { testHaskellDepends = [ aeson base tasty tasty-hunit ]; description = "Grade your tasty-testsuite"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tasty-groundhog-converters" = callPackage @@ -254758,6 +257728,8 @@ self: { libraryHaskellDepends = [ base tasty ]; description = "Test vector support for tasty"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tasty-th" = callPackage @@ -255627,12 +258599,12 @@ self: { broken = true; }) {}; - "template-haskell_2_16_0_0" = callPackage + "template-haskell_2_17_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.16.0.0"; - sha256 = "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g"; + version = "2.17.0.0"; + sha256 = "0m9siwzxh11ny75sgcnfha8h1vcsc1mbn0jvqsal9sbskwss7bab"; libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; license = lib.licenses.bsd3; @@ -257180,8 +260152,8 @@ self: { }: mkDerivation { pname = "testcontainers"; - version = "0.3.0.0"; - sha256 = "0iibmfb5ps7i9d35pwj22a8dxn6b31hmdzswcdmbhdbkq06534hj"; + version = "0.3.0.1"; + sha256 = "01qqinmjy6mvfnszq2br459xfcx9jg5ycs0dfmpqg3wxfi826kx6"; libraryHaskellDepends = [ aeson aeson-optics base bytestring exceptions mtl network optics-core process resourcet tasty text unliftio-core @@ -257526,6 +260498,28 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_6_2" = callPackage + ({ mkDerivation, base, bytestring, criterion, deferred-folds + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.6.2"; + sha256 = "1cj6k27w9zm0g5wjfwyiwjljnqs9lz0zhw52nd0p7f1mhb9r80dw"; + libraryHaskellDepends = [ + base bytestring deferred-folds text transformers + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "An efficient strict text builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -259138,6 +262132,28 @@ self: { license = lib.licenses.mit; }) {}; + "th-utilities_0_2_4_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, primitive, syb, template-haskell, text, th-abstraction + , th-orphans, vector + }: + mkDerivation { + pname = "th-utilities"; + version = "0.2.4.2"; + sha256 = "09rbs878gjhyg8n789p2c67lzxr4h1pg0zar47a7j8sg6ff5wcx2"; + libraryHaskellDepends = [ + base bytestring containers directory filepath primitive syb + template-haskell text th-abstraction th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec primitive syb + template-haskell text th-abstraction th-orphans vector + ]; + description = "Collection of useful functions for use with Template Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "thank-you-stars" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, hackage-db, hspec, req, split, text @@ -262480,8 +265496,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "2.1.1.0"; - sha256 = "0ysixw2ab0m2gmh7aqn2qhrc5gb6habjdif7f2bf7a1n29rih8x6"; + version = "2.2.0.0"; + sha256 = "031k750856m34q80ppnbb17qm6c64lal9dqn976g7265zmc9cdr7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263096,8 +266112,8 @@ self: { }: mkDerivation { pname = "tracing"; - version = "0.0.5.2"; - sha256 = "0h0ga56pikym7igqzbb4lm1qnjnfzn533z0mx7jz3hjpgflk8xxs"; + version = "0.0.6.0"; + sha256 = "0f92jh3pfd67pfy2yn26k05n2xy8iyshds9mq4hvwf0jq1kk9h6d"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive containers http-client mtl network random stm text time transformers unliftio @@ -263107,6 +266123,8 @@ self: { ]; description = "Distributed tracing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tracing-control" = callPackage @@ -263130,6 +266148,8 @@ self: { ]; description = "Distributed tracing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tracked-files" = callPackage @@ -265142,6 +268162,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "0.4.0.0"; + sha256 = "07b5vw7wxgxcsr04h4nx28bmv9a10hkdzhhssvka050hxhiyjmgv"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -265185,17 +268222,17 @@ self: { "ttn-client" = callPackage ({ mkDerivation, async, base, base64-bytestring, binary, bytestring - , cayene-lpp, config-ini, directory, filepath, net-mqtt + , cayenne-lpp, config-ini, directory, filepath, net-mqtt , network-uri, stm, text, time, ttn }: mkDerivation { pname = "ttn-client"; - version = "0.2.0.0"; - sha256 = "1rvnn57hr2yqj383rknnnpy4k073r8i8cjx6fg4xb1ywwk9v3i86"; + version = "0.2.2.0"; + sha256 = "0gylp37nspknysv5583bxbcida7dw47lrd7pb6857jad418yryxr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring binary bytestring cayene-lpp + async base base64-bytestring binary bytestring cayenne-lpp config-ini directory filepath net-mqtt network-uri stm text ttn ]; executableHaskellDepends = [ base text time ttn ]; @@ -265580,6 +268617,8 @@ self: { pname = "turtle"; version = "1.5.21"; sha256 = "0sb1xnmvqby1lcg3p92v0nkpxnm2qk0gcn41mxxgp3xdm24vkz36"; + revision = "1"; + editedCabalFile = "0qh20z5gzbi3an78z7p338xdz61sbpffy0w0crx7fpwa95dlkf0m"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -265592,6 +268631,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "turtle_1_5_22" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , stm, streaming-commons, system-fileio, system-filepath, temporary + , text, time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.22"; + sha256 = "14lf43b5rxci6p9sy1gkb715m4b1s4rl65swn2qpdqv3h2yvpi4s"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process stm streaming-commons system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -267471,6 +270534,21 @@ self: { broken = true; }) {}; + "typenums_0_1_4" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, QuickCheck }: + mkDerivation { + pname = "typenums"; + version = "0.1.4"; + sha256 = "16bfn4s8q4w2f8a2c9l93b0yhj9qahccp9fs29rcj9q8873xaz6l"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Type level numbers using existing Nat functionality"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "typeof" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -268215,6 +271293,8 @@ self: { ]; description = "Minimal HTTP client library optimized for benchmarking"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ui-command" = callPackage @@ -268861,6 +271941,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "unicode-general-category" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , file-embed, hspec, QuickCheck, text + }: + mkDerivation { + pname = "unicode-general-category"; + version = "0.1.0.0"; + sha256 = "06qxihfgsh75xnij20qpvnr53mz3pd5r8myx0fpsfrg0jn0ldiya"; + libraryHaskellDepends = [ + array base binary bytestring containers file-embed text + ]; + testHaskellDepends = [ + base bytestring containers hspec QuickCheck + ]; + description = "Unicode General Category Database"; + license = lib.licenses.bsd3; + }) {}; + "unicode-names" = callPackage ({ mkDerivation, array, base, containers, unicode-properties }: mkDerivation { @@ -269691,8 +272789,6 @@ self: { libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-some" = callPackage @@ -270749,6 +273845,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Hoon-style atom manipulation and printing functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ureader" = callPackage @@ -273233,15 +276331,14 @@ self: { }) {}; "vector-builder" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck - , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit - , tasty-quickcheck, vector + ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "vector-builder"; - version = "0.3.8"; - sha256 = "0ww0l52p8s6gmh985adnjbvm1vrqpqbm08qdcrvxwhhcqmxgv6m3"; - libraryHaskellDepends = [ base base-prelude semigroups vector ]; + version = "0.3.8.1"; + sha256 = "1fd0zwycp7aprj5q1c7na97a7wqivyr2fmy8ms16fh4wln62x50y"; + libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ attoparsec QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck @@ -273298,8 +276395,6 @@ self: { testHaskellDepends = [ base doctest hedgehog hedgehog-classes ]; description = "circular vectors"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vector-clock" = callPackage @@ -274347,6 +277442,29 @@ self: { license = lib.licenses.mit; }) {}; + "vinyl_0_13_1" = callPackage + ({ mkDerivation, aeson, array, base, criterion, deepseq, doctest + , ghc-prim, hspec, lens, lens-aeson, linear, microlens, mtl + , mwc-random, primitive, should-not-typecheck, singletons, tagged + , text, unordered-containers, vector + }: + mkDerivation { + pname = "vinyl"; + version = "0.13.1"; + sha256 = "1aip3v1jnxmx44bkshxkmd1iixml65987b4sbh4gncm6q7brkn0k"; + libraryHaskellDepends = [ array base deepseq ghc-prim ]; + testHaskellDepends = [ + aeson base doctest hspec lens lens-aeson microlens mtl + should-not-typecheck singletons text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion linear microlens mwc-random primitive tagged vector + ]; + description = "Extensible Records"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vinyl-generics" = callPackage ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core , QuickCheck, records-sop, text, vinyl @@ -275100,8 +278218,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.10"; - sha256 = "10bdm8rxak8kdiiqnjl5yw3n14zjr5gj1m9bpiiz0cabf72x54xx"; + version = "3.10.1"; + sha256 = "0lk4l65qvq1b3dz9fkz981zgm2m9nx38ylccnsxcgxns2s2zx9b3"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -277268,6 +280386,8 @@ self: { ]; description = "A parser for the Web Archive (WARC) format"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "warp" = callPackage @@ -277646,6 +280766,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "weak" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "weak"; + version = "0"; + sha256 = "0400riqrhzgmc2jfwppjknmkynmamwfid7q3k7q9k43s9s175yng"; + libraryHaskellDepends = [ base ]; + description = "Weak pointer extas"; + license = "(BSD-2-Clause OR Apache-2.0)"; + }) {}; + "weak-bag" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -278556,6 +281687,8 @@ self: { ]; description = "webfont generator"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "webkit" = callPackage @@ -278661,6 +281794,8 @@ self: { ]; description = "Types and functions for working with Webmentions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "webp" = callPackage @@ -279393,6 +282528,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "wikicfp-scraper_0_1_0_12" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec + , hspec-discover, scalpel-core, text, time + }: + mkDerivation { + pname = "wikicfp-scraper"; + version = "0.1.0.12"; + sha256 = "03l8ggnnkq7gx5qf9rrng50wb5cabyam8vrs2bnrm02gcgjx89sx"; + libraryHaskellDepends = [ + attoparsec base bytestring scalpel-core text time + ]; + testHaskellDepends = [ base bytestring filepath hspec time ]; + testToolDepends = [ hspec-discover ]; + description = "Scrape WikiCFP web site"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -279432,14 +282585,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "wild-bind_0_1_2_7" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, microlens + , QuickCheck, semigroups, stm, text, transformers + }: + mkDerivation { + pname = "wild-bind"; + version = "0.1.2.7"; + sha256 = "1vp88124shp9f79wfrdkp964pfmyzhsg3j718bkqrpgw5wbnwds0"; + libraryHaskellDepends = [ + base containers semigroups text transformers + ]; + testHaskellDepends = [ + base hspec microlens QuickCheck stm transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Dynamic key binding framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wild-bind-indicator" = callPackage ({ mkDerivation, async, base, containers, gi-gdk, gi-glib, gi-gtk , text, transformers, wild-bind }: mkDerivation { pname = "wild-bind-indicator"; - version = "1.0.0.0"; - sha256 = "1irb8njd076vwz2676v0fa56agsszcs9ra5pbzlyxbb69kg2fgq3"; + version = "1.0.0.1"; + sha256 = "0r9850zk2gmx492palbam6nl5ym9ml5lpgx0c1jyvpbn3caqgxas"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers gi-gdk gi-glib gi-gtk text transformers @@ -279457,8 +282630,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.2.0.2"; - sha256 = "1hxsykbzw3z3vhzpi2z4b6gxvbr91s0jkxq9jc47xzx6ar0x7jq0"; + version = "0.2.0.3"; + sha256 = "1agrwh4sgajyqs655p5ppz2vamp6xf5h5sckqb83zzjvn8i293dk"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -279488,6 +282661,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_12" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec + , hspec-discover, mtl, semigroups, stm, text, time, transformers + , wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.12"; + sha256 = "1zpb448pj586xvh0l9qp08hvbjw1lphxwzi4srnghmsbnfnkvhh6"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + testToolDepends = [ hspec-discover ]; + description = "X11-specific implementation for WildBind"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { @@ -280456,6 +283651,8 @@ self: { ]; description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "words" = callPackage @@ -284935,8 +288132,8 @@ self: { }: mkDerivation { pname = "yarn-lock"; - version = "0.6.2"; - sha256 = "06wha8cm7hw83d32fq5r8mpzh5pwmf67dxsw8qxqw26qy8pnby96"; + version = "0.6.4"; + sha256 = "0vab0k1z2b8j18d5bqiraa4zpxr9rqg2s52y28j3qk292lmpmni9"; libraryHaskellDepends = [ base containers either megaparsec protolude text ]; @@ -285483,6 +288680,35 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth_1_6_10_2" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.10.2"; + sha256 = "16c4rddfmpw1smk7zayflwp1xy3avrqcr0cv6qx4aq949zpn6lz8"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -286608,6 +289834,26 @@ self: { broken = true; }) {}; + "yesod-markdown_0_12_6_8" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , directory, hspec, pandoc, persistent, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-markdown"; + version = "0.12.6.8"; + sha256 = "1jlnci0wkfg04qvad7qx19321s8jf2rskjghirwcqy1abg3bf96p"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring directory pandoc persistent + shakespeare text xss-sanitize yesod-core yesod-form + ]; + testHaskellDepends = [ base blaze-html hspec text ]; + description = "Tools for using markdown in a yesod application"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-media-simple" = callPackage ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core , diagrams-lib, directory, JuicyPixels, vector, yesod @@ -286651,8 +289897,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.4"; - sha256 = "1zckyjg3k8xi6lx1xgyh50d6v7hydv12c1j36w48xy296nsjwvv9"; + version = "2.0.0.5"; + sha256 = "0jz5dhmvfggbyjkcxs7v4pc4jpcd759jfv77avzwr64xx2glk1yw"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core @@ -286760,6 +290006,28 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_6" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.6"; + sha256 = "169bwdnaxw926yr5wbcgf7n6v914sgv2vw6ywc95b5xpm0i0dyph"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -288555,8 +291823,8 @@ self: { ({ mkDerivation, base, c2hs, zbar }: mkDerivation { pname = "zbar"; - version = "0.1.1.0"; - sha256 = "03d81yxqf15q0ryynni55pww0z5v313yg0nb00r8zlibn96mjf5z"; + version = "0.2.0.0"; + sha256 = "1h9s6ydazviz4fcmhpsr6srcbkgx2dmx29lhzxjysnmkbvg4gpw9"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ zbar ]; libraryToolDepends = [ c2hs ]; @@ -288612,6 +291880,40 @@ self: { license = lib.licenses.mit; }) {}; + "zenacy-html_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, dlist, extra, HUnit, mtl, pretty-show + , raw-strings-qq, safe, safe-exceptions, test-framework + , test-framework-hunit, text, transformers, vector, word8 + }: + mkDerivation { + pname = "zenacy-html"; + version = "2.0.3"; + sha256 = "1lbgl2g921prcgl0pk5c8mzfy7ssnnrk7d4rz047xhgb3x0381nc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default dlist extra mtl pretty-show + safe safe-exceptions text transformers vector word8 + ]; + executableHaskellDepends = [ + base bytestring containers data-default dlist extra pretty-show + text vector + ]; + testHaskellDepends = [ + base bytestring containers data-default dlist extra HUnit mtl + pretty-show raw-strings-qq test-framework test-framework-hunit text + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default dlist pretty-show + raw-strings-qq text + ]; + description = "A standard compliant HTML parsing library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "zenacy-unicode" = callPackage ({ mkDerivation, base, bytestring, HUnit, test-framework , test-framework-hunit, text, vector, word8 @@ -288628,6 +291930,23 @@ self: { license = lib.licenses.mit; }) {}; + "zenacy-unicode_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, HUnit, test-framework + , test-framework-hunit, text, vector, word8 + }: + mkDerivation { + pname = "zenacy-unicode"; + version = "1.0.1"; + sha256 = "1l03zr1j6h1h15rnz6mk731g5ib1h3x59b3aqm30i0kd2h28g0vw"; + libraryHaskellDepends = [ base bytestring vector word8 ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + description = "Unicode utilities for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "zenc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -288705,8 +292024,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.13.0.0"; - sha256 = "0baljnskj5vrw9vwkwddrqchqvk7i5dxr4d5aj7qvl73brchjx7c"; + version = "0.16.0.0"; + sha256 = "10sy0s2k20ampqpql6ifpb8y5sdrrc23zpssh0cxs6rp144gcdg4"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -289738,6 +293057,21 @@ self: { broken = true; }) {}; + "zoovisitor" = callPackage + ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: + mkDerivation { + pname = "zoovisitor"; + version = "0.1.1.0"; + sha256 = "16y2j12zl8arwv2m0crllrrf09l4ar1s2v9wrfzjmxnk80vhncf1"; + libraryHaskellDepends = [ base Z-Data Z-IO ]; + librarySystemDepends = [ zookeeper_mt ]; + testHaskellDepends = [ base hspec ]; + description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) zookeeper_mt;}; + "zot" = callPackage ({ mkDerivation, base, monads-tf }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/gitit-pandoc-2.12.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/gitit-pandoc-2.12.patch new file mode 100644 index 0000000000..da8e27d2b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/gitit-pandoc-2.12.patch @@ -0,0 +1,65 @@ +commit a03d3b043458f45d29ba32068a77c0d3b8a4223f +Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> +Date: Fri Apr 2 15:14:02 2021 +0200 + + Allow compilation with pandoc 2.12 and 2.13 + + pandoc 2.13 introduced the following breakages for gitit: + + * UTF8.readFile now returns a Text which is actually ideal for gitit. + If pandoc is new enough we just make readFileUTF8 an alias for + UTF8.readFile. + + * Text.Pandoc.Shared no longer exports substitute. In order to be + conservative I've chosen to just copy the substitute function from + pandoc 2.11.4. I need this patch kind of urgently so I didn't want to + make any changes or refactors independently from upstream if + avoidable. However, I'd be happy to rebase this PR branch to adopt a + different solution to just copying the function. + +diff --git a/src/Network/Gitit/Authentication.hs b/src/Network/Gitit/Authentication.hs +index 4c240e7..c0f92fd 100644 +--- a/src/Network/Gitit/Authentication.hs ++++ b/src/Network/Gitit/Authentication.hs +@@ -44,7 +44,7 @@ import System.Exit + import System.Log.Logger (logM, Priority(..)) + import Data.Char (isAlphaNum, isAlpha) + import qualified Data.Map as M +-import Text.Pandoc.Shared (substitute) ++import Data.List (stripPrefix) + import Data.Maybe (isJust, fromJust, isNothing, fromMaybe) + import Network.URL (exportURL, add_param, importURL) + import Network.BSD (getHostName) +@@ -54,6 +54,16 @@ import Codec.Binary.UTF8.String (encodeString) + import Data.ByteString.UTF8 (toString) + import Network.Gitit.Rpxnow as R + ++-- | Replace each occurrence of one sublist in a list with another. ++-- Vendored in from pandoc 2.11.4 as 2.12 removed this function. ++substitute :: (Eq a) => [a] -> [a] -> [a] -> [a] ++substitute _ _ [] = [] ++substitute [] _ xs = xs ++substitute target replacement lst@(x:xs) = ++ case stripPrefix target lst of ++ Just lst' -> replacement ++ substitute target replacement lst' ++ Nothing -> x : substitute target replacement xs ++ + data ValidationType = Register + | ResetPassword + deriving (Show,Read) +diff --git a/src/Network/Gitit/Util.hs b/src/Network/Gitit/Util.hs +index c5e9fe5..067130a 100644 +--- a/src/Network/Gitit/Util.hs ++++ b/src/Network/Gitit/Util.hs +@@ -45,7 +45,11 @@ import Network.URL (encString) + + -- | Read file as UTF-8 string. Encode filename as UTF-8. + readFileUTF8 :: FilePath -> IO Text ++#if MIN_VERSION_pandoc(2,12,0) ++readFileUTF8 = UTF8.readFile ++#else + readFileUTF8 = fmap T.pack . UTF8.readFile ++#endif + + -- | Perform a function a directory and return to working directory. + inDir :: FilePath -> IO a -> IO a diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 43b8fb4c6c..8fee25b104 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.2.10"; + version = "0.3.1"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1c7f0z1hi0vcfz532r3fhr4c64jjqppf94idpa1jziz1dljkwk85"; + sha256 = "0ar2ry07axgrmdb6nsc0786v1a1nwlyvapgxncaaympvn38qk8qf"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0j6k3vmdljf3bjmj5dywhxjmxcs1axscc8dlnw94g5rwf9bin0dn"; + sha256 = "1fapkyq7fcgydy8sls6jzxagfkhgxhwp1rdvjqxdmqk4d82jwrh2"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index 5fb180201b..685d58f110 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.10.5" +, version ? "2.12.2" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; @@ -11,24 +11,24 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.10.5"; + version = "2.12.2"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "1vb2m25w6v901id9syan9q69fa60sxxd7qpyzq21fn5dpah0g99i"; + sha256 = "0h6mpy0kfc842vhg053fyxbjnd8lw1d1shdcsj800048260lxhyd"; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1mb6m3vxjya1dz47mdna23c2015n3bz8dvz8fwggq6k3zp0a4dsh"; + sha256 = "1gg210gf4yif3bl9k19znkndc4c1cd529xwxpi20ykaw3zfxxz2z"; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "10g4qrwvmabrdg4i8y0wq9g7whqcpkdfp05yilflg70ybplrscf7"; + sha256 = "1wngxba71j20gq9vy7n8q0m9rnqs047xm5b03bxk3hhaq6dyzkwn"; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0js83wy496swcwia144fhxk872irb5nr6i8558hxabkdrpv1bky5"; + sha256 = "0rqsmzl5g5kgk54qb03kamjm5n5g5pqfl79np37xdzwqbv0zx22b"; }; } }: diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index adeafa80e6..f905612d02 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -27,7 +27,10 @@ , sha256 , passthruFun , static ? false -, enableOptimizations ? (!stdenv.isDarwin) +, stripBytecode ? reproducibleBuild +, rebuildBytecode ? true +, reproducibleBuild ? true +, enableOptimizations ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -36,12 +39,26 @@ assert x11Support -> tcl != null && xlibsWrapper != null && libX11 != null; +assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) + "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; + +assert lib.assertMsg (reproducibleBuild -> stripBytecode) + "Deterministic builds require stripping bytecode."; + +assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) + "Deterministic builds are not achieved when optimizations are enabled."; + + with lib; let buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; + pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then + "$out/bin/python" + else pythonForBuild.interpreter; + passthru = passthruFun rec { inherit self sourceVersion packageOverrides; implementation = "cpython"; @@ -272,14 +289,15 @@ in with passthru; stdenv.mkDerivation ({ # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f - '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) - '' - # Determinism: rebuild all bytecode - # We exclude lib2to3 because that's Python 2 code which fails - # We rebuild three times, once for each optimization level - find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - + '' + optionalString stripBytecode '' + # Determinism: deterministic bytecode + # First we delete all old bytecode. + find $out -name "*.pyc" -delete + '' + optionalString rebuildBytecode '' + # Then, we build for the two optimization levels. + # We do not build unoptimized bytecode, because its not entirely deterministic yet. + find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + optionalString stdenv.hostPlatform.isCygwin '' cp libpython2.7.dll.a $out/lib ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index fdf022213c..38ee086a88 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -3,7 +3,8 @@ , expat , libffi , gdbm -, lzma +, xz +, mime-types ? null, mimetypesSupport ? true , ncurses , openssl , readline @@ -11,6 +12,7 @@ , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false , bluez ? null, bluezSupport ? false , zlib +, tzdata ? null , self , configd , autoreconfHook @@ -33,12 +35,11 @@ , stripTests ? false , stripTkinter ? false , rebuildBytecode ? true -, stripBytecode ? false +, stripBytecode ? reproducibleBuild , includeSiteCustomize ? true , static ? stdenv.hostPlatform.isStatic -# Not using optimizations on Darwin -# configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found. -, enableOptimizations ? (!stdenv.isDarwin) +, enableOptimizations ? false +, reproducibleBuild ? true , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -54,12 +55,25 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; +assert mimetypesSupport -> mime-types != null; + +assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) + "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; + +assert lib.assertMsg (reproducibleBuild -> stripBytecode) + "Deterministic builds require stripping bytecode."; + +assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) + "Deterministic builds are not achieved when optimizations are enabled."; + with lib; let buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; + tzdataSupport = tzdata != null && passthru.pythonAtLeast "3.9"; + passthru = passthruFun rec { inherit self sourceVersion packageOverrides; implementation = "cpython"; @@ -89,10 +103,11 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] - ++ optionals stdenv.isDarwin [ configd ]); + ++ optionals stdenv.isDarwin [ configd ]) + ++ optionals tzdataSupport [ tzdata ]; # `zoneinfo` module hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -175,6 +190,9 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + ] ++ optionals mimetypesSupport [ + # Make the mimetypes module refer to the right file + ./mimetypes.patch ] ++ optionals (isPy35 || isPy36) [ # Determinism: Write null timestamps when compiling python files. ./3.5/force_bytecode_determinism.patch @@ -235,6 +253,9 @@ in with passthru; stdenv.mkDerivation { postPatch = '' substituteInPlace Lib/subprocess.py \ --replace "'/bin/sh'" "'${bash}/bin/sh'" + '' + optionalString mimetypesSupport '' + substituteInPlace Lib/mimetypes.py \ + --replace "@mime-types@" "${mime-types}" '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -285,6 +306,8 @@ in with passthru; stdenv.mkDerivation { # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. "ac_cv_func_lchmod=no" + ] ++ optionals tzdataSupport [ + "--with-tzpath=${tzdata}/share/zoneinfo" ] ++ optional static "LDFLAGS=-static"; preConfigure = '' @@ -304,7 +327,14 @@ in with passthru; stdenv.mkDerivation { setupHook = python-setup-hook sitePackages; - postInstall = '' + postInstall = let + # References *not* to nuke from (sys)config files + keep-references = concatMapStringsSep " " (val: "-e ${val}") ([ + (placeholder "out") + ] ++ optionals tzdataSupport [ + tzdata + ]); + in '' # needed for some packages, especially packages that backport functionality # to 2.x from 3.x for item in $out/lib/${libPrefix}/test/*; do @@ -340,8 +370,8 @@ in with passthru; stdenv.mkDerivation { done # Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668 - find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + - find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + + find $out/lib/python*/config-* -type f -print -exec nuke-refs ${keep-references} '{}' + + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs ${keep-references} '{}' + # Make the sysconfigdata module accessible on PYTHONPATH # This allows build Python to import host Python's sysconfigdata @@ -360,18 +390,19 @@ in with passthru; stdenv.mkDerivation { '' + optionalString includeSiteCustomize '' # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py - '' + optionalString rebuildBytecode '' - # Determinism: rebuild all bytecode - # We exclude lib2to3 because that's Python 2 code which fails - # We rebuild three times, once for each optimization level + '' + optionalString stripBytecode '' + # Determinism: deterministic bytecode + # First we delete all old bytecode. + find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" + '' + optionalString rebuildBytecode '' + # Then, we build for the two optimization levels. + # We do not build unoptimized bytecode, because its not entirely deterministic yet. # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. - # This is automatically used when `SOURCE_DATE_EPOCH` is set. - find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - + # compileall uses this checked-hash method by default when `SOURCE_DATE_EPOCH` is set. + # We exclude lib2to3 because that's Python 2 code which fails find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - - '' + optionalString stripBytecode '' - find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" ''; preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/mimetypes.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/mimetypes.patch new file mode 100644 index 0000000000..4ea700a1f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/mimetypes.patch @@ -0,0 +1,23 @@ +diff --git i/Lib/mimetypes.py w/Lib/mimetypes.py +index f3343c8..ab5b886 100644 +--- i/Lib/mimetypes.py ++++ w/Lib/mimetypes.py +@@ -40,16 +40,8 @@ + ] + + knownfiles = [ +- "/etc/mime.types", +- "/etc/httpd/mime.types", # Mac OS X +- "/etc/httpd/conf/mime.types", # Apache +- "/etc/apache/mime.types", # Apache 1 +- "/etc/apache2/mime.types", # Apache 2 +- "/usr/local/etc/httpd/conf/mime.types", +- "/usr/local/lib/netscape/mime.types", +- "/usr/local/etc/httpd/conf/mime.types", # Apache 1.2 +- "/usr/local/etc/mime.types", # Apache 1.3 +- ] ++ "@mime-types@/etc/mime.types", ++] + + inited = False + _db = None diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 2a4ffeb421..39e27ec994 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -108,6 +108,19 @@ with pkgs; python = self; }; }; + + sources = { + "python38" = { + sourceVersion = { + major = "3"; + minor = "8"; + patch = "8"; + suffix = ""; + }; + sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw="; + }; + }; + in { python27 = callPackage ./cpython/2.7 { @@ -149,18 +162,11 @@ in { inherit passthruFun; }; - python38 = callPackage ./cpython { + python38 = callPackage ./cpython ({ self = python38; - sourceVersion = { - major = "3"; - minor = "8"; - patch = "8"; - suffix = ""; - }; - sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw="; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python38); python39 = callPackage ./cpython { self = python39; @@ -189,8 +195,9 @@ in { }; # Minimal versions of Python (built without optional dependencies) - python3Minimal = (python38.override { + python3Minimal = (callPackage ./cpython ({ self = python3Minimal; + inherit passthruFun; pythonAttr = "python3Minimal"; # strip down that python version as much as possible openssl = null; @@ -199,6 +206,7 @@ in { gdbm = null; sqlite = null; configd = null; + tzdata = null; stripConfig = true; stripIdlelib = true; stripTests = true; @@ -207,7 +215,8 @@ in { stripBytecode = true; includeSiteCustomize = false; enableOptimizations = false; - }).overrideAttrs(old: { + mimetypesSupport = false; + } // sources.python38)).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { maintainers = []; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index b4e9343b5d..a5ba4983e4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, self, gdbm, db, lzma +, self, gdbm, db, xz , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) @@ -53,7 +53,7 @@ in with passthru; stdenv.mkDerivation rec { buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ - lzma + xz ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ stdenv.cc.libc ] ++ optionals zlibSupport [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 8263a987d6..19eed817ec 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Package management framework for Ruby"; homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; - maintainers = with maintainers; [ qyliss zimbatm ]; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index 91e13ed32c..8077177d8b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix @@ -8,25 +8,32 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "0.17.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = version; - sha256 = "05g4h0xkqd14wnmijiiwmhk6l909fjxr6a2zplrjfxk5bypdalpm"; + sha256 = "0ciia8hhkkyh6rmrxgbk3bgwjwzkcba6645wlcm0vlgk2w4i5m3z"; fetchSubmodules = true; }; - cargoSha256 = "1ssmgx9fjvkq7ycyzjanqmlm5b80akllq6qyv3mj0k5fvs659wcq"; + cargoSha256 = "08r2b4s005w8r207jwq2fd43y3prgd8pg1m72aww1r7yrbxdr0v2"; nativeBuildInputs = [ cmake pkg-config ]; - # Since wasmer 0.17 no backends are enabled by default. Backends are now detected - # 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 = [ + # cranelift+jit works everywhere, see: + # https://github.com/wasmerio/wasmer/blob/master/Makefile#L22 + "--features" "cranelift,jit" + # must target manifest and desired output bin, otherwise output is empty + "--manifest-path" "lib/cli/Cargo.toml" + "--bin" "wasmer" + ]; + + cargoTestFlags = [ + "--features" "test-cranelift,test-jit" + ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix index 2161ad9e59..e0b1f05516 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "acl-2.2.53"; + name = "acl-2.3.0"; src = fetchurl { url = "mirror://savannah/acl/${name}.tar.gz"; - sha256 = "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6"; + sha256 = "sha256-vTj9u7A8eTdK9RRn6+VJfLwDNbgld/MMlRpBqVtTMAk="; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix index 4bd5de8bd4..fd20a0d9a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages, nixosTests }: mkDerivation rec { pname = "standard-library"; @@ -19,6 +19,7 @@ mkDerivation rec { rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda ''; + passthru.tests = { inherit (nixosTests) agda; }; meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/raul/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/raul/default.nix index a0089e3104..b1a8288c5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/raul/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ boost gtk2 python ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; + buildInputs = [ boost gtk2 ]; + + strictDeps = true; meta = with lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix index 464e79f6c2..bc8dc70f9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.4"; + version = "0.6.8"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; + sha256 = "sha256-Ossysa3Forf6za3i4IGLzWxx8j+EoevBeBW7eg0tAt8="; }; nativeBuildInputs = [ pkg-config wafHook python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix index 56008ae8dd..1c978a18f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom +{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom , wafHook , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ gtk2 lv2 python serd sord sratom ] + nativeBuildInputs = [ pkg-config wafHook python3 ]; + buildInputs = [ gtk2 lv2 serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); dontWrapQtApps = true; + strictDeps = 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/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index dc585217ce..5a9bbd5a49 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.34"; + version = "4.5.1"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; + sha256 = "1mm3v01jz2mp8vajsl45s23gw90zafbgg3br5n5yz03aan08f395"; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix index 5ce7ad477b..36af06dfc5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.34"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; + sha256 = "14hkgwr2a9zw44v1s8xscqxa2mwin06jsxpwb3hflh9mp16ymfzv"; }; buildInputs = [ bctoolbox belr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 8f0a116f1a..0f8a61bed2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.34"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"; + sha256 = "0d1wf0jv9lb0s6r49i9gz5nrx8jzpkx558hywll7idma9d0mr61p"; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix index acd2393f75..252ac3e80e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.4.34"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"; + sha256 = "0m0s7g8d25nbnafbl76w9v3x7q4jhsypxmz1gg80pj7j34xc2dsd"; }; buildInputs = [ bctoolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index f29295bb13..b698cf7b40 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.34"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6"; + sha256 = "1a500ncgznwha0j3c27ak3p4jh5jm6fnnb531k7c0a4i91745agj"; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix index fef22dea06..d59f4acd8d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , flex -, yacc +, bison , xmlto , docbook_xsl , docbook_xml_dtd_44 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex - yacc + bison swig xmlto docbook_xml_dtd_44 diff --git a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix index 267c7df945..3121741ca0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfA0y/tT64C/7NjBff4HEzIfhZ3piFBkQjX5xVbFXFc="; + sha256 = "sha256-BcDqrOotqRPMnzvfjzbeCf8gT3yQzKihywKrpah1D7w="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index b1a6401284..6e97c61a6a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext +{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, fetchpatch }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = - [ openssl db gettext kerberos ] + [ openssl db gettext libkrb5 ] ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isLinux pam; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index a09ad0e871..d861d25e67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -99,7 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support -, lzma ? null # xz-utils +, xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -381,7 +381,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (lzma != null) "lzma") + (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") @@ -431,7 +431,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 99a0847039..82f1a8bf56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers + libvorbis xz soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 13a33f68d2..018ffd68fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -13,7 +13,7 @@ , xmlto , appstream-glib , substituteAll -, yacc +, bison , xdg-dbus-proxy , p11-kit , bubblewrap @@ -35,7 +35,7 @@ , fuse , nixosTests , libsoup -, lzma +, xz , zstd , ostree , polkit @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { pkg-config xmlto appstream-glib - yacc + bison wrapGAppsNoGuiHook ]; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { libcap libseccomp libsoup - lzma + xz zstd polkit python3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index 063678cbcc..212b656add 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -8,7 +8,7 @@ , gflags , libiberty , lz4 -, lzma +, xz , zlib , jemalloc , openssl @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { libiberty openssl lz4 - lzma + xz zlib jemalloc libunwind diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix index 76c92dd9a3..70ae3b2b12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl +, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] - ++ (with pythonPackages; [ python numpy wrapPython ]) + ++ (with python2Packages; [ python numpy wrapPython ]) ++ lib.optional stdenv.isDarwin libiconv ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix deleted file mode 100644 index 47be58c505..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl -, libpng }: - -stdenv.mkDerivation rec { - pname = "gdal"; - version = "1.11.5"; - - src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; - sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ]; - - patches = [ - # This ensures that the python package is installed into gdal's prefix, - # rather than trying to install into python's prefix. - ./python.patch - ]; - - hardeningDisable = [ "format" "fortify" ]; - - # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. - # Unset CC and CXX as they confuse libtool. - preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; - - configureFlags = [ - "--with-jpeg=${libjpeg.dev}" - "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) - "--with-libpng=${libpng.dev}" # optional - "--with-libz=${zlib.dev}" # optional - - "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql57.connector-c}/bin/mysql_config" - "--with-geotiff=${libgeotiff.dev}" - "--with-python" # optional - "--with-static-proj4=${proj}" # optional - "--with-geos=${geos}/bin/geos-config"# optional - ]; - - # Allow use of old proj_api.h - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; - - # Prevent this: - # - # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ - # /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass - # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files - # error: bad install directory or PYTHONPATH - preBuild = '' - pythonInstallDir=$out/lib/${python.libPrefix}/site-packages - mkdir -p $pythonInstallDir - export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir - ''; - - enableParallelBuilding = true; - - meta = { - description = "Translator library for raster geospatial data formats"; - homepage = "https://www.gdal.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.marcweber ]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/python.patch b/third_party/nixpkgs/pkgs/development/libraries/gdal/python.patch deleted file mode 100644 index 50504c62ed..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/python.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/swig/python/GNUmakefile.old b/swig/python/GNUmakefile -index b4d5e90..2160b83 100644 ---- a/swig/python/GNUmakefile -+++ b/swig/python/GNUmakefile -@@ -67,11 +67,7 @@ egg: - - install: - --ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install --else - $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --endif - - for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done - - diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index b18ce099dc..ce64bef95a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.4"; + version = "2.66.8"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ="; + sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs="; }; patches = optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch b/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch index 1cb5a73035..f98af04a7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch @@ -1,12 +1,14 @@ +diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c +index 1282c10a1..feadfe3aa 100644 --- a/gio/gsettingsschema.c +++ b/gio/gsettingsschema.c -@@ -352,6 +352,9 @@ +@@ -360,6 +360,9 @@ initialise_schema_sources (void) try_prepend_data_dir (g_get_user_data_dir ()); -+ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL) ++ if (!is_setuid && (path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL) + try_prepend_dir (path); + - if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) - try_prepend_dir (path); - + /* Disallow loading extra schemas if running as setuid, as that could + * allow reading privileged files. */ + if (!is_setuid && (path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz index 36aaf51cce..bd99c36d74 100644 Binary files a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz and b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz differ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index 8bf7830073..b3862cc5c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-37"; + patchSuffix = "-39"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -63,7 +63,7 @@ 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-37-g760e1d2878 + glibc-2.32-39-g44b3959329 $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz */ ./2.32-master.patch.gz diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index 19567a9872..a9abfbd177 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }: stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.64.2"; + version = "2.64.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; + sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ + meson pkg-config + ninja gnum4 glib # for glib-compile-schemas ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index 824d5c3831..ab71b2ccf9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -22,7 +22,7 @@ , docbook_xml_dtd_412 , gnome3 , gcr -, kerberos +, libkrb5 , gvfs , dbus , wrapGAppsHook @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gvfs # OwnCloud, Google Drive icu json-glib - kerberos + libkrb5 librest libsecret libsoup diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix index 245b0c1e63..7b3b4561ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -2,7 +2,7 @@ , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake -, yacc, texinfo +, bison, texinfo # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -55,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp - autogen gperftools gperf gettext automake yacc texinfo ] + autogen gperftools gperf gettext automake bison texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 57acec4860..e97630871a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.15"; + version = "3.7.1"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -23,8 +23,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"; + url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz"; + sha256 = "0vxcbig87sdc73h58pmcpbi4al1zgcxid1jn67mhcpna7sbdfxrp"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -45,9 +45,7 @@ stdenv.mkDerivation { # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 # Change p11-kit test to use pkg-config to find p11-kit - postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' - sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' -i tests/cert-tests/name-constraints - '' + lib.optionalString (lib.versionAtLeast version "3.6") '' + postPatch = lib.optionalString (lib.versionAtLeast version "3.6") '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh diff --git a/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix index 182f05a8ca..1f7097dc4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grib-api/default.nix @@ -1,6 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, cmake, netcdf, gfortran, libpng, openjpeg, - enablePython ? false, pythonPackages }: + enablePython ? false, pythonPackages ? null }: stdenv.mkDerivation rec { pname = "grib-api"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix index 9b6562b989..fc2edc1871 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libidn, kerberos }: +{ fetchurl, lib, stdenv, libidn, libkrb5 }: stdenv.mkDerivation rec { name = "gsasl-1.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; - buildInputs = [ libidn kerberos ]; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index f9d739a43e..d1e478ded2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.24"; + version = "3.24.27"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc"; + sha256 = "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p"; }; patches = [ @@ -188,6 +188,8 @@ stdenv.mkDerivation rec { moveToOutput bin/gtk-update-icon-cache "$out" # Launcher moveToOutput bin/gtk-launch "$out" + # Broadway daemon + moveToOutput bin/broadwayd "$out" # TODO: patch glib directly for f in $dev/bin/gtk-encode-symbolic-svg; do @@ -226,7 +228,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 4a31acd2ff..950e1a976a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.2"; + version = "3.24.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd"; + sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja python3 ]; buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix index fe3463eeff..d6465d71c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -20,36 +19,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.2.0"; + version = "1.2.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x"; + sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E="; }; - patches = [ - # Nix’s pkg-config ignores Requires.private - # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d - # We are essentialy reverting the following patch for now - # https://bugzilla.gnome.org/show_bug.cgi?id=685477 - # at least until Requires.internal or something is implemented - # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7 - ./fix-requires.patch - - # fix deadlock in gupnp-igd tests - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch"; - sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f"; - }) - # fix breakage in gupnp-igd tests - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch"; - sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch b/third_party/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch deleted file mode 100644 index ffe9b68fd0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libgupnp/meson.build -+++ b/libgupnp/meson.build -@@ -110,6 +110,7 @@ pkg.generate( - libraries : libgupnp, - subdirs: 'gupnp-1.2', - name : 'gupnp-1.2', -+ requires: requires, - description : 'GObject-based UPnP library', - version : meson.project_version(), - filebase : 'gupnp-1.2' ---- a/meson.build -+++ a/meson.build -@@ -18,6 +18,13 @@ add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c') - - guul = subproject('guul', default_options : ['default_library=static']) - -+requires = [ -+ dependency('glib-2.0', version : '>= 2.44'), -+ dependency('gssdp-1.2', version : '>= 1.1'), -+ dependency('libsoup-2.4', version : '>= 2.48.0'), -+ dependency('libxml-2.0') -+] -+ - dependencies = [ - dependency('glib-2.0', version : '>= 2.44'), - dependency('gio-2.0', version : '>= 2.44'), diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 3f31a3f6db..d228752627 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.4"; + version = "2.8.0"; 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 = "sha256-uMkniDNBQ2mxDmeM7K/YQtZ3Avh9RVXYe7XsUErGas8="; + sha256 = "sha256-JnvOFGK2HWIpzuwgZtyt0IfKfnoXD1LMeVb3RzMmyY4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix index da29c0e07e..73d1eea988 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "hpx"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hwloc gperftools ]; - nativeBuildInputs = [ cmake pkg-config python ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; + + strictDeps = true; meta = { description = "C++ standard library for concurrency and parallelism"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 28138f103b..fa100f3460 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.4.1"; + version = "21.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6"; + sha256 = "0cdyrfyn05fadva8k02kp4nk14k274xfmhzwc0v7jijm1dw8v8rf"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index e9d389bfc1..c60b00552b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.1.2"; + version = "21.1.3"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "17g9xilcrpmkn6higgpvd9bly1h61xxyp1kx9zwl6rgzs2pryby2"; + sha256 = "1y6y6dia2y3b798f668q26pzwb1xai5d5jpmllpcxs9qikhkkx8p"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix index 6d770430ce..75ace8097c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2"; - sha256 = "17nnyx07q8vbyqsxbvp4m5s2nrc4fxl3dvgbgmkqww2wl4x1fv9y"; + sha256 = "sha256-Ivd5538QpTFXP2r6ca/g12IZ0ZW1nduu0z4kiSb9Mxs="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix index ca5e773a45..4395f3cd0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, extra-cmake-modules, python }: +{ mkDerivation, lib, extra-cmake-modules, python3 }: mkDerivation { name = "kapidox"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules python ]; + nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ]; postFixup = '' moveToOutput bin $bin ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix index a5f499e674..7a9ea86bbb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - bzip2, lzma, qtbase, zlib, + bzip2, xz, qtbase, zlib, }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ bzip2 lzma zlib ]; + buildInputs = [ bzip2 xz zlib ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index 3e81b45362..b9d9705203 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, yacc, flex +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, bison, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config python3 perl yacc flex texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ] ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index 5ef9e496b9..ebec5936b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds +{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config perl ] - ++ optional (!libOnly) yacc + ++ optional (!libOnly) bison # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix index 65dce915f1..c88dde7e44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm -, withPython ? false, python }: +, withPython ? false, python ? null }: stdenv.mkDerivation { pname = "kmsxx"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libdrm python ]; + buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ]; meta = with lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = licenses.mpl20; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; + broken = true; # marked broken 2021-03-26 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix index ba035eed05..961760753a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0pxxb3sn9lignkf80kndd84shxqk9m2qwimz62gzb6khd4bvajqk"; + sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix index c3934db5b3..c291c07aba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, bison, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libgpgerror ]; - nativeBuildInputs = [ yacc flex ]; + nativeBuildInputs = [ bison flex ]; meta = with lib; { homepage = "https://www.videolan.org/developers/libaacs.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix new file mode 100644 index 0000000000..15047f6e8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libbtbb/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libbtbb"; + version = "2020-12-R1"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = pname; + rev = version; + sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Bluetooth baseband decoding library"; + homepage = "https://github.com/greatscottgadgets/libbtbb"; + license = licenses.gpl2; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix index 99692f63d4..d0fc8c3c4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -4,7 +4,7 @@ , cmake , blas # Check Inputs -, python +, python3 }: stdenv.mkDerivation rec { @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue ]; + strictDeps = true; + doCheck = true; - checkInputs = [ python.pkgs.numpy ]; + checkInputs = [ python3.pkgs.numpy ]; meta = with lib; { description = "General GTO integrals for quantum chemistry"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix index a6334bf999..7be5f8b400 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }: let llvm = llvmPackages.llvm; @@ -16,8 +16,9 @@ stdenv.mkDerivation { sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7"; }; - nativeBuildInputs = [ python ]; - buildInputs = [ llvm clang clang-unwrapped ]; + nativeBuildInputs = [ python3 llvm ]; + + strictDeps = true; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py @@ -25,7 +26,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - ${python.interpreter} ./configure.py --prefix=$out + ${python3.interpreter} ./configure.py --prefix=$out ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix new file mode 100644 index 0000000000..3fa6835396 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchgit, libfprint-tod }: +stdenv.mkDerivation { + pname = "libfprint-2-tod1-goodix"; + version = "0.0.6"; + + src = fetchgit { + url = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix"; + rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4"; # droped-lp1880058 on 20202-11-25 + sha256 = "sha256-Uv+Rr4V31DyaZFOj79Lpyfl3G6zVWShh20roI0AvMPU="; + }; + + buildPhase = '' + patchelf \ + --set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \ + usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so + + ldd usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so + ''; + + installPhase = '' + mkdir -p "$out/usr/lib/libfprint-2/tod-1/" + mkdir -p "$out/usr/lib/udev/rules.d/" + + cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so "$out/usr/lib/libfprint-2/tod-1/" + cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/usr/lib/udev/rules.d/" + ''; + + meta = with lib; { + description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; + homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix new file mode 100644 index 0000000000..8d7df57896 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix @@ -0,0 +1,40 @@ +{ lib +, libfprint +, fetchFromGitLab +}: + +# for the curious, "tod" means "Touch OEM Drivers" meaning it can load +# external .so's. +libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let + version = "1.90.7+git20210222+tod1"; +in { + pname = "libfprint-tod"; + inherit version; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "3v1n0"; + repo = "libfprint"; + rev = "v${version}"; + sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; + }; + + mesonFlags = mesonFlags ++ [ + "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" + ]; + + + postPatch = '' + ${postPatch} + patchShebangs ./tests/*.py ./tests/*.sh + ''; + + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint"; + description = "A library designed to make it easy to add support for consumer fingerprint readers, with support for loaded drivers"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ grahamc ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix index ae599a9752..30c9e294ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix @@ -1,47 +1,73 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse -, cppSupport ? true, boost ? null -, pythonSupport ? true, python3 ? null, swig ? null -, docSupport ? true, doxygen ? null +{ lib +, stdenv +, fetchgit +, cmake +, pkg-config +, libusb1 +, libconfuse +, cppSupport ? true +, boost +, pythonSupport ? true +, python3 +, swig +, docSupport ? true +, doxygen +, graphviz }: -assert cppSupport -> boost != null; -assert pythonSupport -> python3 != null && swig != null; -assert docSupport -> doxygen != null; - +let + inherit (lib) optionals optionalString; + onOff = a: if a then "ON" else "OFF"; +in stdenv.mkDerivation rec { - name = "libftdi1-1.4"; + pname = "libftdi"; + version = "1.5"; - src = fetchurl { - url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; + src = fetchgit { + url = "git://developer.intra2net.com/libftdi"; + rev = "v${version}"; + sha256 = "0vipg3y0kbbzjhxky6hfyxy42mpqhvwn1r010zr5givcfp8ghq26"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = with lib; [ libconfuse ] - ++ optionals cppSupport [ boost ] - ++ optionals pythonSupport [ python3 swig ] - ++ optionals docSupport [ doxygen ]; + nativeBuildInputs = [ cmake pkg-config ] + ++ optionals docSupport [ doxygen graphviz ] + ++ optionals pythonSupport [ swig ]; - preBuild = lib.optionalString docSupport '' - make doc_i - ''; + buildInputs = [ libconfuse ] + ++ optionals cppSupport [ boost ] + ++ optionals pythonSupport [ python3 ]; + + cmakeFlags = [ + "-DFTDIPP=${onOff cppSupport}" + "-DBUILD_TESTS=${onOff cppSupport}" + "-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}" + "-DPYTHON_BINDINGS=${onOff pythonSupport}" + "-DDOCUMENTATION=${onOff docSupport}" + ]; propagatedBuildInputs = [ libusb1 ]; postInstall = '' mkdir -p "$out/etc/udev/rules.d/" cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/" + '' + optionalString docSupport '' cp -r doc/man "$out/share/" - '' + lib.optionalString docSupport '' - mkdir -p "$out/share/libftdi/doc/" - cp -r doc/html "$out/share/libftdi/doc/" + cp -r doc/html "$out/share/doc/libftdi1/" + ''; + + postFixup = optionalString cppSupport '' + # This gets misassigned to the C++ version's path for some reason + for fileToFix in $out/{bin/libftdi1-config,lib/pkgconfig/libftdi1.pc}; do + substituteInPlace $fileToFix \ + --replace "$out/include/libftdipp1" "$out/include/libftdi1" + done ''; meta = with lib; { description = "A library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; - license = with licenses; [ lgpl2 gpl2 ]; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.bjornfor ]; + license = with licenses; [ lgpl2Only gpl2Only ]; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index 233f202c2c..dfb540b0bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -2,17 +2,23 @@ stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.6.3"; + version = "0.7"; src = fetchFromGitHub { owner = "pantoniou"; repo = pname; rev = "v${version}"; - sha256 = "1aw5s0ns79jr3lpcy3hdsrlr79rrv5aqymv4h43axvy2bi90nrr0"; + sha256 = "10w1n4zzgw33j755pkv73fxdn93kwbzg486b5m9i0bh5d76jp4ax"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + doCheck = true; + + preCheck = '' + patchShebangs test + ''; + meta = with lib; { homepage = "https://github.com/pantoniou/libfyaml"; description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgssglue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgssglue/default.nix index 678af459a3..d4bf3ff1c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgssglue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgssglue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kerberos }: +{ lib, stdenv, fetchurl, libkrb5 }: stdenv.mkDerivation rec { name = "libgssglue-0.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cat < $out/etc/gssapi_mech.conf - ${kerberos}/lib/libgssapi_krb5.so mechglue_internal_krb5_init + ${libkrb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init EOF ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinjection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinjection/default.nix index f678136637..81a1398147 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinjection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinjection/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, python +, python2 }: stdenv.mkDerivation rec { @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; }; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python2 ]; + + strictDeps = true; patchPhase = '' patchShebangs src diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix index 272c61c47a..15a677b318 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4"; + sha256 = "sha256-KhRmRoIHvpx5rV7roCnUH+a7JtPb6UqD41Wi4wHSR1c="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 2822b45f87..3ef64823a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -10,10 +10,8 @@ , cyrus_sasl , doxygen , fetchFromGitLab -, fetchurl , ffmpeg_3 , gdk-pixbuf -, git , glib , graphviz , gtk2 @@ -30,12 +28,11 @@ , makeWrapper , mbedtls , mediastreamer -, mediastreamer-openh264 , openldap , ortp , pango , pkg-config -, python +, python3 , readline , soci , speex @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.35"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +54,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8"; + sha256 = "05ybbxq2yqzy3f3vzq8c3szs3qr0zl64la53icpqnmfakwnps5gs"; }; # Do not build static libraries @@ -67,7 +64,7 @@ stdenv.mkDerivation rec { # defined when liblinphone and linphone-desktop weren't separated yet, so some # of them might not be needed for liblinphone alone. buildInputs = [ - (python.withPackages (ps: [ ps.pystache ps.six ])) + (python3.withPackages (ps: [ ps.pystache ps.six ])) bcg729 bctoolbox belcard @@ -114,6 +111,8 @@ stdenv.mkDerivation rec { pkg-config ]; + strictDeps = true; + # Some grammar files needed to be copied too from some dependencies. I suppose # if one define a dependency in such a way that its share directory is found, # then this copying would be unnecessary. Instead of actually copying these diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index d78ccbc50a..3541d3d466 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "20.09"; + version = "21.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; + sha256 = "1jm4mk539wf3crgpcddgwdixshwdzm37mkb5441lifhcz2mykdsn"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix index 66e38fbfbc..bd28f490ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -8,7 +8,7 @@ # files. let - version = "1.2.0"; + version = "1.2.1"; in stdenv.mkDerivation { pname = "libmpc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; + sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; }; buildInputs = [ gmp mpfr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix index 2ff59e055f..f36b5436d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - gmock + gtest pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 94301b34fb..98d9c3477e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -17,22 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.104.0"; - - patches = [ - (fetchpatch { - # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131 - url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch"; - sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc"; - }) - ]; + version = "3.120.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb"; + sha256 = "1vjcp703h0a8z70bqkx1fawhpyv3zl11c7rczyky8v4cmcihscgg"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix index c8e9ddb82c..cac4299f28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }: stdenv.mkDerivation rec { pname = "libplist"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index 217a83bceb..532800ddd9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2020-11-30"; + version = "unstable-2021-01-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11"; - sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7"; + rev = "4a0a19b88b43e48c6b51b526b9378289fb712a4c"; + sha256 = "0g3a1a7w717h0fwk39banzgjwphh62fx64k130w2s5885lsn5r5k"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 5fca199acb..e5123fa61a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2 -, enablePython ? false, python, swig, libxml2, ncurses +, enablePython ? false, python ? null, swig, libxml2, ncurses }: let isPython3 = enablePython && python.pythonAtLeast "3"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix index b6db462f3c..e430a44733 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - libyamlcpp, gmock }: + libyamlcpp, gtest }: stdenv.mkDerivation rec { pname = "librime"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; + buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest ]; meta = with lib; { homepage = "https://rime.im/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch deleted file mode 100644 index 2c315067f4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/spnav.c b/spnav.c -index f9e10f8..27149f7 100644 ---- a/spnav.c -+++ b/spnav.c -@@ -36,7 +36,7 @@ OF SUCH DAMAGE. - #include - #include "spnav.h" - --#define SPNAV_SOCK_PATH "/var/run/spnav.sock" -+#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock" - - #ifdef USE_X11 - #include -@@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail; - /* AF_UNIX socket used for alternative communication with daemon */ - static int sock = -1; - -+static char *spath = NULL; -+ -+static char *socket_path() -+{ -+ char *xdg_runtime_dir; -+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { -+ if ( spath == NULL ) { -+ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1); -+ if ( spath != NULL ) { -+ sprintf(spath, sizeof(spath), "%s/spnav.sock", xdg_runtime_dir); -+ } -+ } -+ if(access(spath, F_OK)){ -+ return spath; -+ } -+ } -+ return DEFAULT_SPNAV_SOCK_PATH; -+} - - int spnav_open(void) - { -@@ -92,7 +110,7 @@ int spnav_open(void) - - memset(&addr, 0, sizeof addr); - addr.sun_family = AF_UNIX; -- strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path)); -+ strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path)); - - - if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix index 9bd0a67041..fb2a2744d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix @@ -13,12 +13,6 @@ stdenv.mkDerivation rec { 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 = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix index 6eb013a7ff..2488a5bbb0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix @@ -7,7 +7,7 @@ , libticonv , libtifiles2 , libticables2 -, lzma +, xz , bzip2 , acl , libobjc @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libticonv libtifiles2 libticables2 - lzma + xz bzip2 ] ++ lib.optionals stdenv.isLinux [ acl diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ad3a47f99c..d17303bbb0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.1"; + version = "2.0.3"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c"; + sha256 = "0c5g2chylhkwwssfab9gw0b7bm3raj08yzgia7j4d044lp8gflnd"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix index c11d698079..c8ad0e7e60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr -, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postInstall = let - binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 0ec0b0693a..ea4b40c3c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , makeWrapper, autoreconfHook, fetchpatch , coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils -, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, iproute2, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { postInstall = let # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) - binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; + binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 70dd9cb7bb..d6e8b3958e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, bison, doxygen , xkeyboard_config, libxcb, libxml2 , python3 , libX11 @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852"; + sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21"; }; patches = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] + nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] ++ lib.optional withWaylandSupport wayland; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index cf5f6e320c..9f374c22c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, bison, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ yacc flex xkeyboard_config libxcb ]; + buildInputs = [ bison flex xkeyboard_config libxcb ]; configureFlags = [ "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix index 2d19ca4b22..1c7aa8c54b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.38"; + version = "0.4.39"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"; + sha256 = "1rwaxmid9iv65n0y6xlcyxxydsvihjni9ldxpg6pbqz43amp49xx"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix index b9ca940561..741f05bea6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.4.34"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; + sha256 = "1fsldk7gxagxkbkzksz6dz8a8dmix1lxfy8nvvp0m355pzgqj6lb"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "End-to-end encryption library for instant messaging"; homepage = "http://www.linphone.org/technical-corner/lime"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 38a9b78b6d..2e25399d97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -4,7 +4,7 @@ , cmake , ninja , perl # Project uses Perl for scripting and testing -, python +, python3 , enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading }: @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf"; }; - nativeBuildInputs = [ cmake ninja perl python ]; + nativeBuildInputs = [ cmake ninja perl python3 ]; + + strictDeps = true; postConfigure = lib.optionals enableThreading '' perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer diff --git a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index ad770046d3..aaa31b29e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -4,11 +4,11 @@ , cmake , doxygen , fetchFromGitLab -, fetchpatch , ffmpeg_3 , glew , gsm , intltool +, lib , libGL , libGLU , libX11 @@ -24,16 +24,16 @@ , libvpx , ortp , pkg-config -, python +, python3 , SDL , speex , srtp -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.35"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g"; + sha256 = "0aqma9834lzy1593qb9qwmzvzn50y6fzhmmg493jznf8977b0gsw"; }; patches = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doxygen intltool pkg-config - python + python3 ]; propagatedBuildInputs = [ @@ -87,6 +87,8 @@ stdenv.mkDerivation rec { srtp ]; + strictDeps = true; + # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; @@ -102,7 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix new file mode 100644 index 0000000000..373f232a98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "mustache"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "kainjow"; + repo = "Mustache"; + rev = "v${version}"; + sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/include + cp ../mustache.hpp $out/include + ''; + + meta = with lib; { + description = "Mustache text templates for modern C++"; + homepage = "https://github.com/kainjow/Mustache"; + license = licenses.boost; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix index 7c0c6476bd..3eec9c97ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl }: -callPackage ./generic.nix (args // rec { - version = "3.6"; +callPackage ./generic.nix rec { + version = "3.7.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j"; + sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald"; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix index 735fe37353..348faf56b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nettle/generic.nix @@ -2,9 +2,9 @@ # Version specific args , version, src -, ...}: +}: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "nettle-${version}"; inherit src; @@ -16,7 +16,14 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; - configureFlags = [ "--enable-fat" ]; # runtime selection of HW-accelerated code + configureFlags = + # runtime selection of HW-accelerated code; it's default since 3.7 + [ "--enable-fat" ] + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + ++ lib.optional stdenv.isSunOS "--with-include-path=${gmp.dev}/include"; doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin); @@ -53,18 +60,9 @@ stdenv.mkDerivation ({ license = licenses.gpl2Plus; - homepage = "http://www.lysator.liu.se/~nisse/nettle/"; + homepage = "https://www.lysator.liu.se/~nisse/nettle/"; platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; } - -// - -lib.optionalAttrs stdenv.isSunOS { - # Make sure the right is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # - # for details. - configureFlags = [ "--with-include-path=${gmp.dev}/include" ]; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 7421353453..41a967a5b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs="; }; + patches = [ + # https://github.com/nlohmann/json/pull/2690 + (fetchpatch { + url = "https://github.com/nlohmann/json/commit/53a9850eebb88c6ff95f6042d08d5c0cc9d18097.patch"; + sha256 = "k+Og00nXNg5IsFQY5fWD3xVQQXUFFTie44UXole0S1M="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index c7b8339e71..93da285e82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/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.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-8nXzsY4+XnhKbuYyDWehiWqQEWoEcDBF4KagOg1WlN8="; + sha256 = "sha256-xByu0HWeyDg5WV/zVO4HO/uwZ2RPrud0FlZHPfFom1E="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index 44a0e017a2..39831a3baf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.4.57"; + version = "2.4.58"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - sha256 = "sha256-x7pH4ebstbQ289Qygd9Xq+/6mSYhQa7IImKLwiD2tFo="; + sha256 = "sha256-V7WSVL4V0L9qmrPVFMHAV3ewISMpFTMTSofJRGj49Hs="; }; # TODO: separate "out" and "bin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 49ac795416..fda0c71655 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -3,8 +3,17 @@ , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic +# Used to avoid cross compiling perl, for example, in darwin bootstrap tools. +# This will cause c_rehash to refer to perl via the environment, but otherwise +# will produce a perfectly functional openssl binary and library. +, withPerl ? true }: +assert ( + lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) + "withPerl should not be disabled unless cross compiling" +); + # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as @@ -46,7 +55,10 @@ let separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; - buildInputs = lib.optional withCryptodev cryptodev; + buildInputs = lib.optional withCryptodev cryptodev + # perl is included to allow the interpreter path fixup hook to set the + # correct interpreter in c_rehash. + ++ lib.optional withPerl perl; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -108,12 +120,20 @@ let rm "$out/lib/"*.a fi - '' + - '' mkdir -p $bin '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + # Fix bin/c_rehash's perl interpreter line + # + # - openssl 1_0_2: embeds a reference to buildPackages.perl + # - openssl 1_1: emits "#!/usr/bin/env perl" + # + # In the case of openssl_1_0_2, reset the invalid reference and let the + # interpreter hook take care of it. + # + # In both cases, if withPerl = false, the intepreter line is expected be + # "#!/usr/bin/env perl" '' - substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} + substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl" '' + '' mv $out/bin $bin/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix index e760868524..af924ad80d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.34"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"; + sha256 = "1lc1j7wvkyp5lhcflq3h5y7n8aiwgwj84ffm81ggbsmavamgwkk7"; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index 6851100321..0369cedebf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,57 +1,91 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz -, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf -, meson, ninja, glib +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, cairo +, harfbuzz +, libintl +, libthai +, gobject-introspection +, darwin +, fribidi +, gnome3 +, gi-docgen +, makeFontsConf +, freefont_ttf +, meson +, ninja +, glib , x11Support? !stdenv.isDarwin, libXft }: -with lib; - -let +stdenv.mkDerivation rec { pname = "pango"; - version = "1.47.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.48.3"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"; }; - # FIXME: docs fail on darwin - outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; + patches = [ + # Install developer documentation. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch"; + sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ="; + }) + ]; nativeBuildInputs = [ meson ninja glib # for glib-mkenum - pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + pkg-config + gobject-introspection + gi-docgen ]; + buildInputs = [ fribidi libthai - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++ - optional x11Support libXft; - mesonFlags = [ - "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" - ] ++ lib.optionals stdenv.isDarwin [ - "-Dxft=disabled" # only works with x11 + propagatedBuildInputs = [ + cairo + glib + libintl + harfbuzz + ] ++ lib.optionals x11Support [ + libXft ]; - enableParallelBuilding = true; + mesonFlags = [ + "-Dgtk_doc=true" + ] ++ lib.optionals (!x11Support) [ + "-Dxft=disabled" # only works with x11 + ]; # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - doCheck = false; # /layout/valid-1.markup: FAIL + doCheck = false; # test-font: FAIL + + postInstall = '' + # So that devhelp can find this. + # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 + mkdir -p "$devdoc/share/devhelp" + mv "$out/share/doc/pango/reference" "$devdoc/share/devhelp/books" + rmdir -p --ignore-fail-on-non-empty "$out/share/doc/pango" + ''; passthru = { updateScript = gnome3.updateScript { @@ -73,7 +107,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.pango.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix index 0ff0d9a7d4..3eb5f39c38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3 , ApplicationServices }: stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.1"; + version= "2.42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; + sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 955a4d9da6..d685bde35e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -75,6 +75,11 @@ let ./0070-installed-tests-path.patch # Add flag to specify configuration directory (different from the installation directory). ./0080-pipewire-config-dir.patch + # Fix JSON parser. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff"; + sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj"; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix index bb8debbce9..b7adc3d2a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -3,7 +3,7 @@ } : let - version = "3.2.2"; + version = "3.2.3"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "1rf82z7h76366qknkmralmslsfmihv0r3ymhbgk1axq97ic3g4d7"; + sha256 = "sha256-w3j4zgEAn6RxIHAvy0B3MPFTV46ocCvc0Z36tN1T+rc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix index 393ef2c2c3..92c143f241 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/popt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "popt"; - version = "1.16"; + version = "1.18"; src = fetchurl { url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz"; - sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; + sha256 = "1lf5zlj5rbg6s4bww7hbhpca97prgprnarx978vcwa0bl81vqnai"; }; patches = lib.optionals stdenv.isCygwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index f31a7868d5..6867940d1f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, buildPackages +, autoreconfHook, zlib, gtest, buildPackages , version, sha256 , ... }: @@ -20,8 +20,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { postPatch = '' rm -rf gmock - cp -r ${gmock.src}/googlemock gmock - cp -r ${gmock.src}/googletest googletest + cp -r ${gtest.src}/googlemock gmock + cp -r ${gtest.src}/googletest googletest chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix index 1c06020653..de62bde187 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.1"; + version = "1.14.4"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE="; + sha256 = "sha256-4VuTbcEjr9Ffrowb3eOtXFU8zPNu1NXS531EOZpI07A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix index c461824e62..e00694958f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.2.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "sha256-KiO2iIrLLjPhHTiR/FKEGRJOhdVV2kcZK9sdyCqONC8="; + sha256 = "sha256-iZUJjr9e+d90XA8YEFFwyRR0HjgPgBi6V5gIpVQMcV8="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index c32f4b001e..f969254b59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -203,7 +203,9 @@ let qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix { + inherit (srcs.qtwebengine) version; + }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index f994c7ef6c..cd3fa58330 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -17,6 +17,7 @@ , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null , lib, stdenv, fetchpatch +, version ? null , qtCompatVersion }: @@ -230,6 +231,9 @@ qtModule { [Paths] Prefix = .. EOF + '' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") '' + # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3) + sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/cfitsio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/cfitsio/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix index b34abfd95c..27ac86ddba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -6,4 +6,5 @@ buildEnv { indilib ] ++ extraDrivers; + inherit (indilib) meta; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnova/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libnova/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix new file mode 100644 index 0000000000..b16ba1117f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, flex }: + +stdenv.mkDerivation rec { + pname = "wcslib"; + version = "7.5"; + + src = fetchurl { + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; + sha256 = "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw"; + }; + + buildInputs = [ flex ]; + + prePatch = '' + substituteInPlace GNUmakefile --replace 2775 0775 + substituteInPlace C/GNUmakefile --replace 2775 0775 + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; + description = "World Coordinate System library for astronomy"; + longDescription = '' + Library for world coordinate systems for spherical geometries + and their conversion to image coordinate systems. This is the + standard library for this purpose in astronomy. + ''; + maintainers = with maintainers; [ hjones2199 ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index cb3a543ad2..3233a29449 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: +{ lib, stdenv, fetchurl, zlib, bzip2, xz, curl, perl }: stdenv.mkDerivation rec { pname = "htslib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # perl is only used during the check phase. nativeBuildInputs = [ perl ]; - buildInputs = [ zlib bzip2 lzma curl ]; + buildInputs = [ zlib bzip2 xz curl ]; configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index bd7b739bd7..23a82f483d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -42,6 +42,14 @@ let USE_OPENMP = true; }; + aarch64-darwin = { + BINARY = 64; + TARGET = setTarget "VORTEX"; + DYNAMIC_ARCH = true; + USE_OPENMP = false; + MACOSX_DEPLOYMENT_TARGET = "11.0"; + }; + aarch64-linux = { BINARY = 64; TARGET = setTarget "ARMV8"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index f0c82e7190..e053d5bcf3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.8.1"; + version = "5.9.0"; outputs = [ "out" "dev" "doc" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c"; + sha256 = "sha256-tvwpSVgZrfYZHXHN8OQF0Y/aJM03JHGPFok7hUqPE/4="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: - # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368 + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.9.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" "LAPACK=-llapack" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix index 641a5120e8..b122a3121e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.4"; + version = "0.30.10"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c"; + sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8="; }; nativeBuildInputs = [ pkg-config python3 wafHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix index 5b603e6a0c..2549704c1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos +{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5 , pkg-config, libiconv }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) libkrb5; patches = [ ./scons.patch ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" '' + lib.optionalString (!stdenv.isCygwin) '' - sconsFlags+=" GSSAPI=${kerberos.dev}" + sconsFlags+=" GSSAPI=${libkrb5.dev}" ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index f0b68845ed..efa007da90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-e9Y5QEs9xqfJpaWxnA6iFwHE6TTGyVM7hfFuMEmpW78="; + sha256 = "sha256-L/a/vTthh7XkiwuvlGk9q+uLEBf8vaPoV1x1fG44zeg="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix index b24b0b9bcd..b956967ee8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 -, openldap, mysql, libmysqlclient, postgresql }: +, openldap, mariadb, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ gnustep.stdenv.mkDerivation rec { nativeBuildInputs = [ gnustep.make ]; buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ] ++ optional (openldap != null) openldap - ++ optionals (mysql != null) [ libmysqlclient mysql ] + ++ optionals (mariadb != null) [ libmysqlclient mariadb ] ++ optional (postgresql != null) postgresql); postPatch = '' @@ -31,7 +31,7 @@ gnustep.stdenv.mkDerivation rec { configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] ++ optional (openldap != null) "--enable-openldap" - ++ optional (mysql != null) "--enable-mysql" + ++ optional (mariadb != null) "--enable-mysql" ++ optional (postgresql != null) "--enable-postgresql"; # Yes, this is ugly. diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 0fe1ce442f..0c75bdb9dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -49,8 +49,8 @@ let in { spdlog_1 = generic { - version = "1.8.2"; - sha256 = "sha256-vYled5Z9fmxuO9193lefpFzIHAiSgvYn2iOfneLidQ8="; + version = "1.8.5"; + sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50="; }; spdlog_0 = generic { diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index bf1b8b7aa3..50b52b905a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.34.1"; + version = "3.35.2"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "129ynp0qbxrfj1ys9hdi0jk8svds0cwfzl31af7bicqp25cclfra"; + sha256 = "1bfczv5006ycwr1vw7xbq7cmys0jvfr8awmx7wi1b40zyj0yss8j"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 7e43fc7f5c..d260c4211e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.34.1"; + version = "3.35.2"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0jgzaawf6vn15qyi15b6dlq80sk2gaiwfikingldx5mhjrwj7pfx"; + sha256 = "00w7qggrdxpcrs4rfpqkjhcghi8pcx6zzjim9wlz6vsrxlr9dwva"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix index a735e14621..d81912b07c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix @@ -35,5 +35,12 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; + knownVulnerabilities = [ + "CVE-2018-1320" + "CVE-2018-11798" + "CVE-2019-0205" + "CVE-2019-0210" + "CVE-2020-13949" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix index 669dff2114..04d9280e7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config +{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "thrift"; - version = "0.13.0"; + version = "0.14.1"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "0yai9c3bdsrkkjshgim7zk0i7malwfprg00l9774dbrkh2w4ilvs"; + sha256 = "198c855mjy5byqfb941hiyq2j37baz63f0wcfy4vp8y8v4f5xnhk"; }; - patches = [ - # Fix a failing test on darwin - # https://issues.apache.org/jira/browse/THRIFT-4976 - (fetchpatch { - url = "https://github.com/apache/thrift/commit/6701dbb8e89f6550c7843e9b75b118998df471c3.diff"; - sha256 = "14rqma2b2zv3zxkkl5iv9kvyp3zihvad6fdc2gcdqv37nqnswx9d"; - }) - ]; - # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; @@ -32,6 +23,9 @@ stdenv.mkDerivation rec { preConfigure = "export PY_PREFIX=$out"; cmakeFlags = [ + "-DBUILD_JAVASCRIPT:BOOL=OFF" + "-DBUILD_NODEJS:BOOL=OFF" + # FIXME: Fails to link in static mode with undefined reference to # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" @@ -40,11 +34,32 @@ stdenv.mkDerivation rec { "-DOPENSSL_USE_STATIC_LIBS=ON" ]; + disabledTests = [ + "PythonTestSSLSocket" + ] ++ lib.optionals stdenv.isDarwin [ + # tests that hang up in the darwin sandbox + "SecurityTest" + "SecurityFromBufferTest" + "python_test" + + # tests that fail in the darwin sandbox when trying to use network + "UnitTests" + "TInterruptTest" + "TServerIntegrationTest" + "processor" + "TNonblockingServerTest" + "TNonblockingSSLServerTest" + "StressTest" + "StressTestConcurrent" + "StressTestNonBlocking" + "PythonThriftTNonblockingServer" + ]; + doCheck = !static; checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket + ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 42e6e920be..a272cf8b93 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which +, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute procps which + cmocka uthash ibm-sw-tpm2 iproute2 procps which ]; preAutoreconf = "./bootstrap"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 2ca5dd6bd9..5b4c1d195e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6"; + sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 38885048fc..1da2f34aa5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , gettext , meson , ninja @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.0.1"; + version = "3.0.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; + sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM="; }; patches = [ @@ -44,13 +43,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) - - # Fix consistency error with sqlite 3.34 - # https://gitlab.gnome.org/GNOME/tracker/merge_requests/353 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch"; - sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs="; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix index 8b2558c085..ef70f4b2c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.7"; + version = "2.3.9"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; - sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; + sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index faf74bcab4..14f41b015e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf, libiconv, fetchFromGitHub }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -79,7 +79,7 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mysql ]; + buildInputs = [ unixODBC mariadb ]; cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; @@ -157,7 +157,7 @@ ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out libkrb5 libuuid stdenv.cc.cc ]} \ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index 9f2722a9ae..a17b164445 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.62.1"; + version = "0.62.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3"; + sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix deleted file mode 100644 index c12118a99d..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, lib, stdenv, flex }: - -stdenv.mkDerivation rec { - version = "7.3.1"; - pname = "wcslib"; - - buildInputs = [ flex ]; - - src = fetchurl { - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c"; - }; - - prePatch = '' - substituteInPlace GNUmakefile --replace 2775 0775 - substituteInPlace C/GNUmakefile --replace 2775 0775 - ''; - - enableParallelBuilding = true; - - meta = { - description = "World Coordinate System Library for Astronomy"; - homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; - - longDescription = ''Library for world coordinate systems for - spherical geometries and their conversion to image coordinate - systems. This is the standard library for this purpose in - astronomy.''; - - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 28722dc8fc..84cf8d4833 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -37,6 +37,7 @@ , libGL , libGLU , libintl +, libmanette , openjpeg , enableGeoLocation ? true , geoclue2 @@ -59,7 +60,7 @@ with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.30.6"; + version = "2.32.0"; outputs = [ "out" "dev" ]; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh"; + sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx"; }; patches = optionals stdenv.isLinux [ @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { libgcrypt libidn libintl + libmanette libnotify libpthreadstubs libsecret diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index cfca33a62d..e2d049cd7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm"; + xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 6dc998cd0e..76d54ed625 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix @@ -1,23 +1,55 @@ -{ lib, stdenv, fetchurl, lzma }: +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config +, python3 +, icu +, libuuid +, xapian +, xz +, zstd +, gtest +}: stdenv.mkDerivation rec { pname = "zimlib"; - version = "1.4"; + version = "6.3.0"; - src = fetchurl { - url = "http://www.openzim.org/download/${pname}-${version}.tar.gz"; - sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq"; + src = fetchFromGitHub { + owner = "openzim"; + repo = "libzim"; + rev = version; + sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s"; }; - buildInputs = [ lzma ]; + nativeBuildInputs = [ + meson + pkg-config + ninja + python3 + ]; - enableParallelBuilding = true; + propagatedBuildInputs = [ + icu + libuuid + xapian + xz + zstd + ]; + + postPatch = '' + patchShebangs scripts + ''; + + checkInputs = [ + gtest + ]; + + doCheck = true; meta = with lib; { description = "Library for reading and writing ZIM files"; homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; - maintainers = with maintainers; [ robbinch ]; + maintainers = with maintainers; [ ajs124 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix new file mode 100644 index 0000000000..7ba07cd924 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config +, withZlibCompat ? false +}: + +stdenv.mkDerivation rec { + pname = "zlib-ng"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "zlib-ng"; + repo = "zlib-ng"; + rev = version; + sha256 = "1cl6asrav2512j7p02zcpibywjljws0m7aazvb3q2r9qiyvyswji"; + }; + + outputs = [ "out" "dev" "bin" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=/" + "-DBUILD_SHARED_LIBS=ON" + "-DINSTALL_UTILS=ON" + ] ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ]; + + meta = with lib; { + description = "zlib data compression library for the next generation systems"; + homepage = "https://github.com/zlib-ng/zlib-ng"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index 57a422a916..927254f52a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -124,9 +124,8 @@ let lispPackages = rec { }; nyxt = pkgs.lispPackages.buildLispPackage rec { baseName = "nyxt"; - version = "2020-10-23"; + version = "2021-03-27"; - buildSystems = [ "nyxt" "nyxt-ext" ]; description = "Browser"; @@ -143,59 +142,56 @@ let lispPackages = rec { }; deps = with pkgs.lispPackages; [ - alexandria - bordeaux-threads - chanl - cl-annot - cl-ansi-text - cl-containers - cl-css - cl-json - cl-markup - cl-ppcre - cl-ppcre-unicode - cl-prevalence - cl-webkit2 - closer-mop - cluffer - dbus - dexador - enchant - fset - hu_dot_dwim_dot_defclass-star - ironclad - local-time - log4cl - lparallel - mk-string-metrics - osicat - parenscript - plump - prove-asdf - quri - serapeum - sqlite - str - swank - trivia - trivial-clipboard - trivial-features - trivial-package-local-nicknames - trivial-types - unix-opts + alexandria + bordeaux-threads + calispel + cl-css + cl-json + cl-markup + cl-ppcre + cl-ppcre-unicode + cl-prevalence + closer-mop + cl-containers + cluffer + moptilities + dexador + enchant + file-attributes + iolib + local-time + log4cl + mk-string-metrics + osicat + parenscript + quri + serapeum + str + plump + swank + trivia + trivial-clipboard + trivial-features + trivial-package-local-nicknames + trivial-types + unix-opts + cl-html-diff + hu_dot_dwim_dot_defclass-star + cl-custom-hash-table + fset + cl-cffi-gtk + cl-webkit2 ]; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "f744af5233b3636460ce71650de2b0c7dcb9fa8e"; - sha256 = "1m4jic7nbm2jmxlm8k0zqg62z91g2f2s86by086brgfw056idjmz"; - # date = 2020-10-23T19:06:04+02:00; + rev = "8ef171fd1eb62d168defe4a2d7115393230314d1"; + sha256 = "sha256:1dz55mdmj68kmllih7ab70nmp0mwzqp9lh3im7kcjfmc1r64irdv"; + # date = 2021-03-27T09:10:00+00:00; }; packageName = "nyxt"; - asdFilesToKeep = [ "nyxt.asd" "nyxt-ext.asd" ]; - propagatedBuildInputs = [ pkgs.libressl.out pkgs.webkitgtk diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix index aa9c3dc892..4fb5488b7a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''_3bmd-ext-code-blocks''; - version = ''3bmd-20201220-git''; + baseName = "_3bmd-ext-code-blocks"; + version = "3bmd-20201220-git"; - description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma''; + description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma"; deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz''; - sha256 = ''0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71''; + url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz"; + sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71"; }; packageName = "3bmd-ext-code-blocks"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index 101d7768df..8d8299a703 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''_3bmd''; - version = ''20201220-git''; + baseName = "_3bmd"; + version = "20201220-git"; - description = ''markdown processor in CL using esrap parser.''; + description = "markdown processor in CL using esrap parser."; deps = [ args."alexandria" args."esrap" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz''; - sha256 = ''0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71''; + url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz"; + sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71"; }; packageName = "3bmd"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix index 17d7f7d7d0..755d12b968 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''access''; - version = ''20210124-git''; + baseName = "access"; + version = "20210124-git"; parasites = [ "access-test" ]; - description = ''A library providing functions that unify data-structure access for Common Lisp: - access and (setf access)''; + description = "A library providing functions that unify data-structure access for Common Lisp: + access and (setf access)"; deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/access/2021-01-24/access-20210124-git.tgz''; - sha256 = ''1n4j15v1ikspchcbb0bn15kk3lh78f6bxk56cs4arimm8bisyqlq''; + url = "http://beta.quicklisp.org/archive/access/2021-01-24/access-20210124-git.tgz"; + sha256 = "1n4j15v1ikspchcbb0bn15kk3lh78f6bxk56cs4arimm8bisyqlq"; }; packageName = "access"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix index f93506505a..a4b7f1cd14 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''acclimation''; - version = ''20200925-git''; + baseName = "acclimation"; + version = "20200925-git"; - description = ''Library supporting internationalization''; + description = "Library supporting internationalization"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz''; - sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw''; + url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz"; + sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw"; }; packageName = "acclimation"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 7f257bc4ba..f58416bffe 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''alexandria''; - version = ''20200925-git''; + baseName = "alexandria"; + version = "20200925-git"; - description = ''Alexandria is a collection of portable public domain utilities.''; + description = "Alexandria is a collection of portable public domain utilities."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz''; - sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl''; + url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz"; + sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl"; }; packageName = "alexandria"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index d62800f2e8..2a7018d535 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''anaphora''; - version = ''20210124-git''; + baseName = "anaphora"; + version = "20210124-git"; parasites = [ "anaphora/test" ]; - description = ''The Anaphoric Macro Package from Hell''; + description = "The Anaphoric Macro Package from Hell"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/anaphora/2021-01-24/anaphora-20210124-git.tgz''; - sha256 = ''0b4xwrnv007sfcqkxkarrbf99v3md8h199z1z69r4vx7r5pq2i4v''; + url = "http://beta.quicklisp.org/archive/anaphora/2021-01-24/anaphora-20210124-git.tgz"; + sha256 = "0b4xwrnv007sfcqkxkarrbf99v3md8h199z1z69r4vx7r5pq2i4v"; }; packageName = "anaphora"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix index 97ae196c0f..58ad0deb2a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''arnesi''; - version = ''20170403-git''; + baseName = "arnesi"; + version = "20170403-git"; parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ]; - description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit''; + description = "A bag-of-tools utilities library used to aid in implementing the bese.it toolkit"; deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz''; - sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4''; + url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; + sha256 = "01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4"; }; packageName = "arnesi"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index b65df191ad..d9c4ef608b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''array-utils''; - version = ''20201220-git''; + baseName = "array-utils"; + version = "20201220-git"; - description = ''A few utilities for working with arrays.''; + description = "A few utilities for working with arrays."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2020-12-20/array-utils-20201220-git.tgz''; - sha256 = ''11y6k8gzzcj00jyccg2k9nh6rvivcvh23z4yzjfly7adygd3n717''; + url = "http://beta.quicklisp.org/archive/array-utils/2020-12-20/array-utils-20201220-git.tgz"; + sha256 = "11y6k8gzzcj00jyccg2k9nh6rvivcvh23z4yzjfly7adygd3n717"; }; packageName = "array-utils"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix index 1a56676f03..58f810fe04 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''asdf-package-system''; - version = ''20150608-git''; + baseName = "asdf-package-system"; + version = "20150608-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz''; - sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29''; + url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; + sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29"; }; packageName = "asdf-package-system"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a..e60b893d8c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''asdf-system-connections''; - version = ''20170124-git''; + baseName = "asdf-system-connections"; + version = "20170124-git"; - description = ''Allows for ASDF system to be connected so that auto-loading may occur.''; + description = "Allows for ASDF system to be connected so that auto-loading may occur."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz''; - sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq''; + url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; + sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq"; }; packageName = "asdf-system-connections"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 5a362fc1f0..3a54403213 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''babel''; - version = ''20200925-git''; + baseName = "babel"; + version = "20200925-git"; - description = ''Babel, a charset conversion library.''; + description = "Babel, a charset conversion library."; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz''; - sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi''; + url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; + sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi"; }; packageName = "babel"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index a660882f36..a5457c46b1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''blackbird''; - version = ''20160531-git''; + baseName = "blackbird"; + version = "20160531-git"; - description = ''A promise implementation for Common Lisp.''; + description = "A promise implementation for Common Lisp."; deps = [ args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz''; - sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9''; + url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz"; + sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9"; }; packageName = "blackbird"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index cef514715e..d9947891ae 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''bordeaux-threads''; - version = ''v0.8.8''; + baseName = "bordeaux-threads"; + version = "v0.8.8"; parasites = [ "bordeaux-threads/test" ]; - description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.''; + description = "Bordeaux Threads makes writing portable multi-threaded apps simple."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz''; - sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp''; + url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz"; + sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp"; }; packageName = "bordeaux-threads"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 5d7f3f2dd1..d342871f4d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''buildnode-xhtml''; - version = ''buildnode-20170403-git''; + baseName = "buildnode-xhtml"; + version = "buildnode-20170403-git"; - description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + description = "Tool for building up an xml dom of an excel spreadsheet nicely."; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; - sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; }; packageName = "buildnode-xhtml"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 0a2e56a9c9..f8a8ca8bfb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''buildnode''; - version = ''20170403-git''; + baseName = "buildnode"; + version = "20170403-git"; parasites = [ "buildnode-test" ]; - description = ''Tool for building up an xml dom nicely.''; + description = "Tool for building up an xml dom nicely."; deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; - sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; + sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; }; packageName = "buildnode"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix index 27b43beaf2..d970f413be 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''calispel''; - version = ''20170830-git''; + baseName = "calispel"; + version = "20170830-git"; parasites = [ "calispel-test" ]; - description = ''Thread-safe message-passing channels, in the style of -the occam programming language.''; + description = "Thread-safe message-passing channels, in the style of +the occam programming language."; deps = [ args."alexandria" args."bordeaux-threads" args."eager-future2" args."jpl-queues" args."jpl-util" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz''; - sha256 = ''0qwmzmyh63jlw5bdv4wf458n1dz9k77gd5b4ix1kd6xrzx247k7i''; + url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; + sha256 = "0qwmzmyh63jlw5bdv4wf458n1dz9k77gd5b4ix1kd6xrzx247k7i"; }; packageName = "calispel"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index c90021bbee..aa4ee83e5c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''caveman''; - version = ''20200325-git''; + baseName = "caveman"; + version = "20200325-git"; - description = ''Web Application Framework for Common Lisp''; + description = "Web Application Framework for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz''; - sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py''; + url = "http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz"; + sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py"; }; packageName = "caveman"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index e4d6546e90..f65c68e0d7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cffi-grovel''; - version = ''cffi_0.23.0''; + baseName = "cffi-grovel"; + version = "cffi_0.23.0"; - description = ''The CFFI Groveller''; + description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-grovel"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index ad5ecb7acc..af7c96639d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cffi-toolchain''; - version = ''cffi_0.23.0''; + baseName = "cffi-toolchain"; + version = "cffi_0.23.0"; - description = ''The CFFI toolchain''; + description = "The CFFI toolchain"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-toolchain"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix index 49d8a74df3..ec45275045 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cffi-uffi-compat''; - version = ''cffi_0.23.0''; + baseName = "cffi-uffi-compat"; + version = "cffi_0.23.0"; - description = ''UFFI Compatibility Layer for CFFI''; + description = "UFFI Compatibility Layer for CFFI"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi-uffi-compat"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index e234301f1f..103f233fa4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cffi''; - version = ''cffi_0.23.0''; + baseName = "cffi"; + version = "cffi_0.23.0"; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; - description = ''The Common Foreign Function Interface''; + description = "The Common Foreign Function Interface"; deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; - sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; + url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz"; + sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck"; }; packageName = "cffi"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix index 6a6abcc4e2..b6940af598 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''chanl''; - version = ''20210124-git''; + baseName = "chanl"; + version = "20210124-git"; parasites = [ "chanl/examples" "chanl/tests" ]; - description = ''Communicating Sequential Process support for Common Lisp''; + description = "Communicating Sequential Process support for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz''; - sha256 = ''1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc''; + url = "http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz"; + sha256 = "1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc"; }; packageName = "chanl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c30c68e53c..b6cb67b2c3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''chipz''; - version = ''20190202-git''; + baseName = "chipz"; + version = "20190202-git"; - description = ''A library for decompressing deflate, zlib, and gzip data''; + description = "A library for decompressing deflate, zlib, and gzip data"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz''; - sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a''; + url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz"; + sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a"; }; packageName = "chipz"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 644daa8af9..6c52cc5f9f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''chunga''; - version = ''20200427-git''; + baseName = "chunga"; + version = "20200427-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz''; - sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk''; + url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz"; + sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk"; }; packageName = "chunga"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 2e387d2983..d6b31a6609 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''circular-streams''; - version = ''20161204-git''; + baseName = "circular-streams"; + version = "20161204-git"; - description = ''Circularly readable streams for Common Lisp''; + description = "Circularly readable streams for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; - sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128''; + url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; + sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128"; }; packageName = "circular-streams"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df2..01364e97ed 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-aa''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-aa"; + version = "cl-vectors-20180228-git"; - description = ''cl-aa: polygon rasterizer''; + description = "cl-aa: polygon rasterizer"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-aa"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5f93167a11..e6d317b598 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-annot''; - version = ''20150608-git''; + baseName = "cl-annot"; + version = "20150608-git"; - description = ''Python-like Annotation Syntax for Common Lisp''; + description = "Python-like Annotation Syntax for Common Lisp"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz''; - sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3''; + url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; + sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3"; }; packageName = "cl-annot"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8..d2dd93228f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-anonfun''; - version = ''20111203-git''; + baseName = "cl-anonfun"; + version = "20111203-git"; - description = ''Anonymous function helpers for Common Lisp''; + description = "Anonymous function helpers for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz''; - sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m''; + url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; + sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m"; }; packageName = "cl-anonfun"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 0343efcaae..2142081704 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-ansi-text''; - version = ''20210124-git''; + baseName = "cl-ansi-text"; + version = "20210124-git"; - description = ''ANSI control string characters, focused on color''; + description = "ANSI control string characters, focused on color"; deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2021-01-24/cl-ansi-text-20210124-git.tgz''; - sha256 = ''1l7slqk26xznfyn0zpp5l32v6xfpj4qj42h4x4ds5s1yncq306cm''; + url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-01-24/cl-ansi-text-20210124-git.tgz"; + sha256 = "1l7slqk26xznfyn0zpp5l32v6xfpj4qj42h4x4ds5s1yncq306cm"; }; packageName = "cl-ansi-text"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 29f98e805c..03e52a9ed0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-async-repl''; - version = ''cl-async-20210228-git''; + baseName = "cl-async-repl"; + version = "cl-async-20210228-git"; - description = ''REPL integration for CL-ASYNC.''; + description = "REPL integration for CL-ASYNC."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz''; - sha256 = ''08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4''; + url = "http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz"; + sha256 = "08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4"; }; packageName = "cl-async-repl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 909a5a41ed..eaef8f2bd5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-async-ssl''; - version = ''cl-async-20210228-git''; + baseName = "cl-async-ssl"; + version = "cl-async-20210228-git"; - description = ''SSL Wrapper around cl-async socket implementation.''; + description = "SSL Wrapper around cl-async socket implementation."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz''; - sha256 = ''08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4''; + url = "http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz"; + sha256 = "08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4"; }; packageName = "cl-async-ssl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index a13ffd6ec4..d6dea61e5b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-async''; - version = ''20210228-git''; + baseName = "cl-async"; + version = "20210228-git"; parasites = [ "cl-async-base" "cl-async-util" ]; - description = ''Asynchronous operations for Common Lisp.''; + description = "Asynchronous operations for Common Lisp."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz''; - sha256 = ''08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4''; + url = "http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz"; + sha256 = "08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4"; }; packageName = "cl-async"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index 15843d1c2f..9216c4d8a2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-base64''; - version = ''20201016-git''; + baseName = "cl-base64"; + version = "20201016-git"; parasites = [ "cl-base64/test" ]; - description = ''Base64 encoding and decoding with URI support.''; + description = "Base64 encoding and decoding with URI support."; deps = [ args."kmrcl" args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz''; - sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z''; + url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; + sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z"; }; packageName = "cl-base64"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix index 3bd70c5535..9a7f3e1549 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-cairo''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-cairo"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding to Cairo''; + description = "A Lisp binding to Cairo"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-cairo"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix index 70d09b9f35..52a7742e0a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gdk-pixbuf''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-gdk-pixbuf"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding to GDK Pixbuf 2''; + description = "A Lisp binding to GDK Pixbuf 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-gdk-pixbuf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix index b019f1683e..17d24dcaf1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gdk''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-gdk"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding to GDK 3''; + description = "A Lisp binding to GDK 3"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-gdk"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix index 5867ce10a0..8cfda7f850 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gio''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-gio"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding to GIO 2''; + description = "A Lisp binding to GIO 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-gio"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix index 781489cbe6..6187ba1545 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-glib''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-glib"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding to GLib 2''; + description = "A Lisp binding to GLib 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-glib"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix index 99225f97a2..8f027fc2a0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-gobject''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-gobject"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding GObject 2''; + description = "A Lisp binding GObject 2"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-gobject"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix index 44b1b10887..b4466fe7b4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk-pango''; - version = ''cl-cffi-gtk-20201220-git''; + baseName = "cl-cffi-gtk-pango"; + version = "cl-cffi-gtk-20201220-git"; - description = ''A Lisp binding to Pango''; + description = "A Lisp binding to Pango"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk-pango"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix index 05e57b829a..1daeedb326 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cffi-gtk''; - version = ''20201220-git''; + baseName = "cl-cffi-gtk"; + version = "20201220-git"; - description = ''A Lisp binding to GTK 3''; + description = "A Lisp binding to GTK 3"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz''; - sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1''; + url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; + sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; }; packageName = "cl-cffi-gtk"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix index d72d8076d3..eb96739937 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-change-case''; - version = ''20210228-git''; + baseName = "cl-change-case"; + version = "20210228-git"; parasites = [ "cl-change-case/test" ]; - description = ''Convert strings between camelCase, param-case, PascalCase and more''; + description = "Convert strings between camelCase, param-case, PascalCase and more"; deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."fiveam" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz''; - sha256 = ''15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi''; + url = "http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz"; + sha256 = "15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi"; }; packageName = "cl-change-case"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index 36641b73b7..1da195bab7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cli''; - version = ''20151218-git''; + baseName = "cl-cli"; + version = "20151218-git"; - description = ''Command line parser''; + description = "Command line parser"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz''; - sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay''; + url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; + sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay"; }; packageName = "cl-cli"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 0d0337a65c..898ec553aa 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-colors''; - version = ''20180328-git''; + baseName = "cl-colors"; + version = "20180328-git"; parasites = [ "cl-colors-tests" ]; - description = ''Simple color library for Common Lisp''; + description = "Simple color library for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz''; - sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a''; + url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; + sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a"; }; packageName = "cl-colors"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix index 519f43ff32..5a8bea30a5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-colors2''; - version = ''20200218-git''; + baseName = "cl-colors2"; + version = "20200218-git"; parasites = [ "cl-colors2/tests" ]; - description = ''Simple color library for Common Lisp''; + description = "Simple color library for Common Lisp"; deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz''; - sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29''; + url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz"; + sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29"; }; packageName = "cl-colors2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index bd0483b452..66438b129c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-containers''; - version = ''20200427-git''; + baseName = "cl-containers"; + version = "20200427-git"; parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ]; - description = ''A generic container library for Common Lisp''; + description = "A generic container library for Common Lisp"; deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz''; - sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy''; + url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; + sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy"; }; packageName = "cl-containers"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index ddc3611d50..2d0916dcff 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-cookie''; - version = ''20191007-git''; + baseName = "cl-cookie"; + version = "20191007-git"; - description = ''HTTP cookie manager''; + description = "HTTP cookie manager"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz''; - sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh''; + url = "http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz"; + sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh"; }; packageName = "cl-cookie"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix index ba295b6e43..822ecd994b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-css''; - version = ''20140914-git''; + baseName = "cl-css"; + version = "20140914-git"; - description = ''Simple inline CSS generator''; + description = "Simple inline CSS generator"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz''; - sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n''; + url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; + sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n"; }; packageName = "cl-css"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 051ffabfc5..3ecd1d679c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-csv''; - version = ''20201016-git''; + baseName = "cl-csv"; + version = "20201016-git"; parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; - description = ''Facilities for reading and writing CSV format files''; + description = "Facilities for reading and writing CSV format files"; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz''; - sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf''; + url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; + sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf"; }; packageName = "cl-csv"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-custom-hash-table.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-custom-hash-table.nix new file mode 100644 index 0000000000..51dfcbf4f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-custom-hash-table.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "cl-custom-hash-table"; + version = "20201220-git"; + + description = "System lacks description"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz"; + sha256 = "1id16p7vdcgxzvrgk8h6fqi284hgd8cilbnbgsbrbd70n7nj8jg3"; + }; + + packageName = "cl-custom-hash-table"; + + asdFilesToKeep = ["cl-custom-hash-table.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-custom-hash-table DESCRIPTION System lacks description SHA256 + 1id16p7vdcgxzvrgk8h6fqi284hgd8cilbnbgsbrbd70n7nj8jg3 URL + http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz + MD5 bd0f2f4a8e808911133af19c03e5c511 NAME cl-custom-hash-table FILENAME + cl-custom-hash-table DEPS NIL DEPENDENCIES NIL VERSION 20201220-git + SIBLINGS (cl-custom-hash-table-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index a9d6d4cf56..a691ed2ba5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-dbi''; - version = ''20210228-git''; + baseName = "cl-dbi"; + version = "20210228-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz''; - sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz"; + sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk"; }; packageName = "cl-dbi"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-difflib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-difflib.nix index 8f613d45fe..aacb9a5353 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-difflib.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-difflib.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-difflib''; - version = ''20130128-git''; + baseName = "cl-difflib"; + version = "20130128-git"; - description = ''A Lisp library for computing differences between sequences.''; + description = "A Lisp library for computing differences between sequences."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz''; - sha256 = ''1bgb0nmm93x90c7v1q1ah1v5dfm2anhkim7nh88sg7kg50y4ksm6''; + url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; + sha256 = "1bgb0nmm93x90c7v1q1ah1v5dfm2anhkim7nh88sg7kg50y4ksm6"; }; packageName = "cl-difflib"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix index 53cf2214ed..f4f12aed58 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-dot''; - version = ''20200925-git''; + baseName = "cl-dot"; + version = "20200925-git"; - description = ''Generate Dot Output from Arbitrary Lisp Data''; + description = "Generate Dot Output from Arbitrary Lisp Data"; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz''; - sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla''; + url = "http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz"; + sha256 = "01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla"; }; packageName = "cl-dot"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 1510495a4c..3d2f612dd5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-emb''; - version = ''20190521-git''; + baseName = "cl-emb"; + version = "20190521-git"; - description = ''A templating system for Common Lisp''; + description = "A templating system for Common Lisp"; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz''; - sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d''; + url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; + sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d"; }; packageName = "cl-emb"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 6702066b0d..f5e28c16ce 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-fad''; - version = ''20210124-git''; + baseName = "cl-fad"; + version = "20210124-git"; parasites = [ "cl-fad-test" ]; - description = ''Portable pathname library''; + description = "Portable pathname library"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2021-01-24/cl-fad-20210124-git.tgz''; - sha256 = ''17vkvkwg4wpyny5x2nsazgpip5nxxahsjngaxjyrj5z15d4lkrm0''; + url = "http://beta.quicklisp.org/archive/cl-fad/2021-01-24/cl-fad-20210124-git.tgz"; + sha256 = "17vkvkwg4wpyny5x2nsazgpip5nxxahsjngaxjyrj5z15d4lkrm0"; }; packageName = "cl-fad"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 6a40d0fa8c..2e76fd28c6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-fuse-meta-fs''; - version = ''20190710-git''; + baseName = "cl-fuse-meta-fs"; + version = "20190710-git"; - description = ''CFFI bindings to FUSE (Filesystem in user space)''; + description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz''; - sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7''; + url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; + sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7"; }; packageName = "cl-fuse-meta-fs"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index b0a549096b..08c0c8e5c8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-fuse''; - version = ''20200925-git''; + baseName = "cl-fuse"; + version = "20200925-git"; - description = ''CFFI bindings to FUSE (Filesystem in user space)''; + description = "CFFI bindings to FUSE (Filesystem in user space)"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz''; - sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp''; + url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; + sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp"; }; packageName = "cl-fuse"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix index 72eafacb19..58e7b2d44b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-hooks''; - version = ''architecture.hooks-20181210-git''; + baseName = "cl-hooks"; + version = "architecture.hooks-20181210-git"; parasites = [ "cl-hooks/test" ]; - description = ''This system provides the hooks extension point -mechanism (as known, e.g., from GNU Emacs).''; + description = "This system provides the hooks extension point +mechanism (as known, e.g., from GNU Emacs)."; deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz''; - sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns''; + url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; + sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns"; }; packageName = "cl-hooks"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix index d94c33156b..ebefee3931 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-html-diff''; - version = ''20130128-git''; + baseName = "cl-html-diff"; + version = "20130128-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."cl-difflib" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz''; - sha256 = ''0dbqfgfl2qmlk91fncjj804md2crvj0bsvkdxfrsybrhn6dmikci''; + url = "http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz"; + sha256 = "0dbqfgfl2qmlk91fncjj804md2crvj0bsvkdxfrsybrhn6dmikci"; }; packageName = "cl-html-diff"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 6cd859c2ca..3ba840fe83 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-html-parse''; - version = ''20200925-git''; + baseName = "cl-html-parse"; + version = "20200925-git"; - description = ''HTML Parser''; + description = "HTML Parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz''; - sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f''; + url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz"; + sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f"; }; packageName = "cl-html-parse"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index dde2cc31dd..527d1a4019 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-html5-parser''; - version = ''20190521-git''; + baseName = "cl-html5-parser"; + version = "20190521-git"; - description = ''A HTML5 parser for Common Lisp''; + description = "A HTML5 parser for Common Lisp"; deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz''; - sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p''; + url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; + sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p"; }; packageName = "cl-html5-parser"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index db5c229994..fe9fa81b67 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-interpol''; - version = ''20201220-git''; + baseName = "cl-interpol"; + version = "20201220-git"; parasites = [ "cl-interpol-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-12-20/cl-interpol-20201220-git.tgz''; - sha256 = ''1q3zxsbl5br08lv481jsqmq8r9yayp44x6icixcxx5sdz6fbcd3d''; + url = "http://beta.quicklisp.org/archive/cl-interpol/2020-12-20/cl-interpol-20201220-git.tgz"; + sha256 = "1q3zxsbl5br08lv481jsqmq8r9yayp44x6icixcxx5sdz6fbcd3d"; }; packageName = "cl-interpol"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 713aff0ea4..086ebde359 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-jpeg''; - version = ''20170630-git''; + baseName = "cl-jpeg"; + version = "20170630-git"; - description = ''A self-contained baseline JPEG codec implementation''; + description = "A self-contained baseline JPEG codec implementation"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz''; - sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0''; + url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz"; + sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0"; }; packageName = "cl-jpeg"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index d8bc535f35..ab76c8d884 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-json''; - version = ''20141217-git''; + baseName = "cl-json"; + version = "20141217-git"; parasites = [ "cl-json.test" ]; - description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.''; + description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format."; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz''; - sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g''; + url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz"; + sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g"; }; packageName = "cl-json"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428..8ef07f336c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-l10n-cldr''; - version = ''20120909-darcs''; + baseName = "cl-l10n-cldr"; + version = "20120909-darcs"; - description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.''; + description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz''; - sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv''; + url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; + sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv"; }; packageName = "cl-l10n-cldr"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index f37e653bc5..44b2a64be9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-l10n''; - version = ''20161204-darcs''; + baseName = "cl-l10n"; + version = "20161204-darcs"; parasites = [ "cl-l10n/test" ]; - description = ''Portable CL Locale Support''; + description = "Portable CL Locale Support"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; - sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl''; + url = "http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz"; + sha256 = "1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl"; }; packageName = "cl-l10n"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index ad4780cebe..a8d15b0629 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-libuv''; - version = ''20200610-git''; + baseName = "cl-libuv"; + version = "20200610-git"; - description = ''Low-level libuv bindings for Common Lisp.''; + description = "Low-level libuv bindings for Common Lisp."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz''; - sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19''; + url = "http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz"; + sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19"; }; packageName = "cl-libuv"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix index f0d727a633..4c053804ea 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-locale''; - version = ''20151031-git''; + baseName = "cl-locale"; + version = "20151031-git"; - description = ''Simple i18n library for Common Lisp''; + description = "Simple i18n library for Common Lisp"; deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz''; - sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg''; + url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; + sha256 = "14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg"; }; packageName = "cl-locale"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index b1916c27bf..47d19e5da7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-markup''; - version = ''20131003-git''; + baseName = "cl-markup"; + version = "20131003-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz''; - sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r''; + url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; + sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r"; }; packageName = "cl-markup"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 97b714d8b6..5e496535cc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-mysql''; - version = ''20200610-git''; + baseName = "cl-mysql"; + version = "20200610-git"; - description = ''Common Lisp MySQL library bindings''; + description = "Common Lisp MySQL library bindings"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz''; - sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w''; + url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; + sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w"; }; packageName = "cl-mysql"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index cfca59e3b5..1a9ddf4cb6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-paths-ttf''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-paths-ttf"; + version = "cl-vectors-20180228-git"; - description = ''cl-paths-ttf: vectorial paths manipulation''; + description = "cl-paths-ttf: vectorial paths manipulation"; deps = [ args."cl-paths" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-paths-ttf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c2..b4caabe8b2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-paths''; - version = ''cl-vectors-20180228-git''; + baseName = "cl-paths"; + version = "cl-vectors-20180228-git"; - description = ''cl-paths: vectorial paths manipulation''; + description = "cl-paths: vectorial paths manipulation"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-paths"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index ba3c81b10f..7af4eaf431 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-pdf''; - version = ''20210228-git''; + baseName = "cl-pdf"; + version = "20210228-git"; - description = ''Common Lisp PDF Generation Library''; + description = "Common Lisp PDF Generation Library"; deps = [ args."iterate" args."uiop" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-pdf/2021-02-28/cl-pdf-20210228-git.tgz''; - sha256 = ''1m1nq91p49gfc9iccja2wbhglrv0mgzhqvliss7jr0j6icv66x3y''; + url = "http://beta.quicklisp.org/archive/cl-pdf/2021-02-28/cl-pdf-20210228-git.tgz"; + sha256 = "1m1nq91p49gfc9iccja2wbhglrv0mgzhqvliss7jr0j6icv66x3y"; }; packageName = "cl-pdf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 44af87a6d9..95f5d03738 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-postgres''; - version = ''postmodern-20210124-git''; + baseName = "cl-postgres"; + version = "postmodern-20210124-git"; parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; - description = ''Low-level client library for PostgreSQL''; + description = "Low-level client library for PostgreSQL"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz''; - sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc''; + url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; + sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; }; packageName = "cl-postgres"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix index d85ab33f06..3c32a56e37 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-postgres_plus_local-time''; - version = ''local-time-20210124-git''; + baseName = "cl-postgres_plus_local-time"; + version = "local-time-20210124-git"; - description = ''Integration between cl-postgres and local-time''; + description = "Integration between cl-postgres and local-time"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."ironclad" args."local-time" args."md5" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz''; - sha256 = ''0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s''; + url = "http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz"; + sha256 = "0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s"; }; packageName = "cl-postgres+local-time"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 3856d777c5..a09ba7cdc6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,19 +1,20 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre-template''; - version = ''cl-unification-20200925-git''; + baseName = "cl-ppcre-template"; + version = "cl-unification-20200925-git"; - description = ''A system used to conditionally load the CL-PPCRE Template. + description = "A system used to conditionally load the CL-PPCRE Template. This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the -REGULAR-EXPRESSION-TEMPLATE.''; +REGULAR-EXPRESSION-TEMPLATE."; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; - sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; + url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; + sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; }; packageName = "cl-ppcre-template"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 27887f1249..8277c9ed72 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre-unicode''; - version = ''cl-ppcre-20190521-git''; + baseName = "cl-ppcre-unicode"; + version = "cl-ppcre-20190521-git"; parasites = [ "cl-ppcre-unicode-test" ]; - description = ''Perl-compatible regular expression library (Unicode)''; + description = "Perl-compatible regular expression library (Unicode)"; deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; - sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; + sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; }; packageName = "cl-ppcre-unicode"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 8bb8fb2478..1a2aeadd27 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-ppcre''; - version = ''20190521-git''; + baseName = "cl-ppcre"; + version = "20190521-git"; parasites = [ "cl-ppcre-test" ]; - description = ''Perl-compatible regular expression library''; + description = "Perl-compatible regular expression library"; deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz''; - sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx''; + url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; + sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; }; packageName = "cl-ppcre"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix index 0c31c570b6..333b7ac587 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-prevalence''; - version = ''20210228-git''; + baseName = "cl-prevalence"; + version = "20210228-git"; - description = ''Common Lisp Prevalence Package''; + description = "Common Lisp Prevalence Package"; deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-prevalence/2021-02-28/cl-prevalence-20210228-git.tgz''; - sha256 = ''0irx60xa7ivlnjg1qzhl7x5sgdjqk53nrx0nji29q639h71czfpl''; + url = "http://beta.quicklisp.org/archive/cl-prevalence/2021-02-28/cl-prevalence-20210228-git.tgz"; + sha256 = "0irx60xa7ivlnjg1qzhl7x5sgdjqk53nrx0nji29q639h71czfpl"; }; packageName = "cl-prevalence"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index e88b9efe36..72a049c2f0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-project''; - version = ''20200715-git''; + baseName = "cl-project"; + version = "20200715-git"; - description = ''Generate a skeleton for modern project''; + description = "Generate a skeleton for modern project"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz''; - sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306''; + url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz"; + sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306"; }; packageName = "cl-project"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 7339fcdffe..0281fc3eed 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-protobufs''; - version = ''20200325-git''; + baseName = "cl-protobufs"; + version = "20200325-git"; - description = ''Protobufs for Common Lisp''; + description = "Protobufs for Common Lisp"; deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz''; - sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin''; + url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz"; + sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin"; }; packageName = "cl-protobufs"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix index 1ccf6af5cb..ee2b681ae0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-qprint''; - version = ''20150804-git''; + baseName = "cl-qprint"; + version = "20150804-git"; - description = ''Encode and decode quoted-printable encoded strings.''; + description = "Encode and decode quoted-printable encoded strings."; deps = [ args."flexi-streams" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz''; - sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28''; + url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; + sha256 = "042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28"; }; packageName = "cl-qprint"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index d323844346..96d88a1861 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-reexport''; - version = ''20210228-git''; + baseName = "cl-reexport"; + version = "20210228-git"; - description = ''Reexport external symbols in other packages.''; + description = "Reexport external symbols in other packages."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz''; - sha256 = ''1ay0ng5nnbq200g4wxs0h7byx24za4yk208nhfsmksahk5qj1qra''; + url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; + sha256 = "1ay0ng5nnbq200g4wxs0h7byx24za4yk208nhfsmksahk5qj1qra"; }; packageName = "cl-reexport"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix index 2c4fd03f94..0775433422 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-slice''; - version = ''20171130-git''; + baseName = "cl-slice"; + version = "20171130-git"; parasites = [ "cl-slice-tests" ]; - description = ''DSL for array slices in Common Lisp.''; + description = "DSL for array slices in Common Lisp."; deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz''; - sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn''; + url = "http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz"; + sha256 = "0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn"; }; packageName = "cl-slice"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index d702c467c0..9570254b8d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-smtp''; - version = ''20210228-git''; + baseName = "cl-smtp"; + version = "20210228-git"; - description = ''Common Lisp smtp client.''; + description = "Common Lisp smtp client."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz''; - sha256 = ''1x965jyhifx8hss2v6qc6lr54nlckchs712dny376krwkl43jh5g''; + url = "http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz"; + sha256 = "1x965jyhifx8hss2v6qc6lr54nlckchs712dny376krwkl43jh5g"; }; packageName = "cl-smtp"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix index f953573797..cb367af21f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-speedy-queue''; - version = ''20150302-git''; + baseName = "cl-speedy-queue"; + version = "20150302-git"; - description = ''cl-speedy-queue is a portable, non-consing, optimized queue implementation.''; + description = "cl-speedy-queue is a portable, non-consing, optimized queue implementation."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz''; - sha256 = ''1w83vckk0ldr61vpkwg4i8l2b2yx54cs4ak62j4lxhshax105rqr''; + url = "http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz"; + sha256 = "1w83vckk0ldr61vpkwg4i8l2b2yx54cs4ak62j4lxhshax105rqr"; }; packageName = "cl-speedy-queue"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index d97bd34f27..4e7f5e0f79 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-store''; - version = ''20200925-git''; + baseName = "cl-store"; + version = "20200925-git"; parasites = [ "cl-store-tests" ]; - description = ''Serialization package''; + description = "Serialization package"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz''; - sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3''; + url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz"; + sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3"; }; packageName = "cl-store"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index add200b09a..a4f8cce8ba 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-annot''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-annot"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for cl-annot''; + description = "CL-Syntax Reader Syntax for cl-annot"; deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-annot"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index c19a47df6c..c6f1932489 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-anonfun''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-anonfun"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for cl-anonfun''; + description = "CL-Syntax Reader Syntax for cl-anonfun"; deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-anonfun"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index cded8dc2d0..ea955ba0bf 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax-markup''; - version = ''cl-syntax-20150407-git''; + baseName = "cl-syntax-markup"; + version = "cl-syntax-20150407-git"; - description = ''CL-Syntax Reader Syntax for CL-Markup''; + description = "CL-Syntax Reader Syntax for CL-Markup"; deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax-markup"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 353c821088..6a09c11d14 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-syntax''; - version = ''20150407-git''; + baseName = "cl-syntax"; + version = "20150407-git"; - description = ''Reader Syntax Coventions for Common Lisp and SLIME''; + description = "Reader Syntax Coventions for Common Lisp and SLIME"; deps = [ args."named-readtables" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; - sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; + sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; }; packageName = "cl-syntax"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix index 5fe7fe2576..695d1722dc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-syslog''; - version = ''20190202-git''; + baseName = "cl-syslog"; + version = "20190202-git"; - description = ''Common Lisp syslog interface.''; + description = "Common Lisp syslog interface."; deps = [ args."alexandria" args."babel" args."cffi" args."global-vars" args."local-time" args."split-sequence" args."trivial-features" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz''; - sha256 = ''1kzz613y9fvx33svlwc65vjaj1cafnxz8icds80ww7il7y6alwgh''; + url = "http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz"; + sha256 = "1kzz613y9fvx33svlwc65vjaj1cafnxz8icds80ww7il7y6alwgh"; }; packageName = "cl-syslog"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 419994fb24..78a2abde95 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-test-more''; - version = ''prove-20200218-git''; + baseName = "cl-test-more"; + version = "prove-20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "cl-test-more"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 95960a8e0d..82beff7057 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-typesetting''; - version = ''20210228-git''; + baseName = "cl-typesetting"; + version = "20210228-git"; - description = ''Common Lisp Typesetting system''; + description = "Common Lisp Typesetting system"; deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz''; - sha256 = ''13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp''; + url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz"; + sha256 = "13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp"; }; packageName = "cl-typesetting"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index d7b08c5f77..67209e03f8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-unicode''; - version = ''20210228-git''; + baseName = "cl-unicode"; + version = "20210228-git"; parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; - description = ''Portable Unicode Library''; + description = "Portable Unicode Library"; deps = [ args."cl-ppcre" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz''; - sha256 = ''0phy5wppb7m78dixrf2vjq8vas4drfd4qg38al6q8ymkl0yfy5js''; + url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; + sha256 = "0phy5wppb7m78dixrf2vjq8vas4drfd4qg38al6q8ymkl0yfy5js"; }; packageName = "cl-unicode"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 38903abe98..0f84f3400e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-unification''; - version = ''20200925-git''; + baseName = "cl-unification"; + version = "20200925-git"; - description = ''The CL-UNIFICATION system. + description = "The CL-UNIFICATION system. -The system contains the definitions for the 'unification' machinery.''; +The system contains the definitions for the 'unification' machinery."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; - sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; + url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; + sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; }; packageName = "cl-unification"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index ba8be7927f..cfe7a2a9f3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-utilities''; - version = ''1.2.4''; + baseName = "cl-utilities"; + version = "1.2.4"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz''; - sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87''; + url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; + sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; }; packageName = "cl-utilities"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index f44bd0f22e..a6fc607c64 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-vectors''; - version = ''20180228-git''; + baseName = "cl-vectors"; + version = "20180228-git"; - description = ''cl-paths: vectorial paths manipulation''; + description = "cl-paths: vectorial paths manipulation"; deps = [ args."cl-aa" args."cl-paths" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz''; - sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly''; + url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; + sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; }; packageName = "cl-vectors"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix index 8874bcde7f..56275d7274 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-webkit2''; - version = ''cl-webkit-20210228-git''; + baseName = "cl-webkit2"; + version = "cl-webkit-20210228-git"; - description = ''An FFI binding to WebKit2GTK+''; + description = "An FFI binding to WebKit2GTK+"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz''; - sha256 = ''1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1''; + url = "http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz"; + sha256 = "1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1"; }; packageName = "cl-webkit2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 3be45384d4..3e19170e63 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-who''; - version = ''20190710-git''; + baseName = "cl-who"; + version = "20190710-git"; parasites = [ "cl-who-test" ]; - description = ''(X)HTML generation macros''; + description = "(X)HTML generation macros"; deps = [ args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz''; - sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir''; + url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz"; + sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir"; }; packageName = "cl-who"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix index 223c50f471..ae6b0b336c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl-xmlspam''; - version = ''20101006-http''; + baseName = "cl-xmlspam"; + version = "20101006-http"; - description = ''Streaming pattern matching for XML''; + description = "Streaming pattern matching for XML"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz''; - sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h''; + url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; + sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h"; }; packageName = "cl-xmlspam"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 699a5bdf7a..6811c62ad2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20210228-git''; + baseName = "cl_plus_ssl"; + version = "cl+ssl-20210228-git"; - description = ''Common Lisp interface to OpenSSL.''; + description = "Common Lisp interface to OpenSSL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz''; - sha256 = ''1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll''; + url = "http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz"; + sha256 = "1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll"; }; packageName = "cl+ssl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 5a831da39b..ff3679a263 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clack-handler-hunchentoot''; - version = ''clack-20191007-git''; + baseName = "clack-handler-hunchentoot"; + version = "clack-20191007-git"; - description = ''Clack handler for Hunchentoot.''; + description = "Clack handler for Hunchentoot."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-handler-hunchentoot"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index a9294b293c..e597bb66d6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clack-socket''; - version = ''clack-20191007-git''; + baseName = "clack-socket"; + version = "clack-20191007-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-socket"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 64e6a69462..d014ccc211 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clack-test''; - version = ''clack-20191007-git''; + baseName = "clack-test"; + version = "clack-20191007-git"; - description = ''Testing Clack Applications.''; + description = "Testing Clack Applications."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-test"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index d52c21e7c0..6d90a5ef1f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clack-v1-compat''; - version = ''clack-20191007-git''; + baseName = "clack-v1-compat"; + version = "clack-20191007-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack-v1-compat"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 1453232cb6..78ffa543ec 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clack''; - version = ''20191007-git''; + baseName = "clack"; + version = "20191007-git"; - description = ''Web application environment for Common Lisp''; + description = "Web application environment for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; - sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w''; + url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz"; + sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w"; }; packageName = "clack"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix index 81b335520b..ccd9fe6131 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clfswm''; - version = ''20161204-git''; + baseName = "clfswm"; + version = "20161204-git"; - description = ''CLFSWM: Fullscreen Window Manager''; + description = "CLFSWM: Fullscreen Window Manager"; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz''; - sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73''; + url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; + sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73"; }; packageName = "clfswm"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index c5a06b9a03..ff8e7cc953 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''closer-mop''; - version = ''20210228-git''; + baseName = "closer-mop"; + version = "20210228-git"; - description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; + description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz''; - sha256 = ''0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i''; + url = "http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz"; + sha256 = "0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i"; }; packageName = "closer-mop"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index c1b36b6b65..6720aa516d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''closure-common''; - version = ''20181018-git''; + baseName = "closure-common"; + version = "20181018-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz''; - sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn''; + url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; + sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn"; }; packageName = "closure-common"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index 7d9d8730f2..a0233a31be 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''closure-html''; - version = ''20180711-git''; + baseName = "closure-html"; + version = "20180711-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz''; - sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq''; + url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; + sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq"; }; packageName = "closure-html"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index d3c51f519b..9ec7791eec 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clsql-postgresql-socket''; - version = ''clsql-20210228-git''; + baseName = "clsql-postgresql-socket"; + version = "clsql-20210228-git"; - description = ''Common Lisp SQL PostgreSQL Socket Driver''; + description = "Common Lisp SQL PostgreSQL Socket Driver"; deps = [ args."clsql" args."md5" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz''; - sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4''; + url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; + sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; }; packageName = "clsql-postgresql-socket"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index f881cf4221..0c75f8a277 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clsql-postgresql''; - version = ''clsql-20210228-git''; + baseName = "clsql-postgresql"; + version = "clsql-20210228-git"; - description = ''Common Lisp PostgreSQL API Driver''; + description = "Common Lisp PostgreSQL API Driver"; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz''; - sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4''; + url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; + sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; }; packageName = "clsql-postgresql"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index ce512042bb..e0f8c6ad35 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clsql-sqlite3''; - version = ''clsql-20210228-git''; + baseName = "clsql-sqlite3"; + version = "clsql-20210228-git"; - description = ''Common Lisp Sqlite3 Driver''; + description = "Common Lisp Sqlite3 Driver"; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz''; - sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4''; + url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; + sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; }; packageName = "clsql-sqlite3"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 4ec1170f37..566ee1a87f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clsql-uffi''; - version = ''clsql-20210228-git''; + baseName = "clsql-uffi"; + version = "clsql-20210228-git"; - description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library''; + description = "Common UFFI Helper functions for Common Lisp SQL Interface Library"; deps = [ args."clsql" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz''; - sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4''; + url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; + sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; }; packageName = "clsql-uffi"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index e7595695df..282262927f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clsql''; - version = ''20210228-git''; + baseName = "clsql"; + version = "20210228-git"; - description = ''Common Lisp SQL Interface library''; + description = "Common Lisp SQL Interface library"; deps = [ args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz''; - sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4''; + url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; + sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; }; packageName = "clsql"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index aa89d5e45c..af74074f08 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clss''; - version = ''20191130-git''; + baseName = "clss"; + version = "20191130-git"; - description = ''A DOM tree searching engine based on CSS selectors.''; + description = "A DOM tree searching engine based on CSS selectors."; deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz''; - sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka''; + url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz"; + sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka"; }; packageName = "clss"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix index 10ab18a8ca..53b4db5dc1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clump-2-3-tree''; - version = ''clump-20160825-git''; + baseName = "clump-2-3-tree"; + version = "clump-20160825-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."acclimation" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump-2-3-tree"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix index ad28447154..2f71fb3eb9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clump-binary-tree''; - version = ''clump-20160825-git''; + baseName = "clump-binary-tree"; + version = "clump-20160825-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."acclimation" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump-binary-tree"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix index 476cacb6f3..4591b00a78 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clump''; - version = ''20160825-git''; + baseName = "clump"; + version = "20160825-git"; - description = ''Library for operations on different kinds of trees''; + description = "Library for operations on different kinds of trees"; deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; - sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; + sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; }; packageName = "clump"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix index 7ab00c0344..d5012847ca 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clunit''; - version = ''20171019-git''; + baseName = "clunit"; + version = "20171019-git"; - description = ''CLUnit is a Common Lisp unit testing framework.''; + description = "CLUnit is a Common Lisp unit testing framework."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz''; - sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5''; + url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; + sha256 = "1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5"; }; packageName = "clunit"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix index 6a143073b5..442acebb4c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clunit2''; - version = ''20201016-git''; + baseName = "clunit2"; + version = "20201016-git"; - description = ''CLUnit is a Common Lisp unit testing framework.''; + description = "CLUnit is a Common Lisp unit testing framework."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz''; - sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp''; + url = "http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz"; + sha256 = "1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp"; }; packageName = "clunit2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 856d541155..fca6eff797 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''clx''; - version = ''20200715-git''; + baseName = "clx"; + version = "20200715-git"; parasites = [ "clx/test" ]; - description = ''An implementation of the X Window System protocol in Lisp.''; + description = "An implementation of the X Window System protocol in Lisp."; deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz''; - sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra''; + url = "http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz"; + sha256 = "1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra"; }; packageName = "clx"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 7375b8dd70..a99211953c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''collectors''; - version = ''20161204-git''; + baseName = "collectors"; + version = "20161204-git"; parasites = [ "collectors-test" ]; - description = ''A library providing various collector type macros - pulled from arnesi into its own library and stripped of dependencies''; + description = "A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies"; deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; - sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz"; + sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf"; }; packageName = "collectors"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix index 9084d6a309..b1e1906aa5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''colorize''; - version = ''20180228-git''; + baseName = "colorize"; + version = "20180228-git"; - description = ''A Syntax highlighting library''; + description = "A Syntax highlighting library"; deps = [ args."alexandria" args."html-encode" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz''; - sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h''; + url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz"; + sha256 = "1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h"; }; packageName = "colorize"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index ed4e48cd83..5e0b877fe8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''command-line-arguments''; - version = ''20200325-git''; + baseName = "command-line-arguments"; + version = "20200325-git"; - description = ''small library to deal with command-line arguments''; + description = "small library to deal with command-line arguments"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz''; - sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz''; + url = "http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz"; + sha256 = "0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz"; }; packageName = "command-line-arguments"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index 38ea5aa106..e29b9910ae 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''css-lite''; - version = ''20120407-git''; + baseName = "css-lite"; + version = "20120407-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz''; - sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg''; + url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz"; + sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg"; }; packageName = "css-lite"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index 98c565648d..fcd4a6918c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors-simple-tree''; - version = ''css-selectors-20160628-git''; + baseName = "css-selectors-simple-tree"; + version = "css-selectors-20160628-git"; - description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree''; + description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree"; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors-simple-tree"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fcdb69f3c3..66917f32d3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors-stp''; - version = ''css-selectors-20160628-git''; + baseName = "css-selectors-stp"; + version = "css-selectors-20160628-git"; - description = ''An implementation of css selectors that interacts with cxml-stp''; + description = "An implementation of css selectors that interacts with cxml-stp"; deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors-stp"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index aa523d6f83..ec8434b2e4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''css-selectors''; - version = ''20160628-git''; + baseName = "css-selectors"; + version = "20160628-git"; parasites = [ "css-selectors-test" ]; - description = ''An implementation of css selectors''; + description = "An implementation of css selectors"; deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; - sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; + sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; }; packageName = "css-selectors"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 2816b45108..275eba3450 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cxml-stp''; - version = ''20200325-git''; + baseName = "cxml-stp"; + version = "20200325-git"; parasites = [ "cxml-stp/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz''; - sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n''; + url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; + sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n"; }; packageName = "cxml-stp"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 8f5e05048c..61c38a8720 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''cxml''; - version = ''20200610-git''; + baseName = "cxml"; + version = "20200610-git"; parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; - description = ''Closure XML - a Common Lisp XML parser''; + description = "Closure XML - a Common Lisp XML parser"; deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz''; - sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq''; + url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; + sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq"; }; packageName = "cxml"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index c971ac78ba..5dbcbd5c07 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dbd-mysql''; - version = ''cl-dbi-20210228-git''; + baseName = "dbd-mysql"; + version = "cl-dbi-20210228-git"; - description = ''Database driver for MySQL.''; + description = "Database driver for MySQL."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz''; - sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz"; + sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk"; }; packageName = "dbd-mysql"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index d1f4ea485d..c99fcc6a25 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dbd-postgres''; - version = ''cl-dbi-20210228-git''; + baseName = "dbd-postgres"; + version = "cl-dbi-20210228-git"; - description = ''Database driver for PostgreSQL.''; + description = "Database driver for PostgreSQL."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz''; - sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz"; + sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk"; }; packageName = "dbd-postgres"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index f57f81d87e..c006de4305 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20210228-git''; + baseName = "dbd-sqlite3"; + version = "cl-dbi-20210228-git"; - description = ''Database driver for SQLite3.''; + description = "Database driver for SQLite3."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz''; - sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz"; + sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk"; }; packageName = "dbd-sqlite3"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix index b8aff83451..6d945d6181 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dbi-test''; - version = ''cl-dbi-20210228-git''; + baseName = "dbi-test"; + version = "cl-dbi-20210228-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz''; - sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz"; + sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk"; }; packageName = "dbi-test"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 0f3c8ecf2f..381fd8e702 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dbi''; - version = ''cl-20210228-git''; + baseName = "dbi"; + version = "cl-20210228-git"; parasites = [ "dbi/test" ]; - description = ''Database independent interface for Common Lisp''; + description = "Database independent interface for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz''; - sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk''; + url = "http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz"; + sha256 = "0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk"; }; packageName = "dbi"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix index 1ea512d0ab..40d89b3769 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dbus''; - version = ''20200610-git''; + baseName = "dbus"; + version = "20200610-git"; - description = ''A D-BUS client library for Common Lisp''; + description = "A D-BUS client library for Common Lisp"; deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz''; - sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79''; + url = "http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz"; + sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79"; }; packageName = "dbus"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 3622a4ad85..b7b7cf0ead 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dexador''; - version = ''20210228-git''; + baseName = "dexador"; + version = "20210228-git"; - description = ''Yet another HTTP client for Common Lisp''; + description = "Yet another HTTP client for Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz''; - sha256 = ''0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7''; + url = "http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz"; + sha256 = "0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7"; }; packageName = "dexador"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix index 2df2c14c12..def4eac0ad 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''dissect''; - version = ''20200427-git''; + baseName = "dissect"; + version = "20200427-git"; - description = ''A lib for introspecting the call stack and active restarts.''; + description = "A lib for introspecting the call stack and active restarts."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz''; - sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a''; + url = "http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz"; + sha256 = "1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a"; }; packageName = "dissect"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix index 765e3a996d..e89255c9ec 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''djula''; - version = ''20210124-git''; + baseName = "djula"; + version = "20210124-git"; - description = ''An implementation of Django templates for Common Lisp.''; + description = "An implementation of Django templates for Common Lisp."; deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/djula/2021-01-24/djula-20210124-git.tgz''; - sha256 = ''0hkyp5himz73r2l3vbwkwsd1as4f75ih6wh7v1wbabpbjwh2j2vx''; + url = "http://beta.quicklisp.org/archive/djula/2021-01-24/djula-20210124-git.tgz"; + sha256 = "0hkyp5himz73r2l3vbwkwsd1as4f75ih6wh7v1wbabpbjwh2j2vx"; }; packageName = "djula"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 3dbacdf0f8..4b79b85b5c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''do-urlencode''; - version = ''20181018-git''; + baseName = "do-urlencode"; + version = "20181018-git"; - description = ''Percent Encoding (aka URL Encoding) library''; + description = "Percent Encoding (aka URL Encoding) library"; deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz''; - sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2''; + url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; + sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2"; }; packageName = "do-urlencode"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7c25ed9a03..1bb6460a0f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''documentation-utils''; - version = ''20190710-git''; + baseName = "documentation-utils"; + version = "20190710-git"; - description = ''A few simple tools to help you with documenting your library.''; + description = "A few simple tools to help you with documenting your library."; deps = [ args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz''; - sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3''; + url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz"; + sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3"; }; packageName = "documentation-utils"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index e880d94f43..3317af3295 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''drakma''; - version = ''v2.0.7''; + baseName = "drakma"; + version = "v2.0.7"; - description = ''Full-featured http/https client based on usocket''; + description = "Full-featured http/https client based on usocket"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz''; - sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw''; + url = "http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz"; + sha256 = "1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw"; }; packageName = "drakma"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix index eb240954b8..58009dee0d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''eager-future2''; - version = ''20191130-git''; + baseName = "eager-future2"; + version = "20191130-git"; - description = ''Parallel programming library providing the futures/promises synchronization mechanism''; + description = "Parallel programming library providing the futures/promises synchronization mechanism"; deps = [ args."alexandria" args."bordeaux-threads" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz''; - sha256 = ''01pvgcp6d4hz1arpvsv73m8xnbv8qm2d0qychpxc72d0m71p6ks0''; + url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; + sha256 = "01pvgcp6d4hz1arpvsv73m8xnbv8qm2d0qychpxc72d0m71p6ks0"; }; packageName = "eager-future2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix index a5e44cefa4..15035fe13d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''enchant''; - version = ''cl-20190521-git''; + baseName = "enchant"; + version = "cl-20190521-git"; - description = ''Programming interface for Enchant spell-checker library''; + description = "Programming interface for Enchant spell-checker library"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz''; - sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14''; + url = "http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz"; + sha256 = "16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14"; }; packageName = "enchant"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index 5f5f9828cb..c1c7e31d39 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''esrap-peg''; - version = ''20191007-git''; + baseName = "esrap-peg"; + version = "20191007-git"; - description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions''; + description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" args."trivial-with-current-source-form" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz''; - sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis''; + url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; + sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis"; }; packageName = "esrap-peg"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 7e887f9241..4b15901827 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''esrap''; - version = ''20201220-git''; + baseName = "esrap"; + version = "20201220-git"; parasites = [ "esrap/tests" ]; - description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; + description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; deps = [ args."alexandria" args."fiveam" args."trivial-with-current-source-form" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2020-12-20/esrap-20201220-git.tgz''; - sha256 = ''0yhi4ay98i81nqv9yjlj321azwmiylsw0afdd6y1c1zflfcrzkrk''; + url = "http://beta.quicklisp.org/archive/esrap/2020-12-20/esrap-20201220-git.tgz"; + sha256 = "0yhi4ay98i81nqv9yjlj321azwmiylsw0afdd6y1c1zflfcrzkrk"; }; packageName = "esrap"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index 4fd7523425..4ddd869b73 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''external-program''; - version = ''20190307-git''; + baseName = "external-program"; + version = "20190307-git"; parasites = [ "external-program-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz''; - sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz''; + url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; + sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz"; }; packageName = "external-program"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix index 67d75b89db..b9c375a770 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-csv''; - version = ''20171227-git''; + baseName = "fare-csv"; + version = "20171227-git"; - description = ''Robust CSV parser and printer''; + description = "Robust CSV parser and printer"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz''; - sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x''; + url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz"; + sha256 = "1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x"; }; packageName = "fare-csv"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix index a5cec39c15..34b3ec905b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-mop''; - version = ''20151218-git''; + baseName = "fare-mop"; + version = "20151218-git"; - description = ''Utilities using the MOP; notably make informative pretty-printing trivial''; + description = "Utilities using the MOP; notably make informative pretty-printing trivial"; deps = [ args."closer-mop" args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz''; - sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9''; + url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; + sha256 = "0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9"; }; packageName = "fare-mop"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix index ff03567a1a..0c114fda8d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-extras''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-extras"; + version = "fare-quasiquote-20200925-git"; - description = ''fare-quasiquote plus extras''; + description = "fare-quasiquote plus extras"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-extras"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix index 2f1ef3e5b1..d02dd9c1da 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-optima''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-optima"; + version = "fare-quasiquote-20200925-git"; - description = ''fare-quasiquote extension for optima''; + description = "fare-quasiquote extension for optima"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-optima"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix index 7d332085e2..c33a841f16 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote-readtable''; - version = ''fare-quasiquote-20200925-git''; + baseName = "fare-quasiquote-readtable"; + version = "fare-quasiquote-20200925-git"; - description = ''Using fare-quasiquote with named-readtable''; + description = "Using fare-quasiquote with named-readtable"; deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote-readtable"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix index d5b282e289..d5d65c1d3d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-quasiquote''; - version = ''20200925-git''; + baseName = "fare-quasiquote"; + version = "20200925-git"; - description = ''Portable, matchable implementation of quasiquote''; + description = "Portable, matchable implementation of quasiquote"; deps = [ args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; - sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; + url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; + sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; }; packageName = "fare-quasiquote"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix index d7af897eaf..9f332bee60 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fare-utils''; - version = ''20170124-git''; + baseName = "fare-utils"; + version = "20170124-git"; - description = ''Basic functions and macros, interfaces, pure and stateful datastructures''; + description = "Basic functions and macros, interfaces, pure and stateful datastructures"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz''; - sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq''; + url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz"; + sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq"; }; packageName = "fare-utils"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index cea5d251d7..48e4dd7c40 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fast-http''; - version = ''20191007-git''; + baseName = "fast-http"; + version = "20191007-git"; - description = ''A fast HTTP protocol parser in Common Lisp''; + description = "A fast HTTP protocol parser in Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz''; - sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32''; + url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz"; + sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32"; }; packageName = "fast-http"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 9d7999b750..8bb1327d91 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fast-io''; - version = ''20200925-git''; + baseName = "fast-io"; + version = "20200925-git"; - description = ''Alternative I/O mechanism to a stream or vector''; + description = "Alternative I/O mechanism to a stream or vector"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz''; - sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975''; + url = "http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz"; + sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975"; }; packageName = "fast-io"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 68e5e00085..53dbce44e1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fiasco''; - version = ''20200610-git''; + baseName = "fiasco"; + version = "20200610-git"; parasites = [ "fiasco-self-tests" ]; - description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; + description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil."; deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz''; - sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4''; + url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; + sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4"; }; packageName = "fiasco"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix index 1c8e487978..c6bb4c1baa 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''file-attributes''; - version = ''20200925-git''; + baseName = "file-attributes"; + version = "20200925-git"; - description = ''Access to file attributes (uid, gid, atime, mtime, mod)''; + description = "Access to file attributes (uid, gid, atime, mtime, mod)"; deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz''; - sha256 = ''0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7''; + url = "http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz"; + sha256 = "0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7"; }; packageName = "file-attributes"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index 45af193422..8f88f6dfe9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fiveam''; - version = ''20200925-git''; + baseName = "fiveam"; + version = "20200925-git"; parasites = [ "fiveam/test" ]; - description = ''A simple regression testing framework''; + description = "A simple regression testing framework"; deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz''; - sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d''; + url = "http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz"; + sha256 = "0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d"; }; packageName = "fiveam"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index a1828981c0..625d86ae69 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''flexi-streams''; - version = ''20200925-git''; + baseName = "flexi-streams"; + version = "20200925-git"; parasites = [ "flexi-streams-test" ]; - description = ''Flexible bivalent streams for Common Lisp''; + description = "Flexible bivalent streams for Common Lisp"; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz''; - sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2''; + url = "http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz"; + sha256 = "1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2"; }; packageName = "flexi-streams"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 90ce8b83dd..9f837c3ae2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''form-fiddle''; - version = ''20190710-git''; + baseName = "form-fiddle"; + version = "20190710-git"; - description = ''A collection of utilities to destructure lambda forms.''; + description = "A collection of utilities to destructure lambda forms."; deps = [ args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz''; - sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl''; + url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz"; + sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl"; }; packageName = "form-fiddle"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index 12e168e44f..51f8a1b952 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,19 +1,20 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''fset''; - version = ''20200925-git''; + baseName = "fset"; + version = "20200925-git"; parasites = [ "fset/test" ]; - description = ''A functional set-theoretic collections library. + description = "A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html -''; +"; deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz''; - sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv''; + url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; + sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv"; }; packageName = "fset"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix index ffc517973d..333bdf77b5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''gettext''; - version = ''20171130-git''; + baseName = "gettext"; + version = "20171130-git"; - description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.''; + description = "An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems."; deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz''; - sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd''; + url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; + sha256 = "0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd"; }; packageName = "gettext"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix index 42cdca06d9..2c7bed4fa7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''global-vars''; - version = ''20141106-git''; + baseName = "global-vars"; + version = "20141106-git"; - description = ''Define efficient global variables.''; + description = "Define efficient global variables."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz''; - sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j''; + url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; + sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j"; }; packageName = "global-vars"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix index 9f4672644f..2e7553da1e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''html-encode''; - version = ''1.2''; + baseName = "html-encode"; + version = "1.2"; - description = ''A library for encoding text in various web-savvy encodings.''; + description = "A library for encoding text in various web-savvy encodings."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz''; - sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf''; + url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; + sha256 = "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf"; }; packageName = "html-encode"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 4242d95904..c40df485a1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''http-body''; - version = ''20190813-git''; + baseName = "http-body"; + version = "20190813-git"; - description = ''HTTP POST data parser for Common Lisp''; + description = "HTTP POST data parser for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz''; - sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8''; + url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; + sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8"; }; packageName = "http-body"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 074e2ac967..af0bc6d848 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20200925-darcs''; + baseName = "hu_dot_dwim_dot_asdf"; + version = "20200925-darcs"; - description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; + description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc."; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz''; - sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h''; + url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz"; + sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h"; }; packageName = "hu.dwim.asdf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix index 46a5cb48ea..cee334c9f3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_defclass-star''; - version = ''stable-git''; + baseName = "hu_dot_dwim_dot_defclass-star"; + version = "stable-git"; - description = ''Simplify class like definitions with defclass* and friends.''; + description = "Simplify class like definitions with defclass* and friends."; deps = [ args."hu_dot_dwim_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-02-28/hu.dwim.defclass-star-stable-git.tgz''; - sha256 = ''1zj4c9pz7y69gclyd7kzf6d6s1r0am49czgvp2axbv7w50j5caf9''; + url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-02-28/hu.dwim.defclass-star-stable-git.tgz"; + sha256 = "1zj4c9pz7y69gclyd7kzf6d6s1r0am49czgvp2axbv7w50j5caf9"; }; packageName = "hu.dwim.defclass-star"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index d49a382a3a..a6188cd767 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''hu_dot_dwim_dot_stefil''; - version = ''20200218-darcs''; + baseName = "hu_dot_dwim_dot_stefil"; + version = "20200218-darcs"; parasites = [ "hu.dwim.stefil/test" ]; - description = ''A Simple Test Framework In Lisp.''; + description = "A Simple Test Framework In Lisp."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz''; - sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf''; + url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; + sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; }; packageName = "hu.dwim.stefil"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 1ef97864a5..9bada7ef56 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,20 +1,21 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''hunchentoot''; - version = ''v1.3.0''; + baseName = "hunchentoot"; + version = "v1.3.0"; parasites = [ "hunchentoot-dev" "hunchentoot-test" ]; - description = ''Hunchentoot is a HTTP server based on USOCKET and + description = "Hunchentoot is a HTTP server based on USOCKET and BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a simple framework for user-defined handlers and can be extended - through subclassing.''; + through subclassing."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz''; - sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8''; + url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; + sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8"; }; packageName = "hunchentoot"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 1b948bcf32..87cef0b0bf 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''idna''; - version = ''20120107-git''; + baseName = "idna"; + version = "20120107-git"; - description = ''IDNA (international domain names) string encoding and decoding routines''; + description = "IDNA (international domain names) string encoding and decoding routines"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz''; - sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c''; + url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; + sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c"; }; packageName = "idna"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 4211dfbc91..4ab0fce5ae 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''ieee-floats''; - version = ''20170830-git''; + baseName = "ieee-floats"; + version = "20170830-git"; parasites = [ "ieee-floats-tests" ]; - description = ''Convert floating point values to IEEE 754 binary representation''; + description = "Convert floating point values to IEEE 754 binary representation"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz''; - sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk''; + url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz"; + sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk"; }; packageName = "ieee-floats"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix index 2072945f26..979ecf4ec0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''inferior-shell''; - version = ''20200925-git''; + baseName = "inferior-shell"; + version = "20200925-git"; parasites = [ "inferior-shell/test" ]; - description = ''spawn local or remote processes and shell pipes''; + description = "spawn local or remote processes and shell pipes"; deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz''; - sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80''; + url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; + sha256 = "1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80"; }; packageName = "inferior-shell"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix index 68024ad2a5..ce21348d59 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''introspect-environment''; - version = ''20200715-git''; + baseName = "introspect-environment"; + version = "20200715-git"; - description = ''Small interface to portable but nonstandard introspection of CL environments.''; + description = "Small interface to portable but nonstandard introspection of CL environments."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz''; - sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns''; + url = "http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz"; + sha256 = "1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns"; }; packageName = "introspect-environment"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index c4ae44cd67..283adb2c07 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iolib''; - version = ''v0.8.3''; + baseName = "iolib"; + version = "v0.8.3"; parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ]; - description = ''I/O library.''; + description = "I/O library."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index 195b52c08c..717637f145 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_asdf''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_asdf"; + version = "iolib-v0.8.3"; - description = ''A few ASDF component classes.''; + description = "A few ASDF component classes."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.asdf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index aa650edde0..82fdc26ecf 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_base''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_base"; + version = "iolib-v0.8.3"; - description = ''Base IOlib package, used instead of CL.''; + description = "Base IOlib package, used instead of CL."; deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.base"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index c0ec72d486..2a87869fda 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_common-lisp''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_common-lisp"; + version = "iolib-v0.8.3"; - description = ''Slightly modified Common Lisp.''; + description = "Slightly modified Common Lisp."; deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.common-lisp"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 4ba0cfa1ce..a35f7a0ebb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_conf''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_conf"; + version = "iolib-v0.8.3"; - description = ''Compile-time configuration for IOLib.''; + description = "Compile-time configuration for IOLib."; deps = [ args."alexandria" args."iolib_dot_asdf" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.conf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 7a1a12243f..89f889419f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iolib_dot_grovel''; - version = ''iolib-v0.8.3''; + baseName = "iolib_dot_grovel"; + version = "iolib-v0.8.3"; - description = ''The CFFI Groveller''; + description = "The CFFI Groveller"; deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz''; - sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c''; + url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; + sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; }; packageName = "iolib.grovel"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index b942f5dd0b..c511435ac9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''ironclad''; - version = ''v0.54''; + baseName = "ironclad"; + version = "v0.54"; parasites = [ "ironclad/tests" ]; - description = ''A cryptographic toolkit written in pure Common Lisp''; + description = "A cryptographic toolkit written in pure Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz''; - sha256 = ''01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2''; + url = "http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz"; + sha256 = "01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2"; }; packageName = "ironclad"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 52d1d51903..ff72add872 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''iterate''; - version = ''20210228-git''; + baseName = "iterate"; + version = "20210228-git"; parasites = [ "iterate/tests" ]; - description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility''; + description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2021-02-28/iterate-20210228-git.tgz''; - sha256 = ''1bd6m1lxmd6an75z7j61sms4v54bfxmg1n1w7zd7fm2kb15vai46''; + url = "http://beta.quicklisp.org/archive/iterate/2021-02-28/iterate-20210228-git.tgz"; + sha256 = "1bd6m1lxmd6an75z7j61sms4v54bfxmg1n1w7zd7fm2kb15vai46"; }; packageName = "iterate"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index a29a02c5e6..3e8e74d9e2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''jonathan''; - version = ''20200925-git''; + baseName = "jonathan"; + version = "20200925-git"; - description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; + description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz''; - sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx''; + url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; + sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx"; }; packageName = "jonathan"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix index c6b20ba5da..0100a58a44 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix @@ -1,16 +1,17 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''jpl-queues''; - version = ''0.1''; + baseName = "jpl-queues"; + version = "0.1"; - description = ''A few different kinds of queues, with optional -multithreading synchronization.''; + description = "A few different kinds of queues, with optional +multithreading synchronization."; deps = [ args."alexandria" args."bordeaux-threads" args."jpl-util" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz''; - sha256 = ''1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96''; + url = "http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz"; + sha256 = "1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96"; }; packageName = "jpl-queues"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix index 3a1a3a5b78..d05ddd8527 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''jpl-util''; - version = ''cl-20151031-git''; + baseName = "jpl-util"; + version = "cl-20151031-git"; - description = ''Sundry utilities for J.P. Larocque.''; + description = "Sundry utilities for J.P. Larocque."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz''; - sha256 = ''1a3sfamgrqgsf0ql3fkbpmjbs837v1b3nxqxp4mkisp6yxanmhzx''; + url = "http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz"; + sha256 = "1a3sfamgrqgsf0ql3fkbpmjbs837v1b3nxqxp4mkisp6yxanmhzx"; }; packageName = "jpl-util"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index 49bc7d4cab..87358d518f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''kmrcl''; - version = ''20201016-git''; + baseName = "kmrcl"; + version = "20201016-git"; parasites = [ "kmrcl/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz''; - sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf''; + url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; + sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf"; }; packageName = "kmrcl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 0260d37f0b..bfa7ac47fb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lack-component''; - version = ''lack-20201016-git''; + baseName = "lack-component"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-component"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 610950054f..d9aba5ac0e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lack-middleware-backtrace''; - version = ''lack-20201016-git''; + baseName = "lack-middleware-backtrace"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-middleware-backtrace"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 1af4ec3f43..4852621563 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lack-util''; - version = ''lack-20201016-git''; + baseName = "lack-util"; + version = "lack-20201016-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack-util"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index a85fab15c4..427f63cb3d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lack''; - version = ''20201016-git''; + baseName = "lack"; + version = "20201016-git"; - description = ''A minimal Clack''; + description = "A minimal Clack"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; - sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; + url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz"; + sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan"; }; packageName = "lack"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 9d130c2b05..d7032122ee 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''let-plus''; - version = ''20191130-git''; + baseName = "let-plus"; + version = "20191130-git"; parasites = [ "let-plus/tests" ]; - description = ''Destructuring extension of LET*.''; + description = "Destructuring extension of LET*."; deps = [ args."alexandria" args."anaphora" args."lift" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz''; - sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p''; + url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; + sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p"; }; packageName = "let-plus"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9dd6baad1b..13cb18cfc7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lev''; - version = ''20150505-git''; + baseName = "lev"; + version = "20150505-git"; - description = ''libev bindings for Common Lisp''; + description = "libev bindings for Common Lisp"; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz''; - sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl''; + url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz"; + sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl"; }; packageName = "lev"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 10977c16f8..113766e11b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-client''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-client"; + version = "lfarm-20150608-git"; - description = ''Client component of lfarm, a library for distributing work across machines.''; + description = "Client component of lfarm, a library for distributing work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-client"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4a5fe87982..5e0170a586 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,16 +1,17 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-common''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-common"; + version = "lfarm-20150608-git"; - description = ''(private) Common components of lfarm, a library for distributing -work across machines.''; + description = "(private) Common components of lfarm, a library for distributing +work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-common"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 354d6c3150..5bef53f9f8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-server''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-server"; + version = "lfarm-20150608-git"; - description = ''Server component of lfarm, a library for distributing work across machines.''; + description = "Server component of lfarm, a library for distributing work across machines."; deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-server"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 348c71fe96..dbe2b527e3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lfarm-ssl''; - version = ''lfarm-20150608-git''; + baseName = "lfarm-ssl"; + version = "lfarm-20150608-git"; - description = ''SSL support for lfarm''; + description = "SSL support for lfarm"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz''; - sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66''; + url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; + sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; }; packageName = "lfarm-ssl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 1edb65596a..b48a569de3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lift''; - version = ''20190521-git''; + baseName = "lift"; + version = "20190521-git"; - description = ''LIsp Framework for Testing''; + description = "LIsp Framework for Testing"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz''; - sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9''; + url = "http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz"; + sha256 = "0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9"; }; packageName = "lift"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 7f88beb974..b2c7de33c0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lisp-namespace''; - version = ''20171130-git''; + baseName = "lisp-namespace"; + version = "20171130-git"; - description = ''Provides LISP-N --- extensible namespaces in Common Lisp.''; + description = "Provides LISP-N --- extensible namespaces in Common Lisp."; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz''; - sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j''; + url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz"; + sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j"; }; packageName = "lisp-namespace"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 8d21f88cbf..7f0b22de69 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lisp-unit2''; - version = ''20180131-git''; + baseName = "lisp-unit2"; + version = "20180131-git"; parasites = [ "lisp-unit2-test" ]; - description = ''Common Lisp library that supports unit testing.''; + description = "Common Lisp library that supports unit testing."; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz''; - sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7''; + url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz"; + sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7"; }; packageName = "lisp-unit2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index b3767498d2..c2788badfc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''local-time''; - version = ''20210124-git''; + baseName = "local-time"; + version = "20210124-git"; parasites = [ "local-time/test" ]; - description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; + description = "A library for manipulating dates and times, based on a paper by Erik Naggum"; deps = [ args."hu_dot_dwim_dot_stefil" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz''; - sha256 = ''0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s''; + url = "http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz"; + sha256 = "0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s"; }; packageName = "local-time"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix index 222178b155..17606d4d88 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''log4cl''; - version = ''20200925-git''; + baseName = "log4cl"; + version = "20200925-git"; parasites = [ "log4cl/syslog" "log4cl/test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz''; - sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf''; + url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz"; + sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf"; }; packageName = "log4cl"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index 1a6f217a2f..accedb38f3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lparallel''; - version = ''20160825-git''; + baseName = "lparallel"; + version = "20160825-git"; - description = ''Parallelism for Common Lisp''; + description = "Parallelism for Common Lisp"; deps = [ args."alexandria" args."bordeaux-threads" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz''; - sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1''; + url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; + sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1"; }; packageName = "lparallel"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index c460f50b79..823ef5bf33 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''lquery''; - version = ''20201220-git''; + baseName = "lquery"; + version = "20201220-git"; - description = ''A library to allow jQuery-like HTML/DOM manipulation.''; + description = "A library to allow jQuery-like HTML/DOM manipulation."; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz''; - sha256 = ''0mfnk1p73aihraklw802j5mjgc8cjxva0mdf0c4p7b253crf15jx''; + url = "http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz"; + sha256 = "0mfnk1p73aihraklw802j5mjgc8cjxva0mdf0c4p7b253crf15jx"; }; packageName = "lquery"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 8187c99f94..32d897b330 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''map-set''; - version = ''20190307-hg''; + baseName = "map-set"; + version = "20190307-hg"; - description = ''Set-like data structure.''; + description = "Set-like data structure."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz''; - sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9''; + url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz"; + sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9"; }; packageName = "map-set"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 414dee98b7..e9e5ed5f1d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''marshal''; - version = ''cl-20201016-git''; + baseName = "marshal"; + version = "cl-20201016-git"; - description = ''marshal: Simple (de)serialization of Lisp datastructures.''; + description = "marshal: Simple (de)serialization of Lisp datastructures."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz''; - sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz''; + url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz"; + sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz"; }; packageName = "marshal"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a..f42948ae26 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''md5''; - version = ''20180228-git''; + baseName = "md5"; + version = "20180228-git"; - description = ''The MD5 Message-Digest Algorithm RFC 1321''; + description = "The MD5 Message-Digest Algorithm RFC 1321"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz''; - sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4''; + url = "http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz"; + sha256 = "1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4"; }; packageName = "md5"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index 6e0339bf9f..51c361f112 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''metabang-bind''; - version = ''20200218-git''; + baseName = "metabang-bind"; + version = "20200218-git"; - description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; + description = "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz''; - sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq''; + url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz"; + sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq"; }; packageName = "metabang-bind"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 1cac240883..af0e3d8090 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''metatilities-base''; - version = ''20191227-git''; + baseName = "metatilities-base"; + version = "20191227-git"; - description = ''These are metabang.com's Common Lisp basic utilities.''; + description = "These are metabang.com's Common Lisp basic utilities."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz''; - sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil''; + url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; + sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil"; }; packageName = "metatilities-base"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix index 8915600014..53896192b5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''mgl-pax''; - version = ''20210228-git''; + baseName = "mgl-pax"; + version = "20210228-git"; parasites = [ "mgl-pax/test" ]; - description = ''Exploratory programming tool and documentation - generator.''; + description = "Exploratory programming tool and documentation + generator."; deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" args."trivial-with-current-source-form" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz''; - sha256 = ''1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw''; + url = "http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz"; + sha256 = "1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw"; }; packageName = "mgl-pax"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 16609db5c2..db7349e4d0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''misc-extensions''; - version = ''20150608-git''; + baseName = "misc-extensions"; + version = "20150608-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz''; - sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj''; + url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz"; + sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj"; }; packageName = "misc-extensions"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix index dc63474679..d150d97cb4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''mk-string-metrics''; - version = ''20180131-git''; + baseName = "mk-string-metrics"; + version = "20180131-git"; - description = ''efficient implementations of various string metric algorithms''; + description = "efficient implementations of various string metric algorithms"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz''; - sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4''; + url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; + sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4"; }; packageName = "mk-string-metrics"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index 1f2dd20ee4..02e8ff0f84 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''moptilities''; - version = ''20170403-git''; + baseName = "moptilities"; + version = "20170403-git"; - description = ''Common Lisp MOP utilities''; + description = "Common Lisp MOP utilities"; deps = [ args."closer-mop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz''; - sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8''; + url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; + sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8"; }; packageName = "moptilities"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix index 9a014c4160..3d2cd35b30 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''more-conditions''; - version = ''20180831-git''; + baseName = "more-conditions"; + version = "20180831-git"; parasites = [ "more-conditions/test" ]; - description = ''This system provides some generic condition classes in - conjunction with support functions and macros.''; + description = "This system provides some generic condition classes in + conjunction with support functions and macros."; deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz''; - sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x''; + url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; + sha256 = "0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x"; }; packageName = "more-conditions"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf..55451e02e5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''mt19937''; - version = ''1.1.1''; + baseName = "mt19937"; + version = "1.1.1"; - description = ''Portable MT19937 Mersenne Twister random number generator''; + description = "Portable MT19937 Mersenne Twister random number generator"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz''; - sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv''; + url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; + sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv"; }; packageName = "mt19937"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 415b508713..3538b723d1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''myway''; - version = ''20200325-git''; + baseName = "myway"; + version = "20200325-git"; - description = ''Sinatra-compatible routing library.''; + description = "Sinatra-compatible routing library."; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz''; - sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15''; + url = "http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz"; + sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15"; }; packageName = "myway"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 972e77fde8..7f2fcc4745 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''named-readtables''; - version = ''20210124-git''; + baseName = "named-readtables"; + version = "20210124-git"; parasites = [ "named-readtables/test" ]; - description = ''Library that creates a namespace for named readtable - akin to the namespace of packages.''; + description = "Library that creates a namespace for named readtable + akin to the namespace of packages."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2021-01-24/named-readtables-20210124-git.tgz''; - sha256 = ''00lbcv1qdb9ldq2kbf1rkn5sh657px9dgqrcynbwjzvla4czadl4''; + url = "http://beta.quicklisp.org/archive/named-readtables/2021-01-24/named-readtables-20210124-git.tgz"; + sha256 = "00lbcv1qdb9ldq2kbf1rkn5sh657px9dgqrcynbwjzvla4czadl4"; }; packageName = "named-readtables"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix index a9c4927956..77e07108e6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''net-telent-date''; - version = ''net-telent-date_0.42''; + baseName = "net-telent-date"; + version = "net-telent-date_0.42"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz''; - sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1''; + url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; + sha256 = "06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1"; }; packageName = "net-telent-date"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a..bb64756fec 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''net_dot_didierverna_dot_asdf-flv''; - version = ''asdf-flv-version-2.1''; + baseName = "net_dot_didierverna_dot_asdf-flv"; + version = "asdf-flv-version-2.1"; - description = ''ASDF extension to provide support for file-local variables.''; + description = "ASDF extension to provide support for file-local variables."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz''; - sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc''; + url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz"; + sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc"; }; packageName = "net.didierverna.asdf-flv"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index a11654dd5f..2ddf0b73fb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''nibbles''; - version = ''20210124-git''; + baseName = "nibbles"; + version = "20210124-git"; parasites = [ "nibbles/tests" ]; - description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; + description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders"; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2021-01-24/nibbles-20210124-git.tgz''; - sha256 = ''0y3h4k7665w7b8ivmql9w6rz3ivfa3h8glk45sn6mwix55xmzp26''; + url = "http://beta.quicklisp.org/archive/nibbles/2021-01-24/nibbles-20210124-git.tgz"; + sha256 = "0y3h4k7665w7b8ivmql9w6rz3ivfa3h8glk45sn6mwix55xmzp26"; }; packageName = "nibbles"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 07b86f58fe..0c4684d050 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''optima''; - version = ''20150709-git''; + baseName = "optima"; + version = "20150709-git"; - description = ''Optimized Pattern Matching Library''; + description = "Optimized Pattern Matching Library"; deps = [ args."alexandria" args."closer-mop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz''; - sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc''; + url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; + sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc"; }; packageName = "optima"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix index ae91070d24..3609e23041 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''osicat''; - version = ''20210228-git''; + baseName = "osicat"; + version = "20210228-git"; parasites = [ "osicat/tests" ]; - description = ''A lightweight operating system interface''; + description = "A lightweight operating system interface"; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/osicat/2021-02-28/osicat-20210228-git.tgz''; - sha256 = ''0g9frahjr2i6fvwd3bzvcz9icx4n4mnwcmsz6gvg5s6wmq5ny6wb''; + url = "http://beta.quicklisp.org/archive/osicat/2021-02-28/osicat-20210228-git.tgz"; + sha256 = "0g9frahjr2i6fvwd3bzvcz9icx4n4mnwcmsz6gvg5s6wmq5ny6wb"; }; packageName = "osicat"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bf6216dcad..cfe7128da3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''parenscript''; - version = ''Parenscript-2.7.1''; + baseName = "parenscript"; + version = "Parenscript-2.7.1"; - description = ''Lisp to JavaScript transpiler''; + description = "Lisp to JavaScript transpiler"; deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz''; - sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f''; + url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; + sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f"; }; packageName = "parenscript"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix index ea153987c0..3d8ae2cf82 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''parse-declarations-1_dot_0''; - version = ''parse-declarations-20101006-darcs''; + baseName = "parse-declarations-1_dot_0"; + version = "parse-declarations-20101006-darcs"; - description = ''Library to parse and rebuild declarations.''; + description = "Library to parse and rebuild declarations."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz''; - sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd''; + url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; + sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd"; }; packageName = "parse-declarations-1.0"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805..44e9366372 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''parse-number''; - version = ''v1.7''; + baseName = "parse-number"; + version = "v1.7"; parasites = [ "parse-number/tests" ]; - description = ''Number parsing library''; + description = "Number parsing library"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz''; - sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha''; + url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; + sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha"; }; packageName = "parse-number"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix index 5105ec9923..ae109ef3dc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''parser-combinators''; - version = ''cl-20131111-git''; + baseName = "parser-combinators"; + version = "cl-20131111-git"; - description = ''An implementation of parser combinators for Common Lisp''; + description = "An implementation of parser combinators for Common Lisp"; deps = [ args."alexandria" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz''; - sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds''; + url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; + sha256 = "0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds"; }; packageName = "parser-combinators"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix index d7ac773f49..07d600b3a3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''parser_dot_common-rules''; - version = ''20200715-git''; + baseName = "parser_dot_common-rules"; + version = "20200715-git"; parasites = [ "parser.common-rules/test" ]; - description = ''Provides common parsing rules that are useful in many grammars.''; + description = "Provides common parsing rules that are useful in many grammars."; deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" args."trivial-with-current-source-form" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz''; - sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy''; + url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; + sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy"; }; packageName = "parser.common-rules"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index fe9ccae288..8de944a0c0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''pcall-queue''; - version = ''pcall-0.3''; + baseName = "pcall-queue"; + version = "pcall-0.3"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; - sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; }; packageName = "pcall-queue"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 99e9517e50..085d284451 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''pcall''; - version = ''0.3''; + baseName = "pcall"; + version = "0.3"; parasites = [ "pcall-tests" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; - sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; + sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; }; packageName = "pcall"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 7fa3d43d4b..ef0817fbe7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''plump''; - version = ''20210124-git''; + baseName = "plump"; + version = "20210124-git"; - description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; + description = "An XML / XHTML / HTML parser that aims to be as lenient as possible."; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz''; - sha256 = ''0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm''; + url = "http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz"; + sha256 = "0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm"; }; packageName = "plump"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index 03c541488e..f530d71eb6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''postmodern''; - version = ''20210124-git''; + baseName = "postmodern"; + version = "20210124-git"; parasites = [ "postmodern/tests" ]; - description = ''PostgreSQL programming API''; + description = "PostgreSQL programming API"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."local-time" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz''; - sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc''; + url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; + sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; }; packageName = "postmodern"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index d9146cede1..cf13ad3e4c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''proc-parse''; - version = ''20190813-git''; + baseName = "proc-parse"; + version = "20190813-git"; - description = ''Procedural vector parser''; + description = "Procedural vector parser"; deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz''; - sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j''; + url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; + sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j"; }; packageName = "proc-parse"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix index 21babe8f01..3342d9ac84 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''prove-asdf''; - version = ''prove-20200218-git''; + baseName = "prove-asdf"; + version = "prove-20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "prove-asdf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index c3aa1dcaaf..5bb82db7a9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''prove''; - version = ''20200218-git''; + baseName = "prove"; + version = "20200218-git"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; - sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; + url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; + sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; }; packageName = "prove"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c2..312da100b9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''ptester''; - version = ''20160929-git''; + baseName = "ptester"; + version = "20160929-git"; - description = ''Portable test harness package''; + description = "Portable test harness package"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz''; - sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz''; + url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; + sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz"; }; packageName = "ptester"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index e45802c194..fc5b609ba7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''puri''; - version = ''20201016-git''; + baseName = "puri"; + version = "20201016-git"; parasites = [ "puri/test" ]; - description = ''Portable Universal Resource Indentifier Library''; + description = "Portable Universal Resource Indentifier Library"; deps = [ args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz''; - sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx''; + url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; + sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx"; }; packageName = "puri"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix index ae810d3479..10809743da 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix @@ -1,16 +1,17 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''pythonic-string-reader''; - version = ''20180711-git''; + baseName = "pythonic-string-reader"; + version = "20180711-git"; - description = ''A simple and unintrusive read table modification that allows for -simple string literal definition that doesn't require escaping characters.''; + description = "A simple and unintrusive read table modification that allows for +simple string literal definition that doesn't require escaping characters."; deps = [ args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz''; - sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx''; + url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; + sha256 = "0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx"; }; packageName = "pythonic-string-reader"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 06957e45f8..fca9989ccb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''query-fs''; - version = ''20200610-git''; + baseName = "query-fs"; + version = "20200610-git"; - description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; + description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz''; - sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413''; + url = "http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz"; + sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413"; }; packageName = "query-fs"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 295e216db5..12ea17a349 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''quri''; - version = ''20210228-git''; + baseName = "quri"; + version = "20210228-git"; - description = ''Yet another URI library for Common Lisp''; + description = "Yet another URI library for Common Lisp"; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz''; - sha256 = ''03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g''; + url = "http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz"; + sha256 = "03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g"; }; packageName = "quri"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 25d535176a..503136d756 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''rfc2388''; - version = ''20180831-git''; + baseName = "rfc2388"; + version = "20180831-git"; - description = ''Implementation of RFC 2388''; + description = "Implementation of RFC 2388"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz''; - sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33''; + url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; + sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33"; }; packageName = "rfc2388"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix index b3fc3b0cd2..aab36e3abc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''rove''; - version = ''20200325-git''; + baseName = "rove"; + version = "20200325-git"; - description = ''Yet another testing framework intended to be a successor of Prove''; + description = "Yet another testing framework intended to be a successor of Prove"; deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz''; - sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5''; + url = "http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz"; + sha256 = "0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5"; }; packageName = "rove"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7da..cfc37364ba 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''rt''; - version = ''20101006-git''; + baseName = "rt"; + version = "20101006-git"; - description = ''MIT Regression Tester''; + description = "MIT Regression Tester"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz''; - sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v''; + url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; + sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v"; }; packageName = "rt"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index 7a166a3075..d6ac95810a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''s-sql''; - version = ''postmodern-20210124-git''; + baseName = "s-sql"; + version = "postmodern-20210124-git"; parasites = [ "s-sql/tests" ]; - description = ''Lispy DSL for SQL''; + description = "Lispy DSL for SQL"; deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz''; - sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc''; + url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; + sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; }; packageName = "s-sql"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix index 20b7fb059b..fb69a00154 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''s-sysdeps''; - version = ''20210228-git''; + baseName = "s-sysdeps"; + version = "20210228-git"; - description = ''An abstraction layer over platform dependent functionality''; + description = "An abstraction layer over platform dependent functionality"; deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz''; - sha256 = ''0pybgicif1qavvix9183g4ahjrgcax3qf2ab523cas8l79lr1xkw''; + url = "http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz"; + sha256 = "0pybgicif1qavvix9183g4ahjrgcax3qf2ab523cas8l79lr1xkw"; }; packageName = "s-sysdeps"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix index ec12dde522..260f5a9ff1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''s-xml''; - version = ''20150608-git''; + baseName = "s-xml"; + version = "20150608-git"; parasites = [ "s-xml.examples" "s-xml.test" ]; - description = ''Simple Common Lisp XML Parser''; + description = "Simple Common Lisp XML Parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz''; - sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq''; + url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; + sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq"; }; packageName = "s-xml"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcc..d7b495a40e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,16 +1,17 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''salza2''; - version = ''2.0.9''; + baseName = "salza2"; + version = "2.0.9"; - description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP - data formats''; + description = "Create compressed data in the ZLIB, DEFLATE, or GZIP + data formats"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz''; - sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va''; + url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz"; + sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va"; }; packageName = "salza2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix index 17c8123a51..cab4e8c149 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''serapeum''; - version = ''20210228-git''; + baseName = "serapeum"; + version = "20210228-git"; - description = ''Utilities beyond Alexandria.''; + description = "Utilities beyond Alexandria."; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-features" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz''; - sha256 = ''1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x''; + url = "http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz"; + sha256 = "1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x"; }; packageName = "serapeum"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix index 1f2759cf38..83466bf1d9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''simple-date-time''; - version = ''20160421-git''; + baseName = "simple-date-time"; + version = "20160421-git"; - description = ''date and time library for common lisp''; + description = "date and time library for common lisp"; deps = [ args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz''; - sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h''; + url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; + sha256 = "1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h"; }; packageName = "simple-date-time"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index a9dd27c31b..d861d72ccc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''simple-date''; - version = ''postmodern-20210124-git''; + baseName = "simple-date"; + version = "postmodern-20210124-git"; parasites = [ "simple-date/tests" ]; - description = ''Simple date library that can be used with postmodern''; + description = "Simple date library that can be used with postmodern"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz''; - sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc''; + url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz"; + sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc"; }; packageName = "simple-date"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix index 55d35ba8c0..0c4f1ac861 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''simple-tasks''; - version = ''20190710-git''; + baseName = "simple-tasks"; + version = "20190710-git"; - description = ''A very simple task scheduling framework.''; + description = "A very simple task scheduling framework."; deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz''; - sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3''; + url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz"; + sha256 = "12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3"; }; packageName = "simple-tasks"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 63adab5574..84f59fef7c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''smart-buffer''; - version = ''20160628-git''; + baseName = "smart-buffer"; + version = "20160628-git"; - description = ''Smart octets buffer''; + description = "Smart octets buffer"; deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz''; - sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s''; + url = "http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz"; + sha256 = "1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s"; }; packageName = "smart-buffer"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index a22076facd..af13c59c28 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''split-sequence''; - version = ''v2.0.0''; + baseName = "split-sequence"; + version = "v2.0.0"; parasites = [ "split-sequence/tests" ]; - description = ''Splits a sequence into a list of subsequences - delimited by objects satisfying a test.''; + description = "Splits a sequence into a list of subsequences + delimited by objects satisfying a test."; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz''; - sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba''; + url = "http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz"; + sha256 = "09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba"; }; packageName = "split-sequence"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index ac04ba80a0..8c0773cd45 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''sqlite''; - version = ''cl-20190813-git''; + baseName = "sqlite"; + version = "cl-20190813-git"; - description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.''; + description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine."; deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz''; - sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk''; + url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; + sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk"; }; packageName = "sqlite"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 7a84f07771..d72311b3a1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''static-vectors''; - version = ''v1.8.6''; + baseName = "static-vectors"; + version = "v1.8.6"; parasites = [ "static-vectors/test" ]; - description = ''Create vectors allocated in static memory.''; + description = "Create vectors allocated in static memory."; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz''; - sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc''; + url = "http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz"; + sha256 = "0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc"; }; packageName = "static-vectors"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index df63a5c983..dca0fc4dd9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''stefil''; - version = ''20181210-git''; + baseName = "stefil"; + version = "20181210-git"; parasites = [ "stefil-test" ]; - description = ''Stefil - Simple Test Framework In Lisp''; + description = "Stefil - Simple Test Framework In Lisp"; deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz''; - sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g''; + url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; + sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g"; }; packageName = "stefil"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix index 35f00dc063..b352c476e0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''str''; - version = ''cl-20210124-git''; + baseName = "str"; + version = "cl-20210124-git"; - description = ''Modern, consistent and terse Common Lisp string manipulation library.''; + description = "Modern, consistent and terse Common Lisp string manipulation library."; deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz''; - sha256 = ''07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc''; + url = "http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz"; + sha256 = "07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc"; }; packageName = "str"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 17a56c09b7..05ca089dbf 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''string-case''; - version = ''20180711-git''; + baseName = "string-case"; + version = "20180711-git"; - description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + description = "string-case is a macro that generates specialised decision trees to dispatch on string equality"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz''; - sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z''; + url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; + sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z"; }; packageName = "string-case"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index 90077d10f9..f59a9d34e3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''stumpwm''; - version = ''20210228-git''; + baseName = "stumpwm"; + version = "20210228-git"; - description = ''A tiling, keyboard driven window manager''; + description = "A tiling, keyboard driven window manager"; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz''; - sha256 = ''0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8''; + url = "http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz"; + sha256 = "0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8"; }; packageName = "stumpwm"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 8740dbac81..a0cb5e362c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''swank''; - version = ''slime-v2.26.1''; + baseName = "swank"; + version = "slime-v2.26.1"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2020-12-20/slime-v2.26.1.tgz''; - sha256 = ''12q3la9lwzs01x0ii5vss0i8i78lgyjrn3adr3rs027f4b7386ny''; + url = "http://beta.quicklisp.org/archive/slime/2020-12-20/slime-v2.26.1.tgz"; + sha256 = "12q3la9lwzs01x0ii5vss0i8i78lgyjrn3adr3rs027f4b7386ny"; }; packageName = "swank"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index de11d48c93..3bb8e5fac1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''swap-bytes''; - version = ''v1.2''; + baseName = "swap-bytes"; + version = "v1.2"; parasites = [ "swap-bytes/test" ]; - description = ''Optimized byte-swapping primitives.''; + description = "Optimized byte-swapping primitives."; deps = [ args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz''; - sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8''; + url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; + sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8"; }; packageName = "swap-bytes"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 4bae3cc1ce..51ea4b91e7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,16 +1,17 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''symbol-munger''; - version = ''20150407-git''; + baseName = "symbol-munger"; + version = "20150407-git"; - description = ''Functions to convert between the spacing and - capitalization conventions of various environments''; + description = "Functions to convert between the spacing and + capitalization conventions of various environments"; deps = [ args."alexandria" args."iterate" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz''; - sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6''; + url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz"; + sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6"; }; packageName = "symbol-munger"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix index 67800af432..b8c330cc2f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia''; - version = ''20210228-git''; + baseName = "trivia"; + version = "20210228-git"; - description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix index 60e76ff92c..801781dd5a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_balland2006''; - version = ''trivia-20210228-git''; + baseName = "trivia_dot_balland2006"; + version = "trivia-20210228-git"; - description = ''Optimizer for Trivia based on (Balland 2006)''; + description = "Optimizer for Trivia based on (Balland 2006)"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia.balland2006"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix index 5b7ca4a163..327ac0cdf1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level0''; - version = ''trivia-20210228-git''; + baseName = "trivia_dot_level0"; + version = "trivia-20210228-git"; - description = ''Bootstrapping Pattern Matching Library for implementing Trivia''; + description = "Bootstrapping Pattern Matching Library for implementing Trivia"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia.level0"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix index 6e0f41fcca..eecb4c17ea 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level1''; - version = ''trivia-20210228-git''; + baseName = "trivia_dot_level1"; + version = "trivia-20210228-git"; - description = ''Core patterns of Trivia''; + description = "Core patterns of Trivia"; deps = [ args."alexandria" args."trivia_dot_level0" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia.level1"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix index b9e823c5ec..ec0d99e06b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_level2''; - version = ''trivia-20210228-git''; + baseName = "trivia_dot_level2"; + version = "trivia-20210228-git"; - description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; + description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia.level2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix index a32ad1e2cd..420e4ae305 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_quasiquote''; - version = ''trivia-20210228-git''; + baseName = "trivia_dot_quasiquote"; + version = "trivia-20210228-git"; - description = ''fare-quasiquote extension for trivia''; + description = "fare-quasiquote extension for trivia"; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia.quasiquote"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix index e0bf11c38d..1173a24c8c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivia_dot_trivial''; - version = ''trivia-20210228-git''; + baseName = "trivia_dot_trivial"; + version = "trivia-20210228-git"; - description = ''Base level system of Trivia with a trivial optimizer. + description = "Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, - in order to avoid the circular dependency.''; + in order to avoid the circular dependency."; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz''; - sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6''; + url = "http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz"; + sha256 = "0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6"; }; packageName = "trivia.trivial"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 2d2bc4110d..063551bd79 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-backtrace''; - version = ''20200610-git''; + baseName = "trivial-backtrace"; + version = "20200610-git"; - description = ''trivial-backtrace''; + description = "trivial-backtrace"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz''; - sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks''; + url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz"; + sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks"; }; packageName = "trivial-backtrace"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix index f5495ba691..c7831773a9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-clipboard''; - version = ''20210228-git''; + baseName = "trivial-clipboard"; + version = "20210228-git"; - description = ''trivial-clipboard let access system clipboard.''; + description = "trivial-clipboard let access system clipboard."; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2021-02-28/trivial-clipboard-20210228-git.tgz''; - sha256 = ''1fmxkz97qrjkc320w849r1411f7j2ghf3g9xh5lczcapgjwq8f0l''; + url = "http://beta.quicklisp.org/archive/trivial-clipboard/2021-02-28/trivial-clipboard-20210228-git.tgz"; + sha256 = "1fmxkz97qrjkc320w849r1411f7j2ghf3g9xh5lczcapgjwq8f0l"; }; packageName = "trivial-clipboard"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix index 278ad5b0ac..3b72629fa3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-cltl2''; - version = ''20200325-git''; + baseName = "trivial-cltl2"; + version = "20200325-git"; - description = ''Compatibility package exporting CLtL2 functionality''; + description = "Compatibility package exporting CLtL2 functionality"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz''; - sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys''; + url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz"; + sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys"; }; packageName = "trivial-cltl2"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 714bafa839..272361dadc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-features''; - version = ''20210228-git''; + baseName = "trivial-features"; + version = "20210228-git"; - description = ''Ensures consistent *FEATURES* across multiple CLs.''; + description = "Ensures consistent *FEATURES* across multiple CLs."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz''; - sha256 = ''1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj''; + url = "http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz"; + sha256 = "1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj"; }; packageName = "trivial-features"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix index 892e1d49d5..f37d63b6bb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-file-size''; - version = ''20200427-git''; + baseName = "trivial-file-size"; + version = "20200427-git"; parasites = [ "trivial-file-size/tests" ]; - description = ''Stat a file's size.''; + description = "Stat a file's size."; deps = [ args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz''; - sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa''; + url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz"; + sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa"; }; packageName = "trivial-file-size"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index ce1f75522a..2a180488da 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-garbage''; - version = ''20200925-git''; + baseName = "trivial-garbage"; + version = "20200925-git"; parasites = [ "trivial-garbage/tests" ]; - description = ''Portable finalizers, weak hash-tables and weak pointers.''; + description = "Portable finalizers, weak hash-tables and weak pointers."; deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz''; - sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83''; + url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz"; + sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83"; }; packageName = "trivial-garbage"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 8fba0ff37f..67dba33ed3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-gray-streams''; - version = ''20210124-git''; + baseName = "trivial-gray-streams"; + version = "20210124-git"; - description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz''; - sha256 = ''0swqcw3649279qyn5lc42xqgi13jc4kd7hf3iasf4vfli8lhb3n6''; + url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz"; + sha256 = "0swqcw3649279qyn5lc42xqgi13jc4kd7hf3iasf4vfli8lhb3n6"; }; packageName = "trivial-gray-streams"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index de16d81082..eb2f217f31 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-indent''; - version = ''20191007-git''; + baseName = "trivial-indent"; + version = "20191007-git"; - description = ''A very simple library to allow indentation hints for SWANK.''; + description = "A very simple library to allow indentation hints for SWANK."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz''; - sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv''; + url = "http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz"; + sha256 = "0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv"; }; packageName = "trivial-indent"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix index 473a41063e..ccf4a4e81a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-macroexpand-all''; - version = ''20171023-git''; + baseName = "trivial-macroexpand-all"; + version = "20171023-git"; - description = ''Call each implementation's macroexpand-all equivalent''; + description = "Call each implementation's macroexpand-all equivalent"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz''; - sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm''; + url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; + sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm"; }; packageName = "trivial-macroexpand-all"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix index dc0de9da62..8c5b3afd0e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-main-thread''; - version = ''20190710-git''; + baseName = "trivial-main-thread"; + version = "20190710-git"; - description = ''Compatibility library to run things in the main thread.''; + description = "Compatibility library to run things in the main thread."; deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz''; - sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h''; + url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz"; + sha256 = "1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h"; }; packageName = "trivial-main-thread"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 2e2888444e..0d9ae4a6da 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-mimes''; - version = ''20200715-git''; + baseName = "trivial-mimes"; + version = "20200715-git"; - description = ''Tiny library to detect mime types in files.''; + description = "Tiny library to detect mime types in files."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz''; - sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1''; + url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz"; + sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1"; }; packageName = "trivial-mimes"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix index 9cd37f8072..859f70fe0d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-package-local-nicknames''; - version = ''20200610-git''; + baseName = "trivial-package-local-nicknames"; + version = "20200610-git"; - description = ''Portability library for package-local nicknames''; + description = "Portability library for package-local nicknames"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz''; - sha256 = ''1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5''; + url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz"; + sha256 = "1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5"; }; packageName = "trivial-package-local-nicknames"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64..4c3e920468 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-types''; - version = ''20120407-git''; + baseName = "trivial-types"; + version = "20120407-git"; - description = ''Trivial type definitions''; + description = "Trivial type definitions"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz''; - sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx''; + url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; + sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx"; }; packageName = "trivial-types"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index e01eac48a2..d6b0addde3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-utf-8''; - version = ''20200925-git''; + baseName = "trivial-utf-8"; + version = "20200925-git"; parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ]; - description = ''A small library for doing UTF-8-based input and output.''; + description = "A small library for doing UTF-8-based input and output."; deps = [ args."mgl-pax" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz''; - sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b''; + url = "http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz"; + sha256 = "06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b"; }; packageName = "trivial-utf-8"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix index f3c60a4b47..c3a247e533 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''trivial-with-current-source-form''; - version = ''20200427-git''; + baseName = "trivial-with-current-source-form"; + version = "20200427-git"; - description = ''Helps macro writers produce better errors for macro users''; + description = "Helps macro writers produce better errors for macro users"; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-with-current-source-form/2020-04-27/trivial-with-current-source-form-20200427-git.tgz''; - sha256 = ''05zkj42f071zhg7swfyklg44k0zc893c9li9virkigzmvhids84f''; + url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2020-04-27/trivial-with-current-source-form-20200427-git.tgz"; + sha256 = "05zkj42f071zhg7swfyklg44k0zc893c9li9virkigzmvhids84f"; }; packageName = "trivial-with-current-source-form"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix index e76be59540..b2effb167c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''type-i''; - version = ''20191227-git''; + baseName = "type-i"; + version = "20191227-git"; - description = ''Type Inference Utility on Fundamentally 1-arg Predicates''; + description = "Type Inference Utility on Fundamentally 1-arg Predicates"; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz''; - sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5''; + url = "http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz"; + sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5"; }; packageName = "type-i"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix index 5807ac6b96..bb97636b59 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''uax-15''; - version = ''20210228-git''; + baseName = "uax-15"; + version = "20210228-git"; parasites = [ "uax-15/tests" ]; - description = ''Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)''; + description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)"; deps = [ args."cl-ppcre" args."fiveam" args."split-sequence" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uax-15/2021-02-28/uax-15-20210228-git.tgz''; - sha256 = ''1vf590djzyika6200zqw4mbqrajcmv7g5swydimnvk7xqzpa8ksp''; + url = "http://beta.quicklisp.org/archive/uax-15/2021-02-28/uax-15-20210228-git.tgz"; + sha256 = "1vf590djzyika6200zqw4mbqrajcmv7g5swydimnvk7xqzpa8ksp"; }; packageName = "uax-15"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f..222e2634a4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''uffi''; - version = ''20180228-git''; + baseName = "uffi"; + version = "20180228-git"; - description = ''Universal Foreign Function Library for Common Lisp''; + description = "Universal Foreign Function Library for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz''; - sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479''; + url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; + sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479"; }; packageName = "uffi"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index ab96b03225..b2cd8d4aa6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''uiop''; - version = ''3.3.4''; + baseName = "uiop"; + version = "3.3.4"; - description = ''System lacks description''; + description = "System lacks description"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz''; - sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav''; + url = "http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz"; + sha256 = "0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav"; }; packageName = "uiop"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c45649673..17ac69cafb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''unit-test''; - version = ''20120520-git''; + baseName = "unit-test"; + version = "20120520-git"; - description = ''unit-testing framework for common lisp''; + description = "unit-testing framework for common lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz''; - sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l''; + url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; + sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l"; }; packageName = "unit-test"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix index 7243d5a17e..5cb97238b6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''unix-options''; - version = ''20151031-git''; + baseName = "unix-options"; + version = "20151031-git"; - description = ''Easy to use command line option parser''; + description = "Easy to use command line option parser"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz''; - sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5''; + url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; + sha256 = "0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5"; }; packageName = "unix-options"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix index e89d751dba..759a8f9b31 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''unix-opts''; - version = ''20210124-git''; + baseName = "unix-opts"; + version = "20210124-git"; parasites = [ "unix-opts/tests" ]; - description = ''minimalistic parser of command line arguments''; + description = "minimalistic parser of command line arguments"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz''; - sha256 = ''1gjjav035n6297vgc4wi3i64516b8sdyi0d02q0nwicciwg6mwsn''; + url = "http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz"; + sha256 = "1gjjav035n6297vgc4wi3i64516b8sdyi0d02q0nwicciwg6mwsn"; }; packageName = "unix-opts"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix index 04a09a8ab4..c1b24f691a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''usocket-server''; - version = ''usocket-0.8.3''; + baseName = "usocket-server"; + version = "usocket-0.8.3"; - description = ''Universal socket library for Common Lisp (server side)''; + description = "Universal socket library for Common Lisp (server side)"; deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; - sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; + sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; }; packageName = "usocket-server"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index 6b75384ea1..034f36bda7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''usocket''; - version = ''0.8.3''; + baseName = "usocket"; + version = "0.8.3"; - description = ''Universal socket library for Common Lisp''; + description = "Universal socket library for Common Lisp"; deps = [ args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; - sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; + sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; }; packageName = "usocket"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix index b672d0c2ec..bbaf2de554 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''utilities_dot_print-items''; - version = ''20190813-git''; + baseName = "utilities_dot_print-items"; + version = "20190813-git"; parasites = [ "utilities.print-items/test" ]; - description = ''A protocol for flexible and composable printing.''; + description = "A protocol for flexible and composable printing."; deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz''; - sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2''; + url = "http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz"; + sha256 = "12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2"; }; packageName = "utilities.print-items"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix index 80ff6d9ff7..ecb9aafbb3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''utilities_dot_print-tree''; - version = ''20200325-git''; + baseName = "utilities_dot_print-tree"; + version = "20200325-git"; parasites = [ "utilities.print-tree/test" ]; - description = ''This system provides simple facilities for printing tree structures.''; + description = "This system provides simple facilities for printing tree structures."; deps = [ args."alexandria" args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz''; - sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww''; + url = "http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz"; + sha256 = "1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww"; }; packageName = "utilities.print-tree"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index 43ae799961..32142fcb02 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''uuid''; - version = ''20200715-git''; + baseName = "uuid"; + version = "20200715-git"; - description = ''UUID Generation''; + description = "UUID Generation"; deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz''; - sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0''; + url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; + sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0"; }; packageName = "uuid"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799..39165dc955 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''vom''; - version = ''20160825-git''; + baseName = "vom"; + version = "20160825-git"; - description = ''A tiny logging utility.''; + description = "A tiny logging utility."; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz''; - sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93''; + url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz"; + sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93"; }; packageName = "vom"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 78c2e30d7e..e29626da50 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''woo''; - version = ''20200427-git''; + baseName = "woo"; + version = "20200427-git"; - description = ''An asynchronous HTTP server written in Common Lisp''; + description = "An asynchronous HTTP server written in Common Lisp"; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz''; - sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29''; + url = "http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz"; + sha256 = "1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29"; }; packageName = "woo"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 257ed57df4..6e5800d473 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''wookie''; - version = ''20191130-git''; + baseName = "wookie"; + version = "20191130-git"; - description = ''An evented webserver for Common Lisp.''; + description = "An evented webserver for Common Lisp."; deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz''; - sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2''; + url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz"; + sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2"; }; packageName = "wookie"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 5a1b903942..f44a128dc3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''xembed''; - version = ''clx-20191130-git''; + baseName = "xembed"; + version = "clx-20191130-git"; - description = ''An implementation of the XEMBED protocol that integrates with CLX.''; + description = "An implementation of the XEMBED protocol that integrates with CLX."; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz''; - sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd''; + url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; + sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd"; }; packageName = "xembed"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 4bfc0678f0..34b0476bfb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''xkeyboard''; - version = ''clx-20120811-git''; + baseName = "xkeyboard"; + version = "clx-20120811-git"; parasites = [ "xkeyboard-test" ]; - description = ''XKeyboard is X11 extension for clx of the same name.''; + description = "XKeyboard is X11 extension for clx of the same name."; deps = [ args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz''; - sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n''; + url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; + sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n"; }; packageName = "xkeyboard"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix index 35854cd6b9..a7d23952d8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix @@ -1,18 +1,19 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''xml_dot_location''; - version = ''20200325-git''; + baseName = "xml_dot_location"; + version = "20200325-git"; parasites = [ "xml.location/test" ]; - description = ''This system provides a convenient interface for - manipulating XML data. It is inspired by the xmltio library.''; + description = "This system provides a convenient interface for + manipulating XML data. It is inspired by the xmltio library."; deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz''; - sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx''; + url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; + sha256 = "0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx"; }; packageName = "xml.location"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index c02e6e2481..9dec677b6d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''xmls''; - version = ''3.0.2''; + baseName = "xmls"; + version = "3.0.2"; parasites = [ "xmls/test" "xmls/unit-test" ]; - description = ''System lacks description''; + description = "System lacks description"; deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz''; - sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi''; + url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz"; + sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi"; }; packageName = "xmls"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 3e14a5ba9f..dc47f866e3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''xpath''; - version = ''plexippus-20190521-git''; + baseName = "xpath"; + version = "plexippus-20190521-git"; parasites = [ "xpath/test" ]; - description = ''An implementation of the XML Path Language (XPath) Version 1.0''; + description = "An implementation of the XML Path Language (XPath) Version 1.0"; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz''; - sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa''; + url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; + sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa"; }; packageName = "xpath"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c..364b714433 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''xsubseq''; - version = ''20170830-git''; + baseName = "xsubseq"; + version = "20170830-git"; - description = ''Efficient way to manage "subseq"s in Common Lisp''; + description = "Efficient way to manage \"subseq\"s in Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz''; - sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml''; + url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; + sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml"; }; packageName = "xsubseq"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3..79b49a86be 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''yacc''; - version = ''cl-20101006-darcs''; + baseName = "yacc"; + version = "cl-20101006-darcs"; - description = ''A LALR(1) parser generator for Common Lisp''; + description = "A LALR(1) parser generator for Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz''; - sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7''; + url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz"; + sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7"; }; packageName = "yacc"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index 9f6ac0a84c..aa06097e75 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''yason''; - version = ''v0.7.8''; + baseName = "yason"; + version = "v0.7.8"; - description = ''JSON parser/encoder''; + description = "JSON parser/encoder"; deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz''; - sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1''; + url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz"; + sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1"; }; packageName = "yason"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 61a6a2a925..dece0b5126 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,15 +1,16 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''zpb-ttf''; - version = ''release-1.0.4''; + baseName = "zpb-ttf"; + version = "release-1.0.4"; - description = ''Access TrueType font metrics and outlines from Common Lisp''; + description = "Access TrueType font metrics and outlines from Common Lisp"; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz''; - sha256 = ''186jzhmklby2pkmwv3zxw09qh8023f7w5ng2ql46l6abx146s3ll''; + url = "http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz"; + sha256 = "186jzhmklby2pkmwv3zxw09qh8023f7w5ng2ql46l6abx146s3ll"; }; packageName = "zpb-ttf"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 119648bb03..27eb3c90ed 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -11,6 +11,7 @@ blackbird bordeaux-threads calispel caveman +cl-custom-hash-table cffi cffi-grovel cffi-uffi-compat diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index f96f1a1f55..1e0952aaba 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -3967,6 +3967,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-custom-hash-table" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-custom-hash-table" or (x: {})) + (import ./quicklisp-to-nix-output/cl-custom-hash-table.nix { + inherit fetchurl; + })); + + "caveman" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."caveman" or (x: {})) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb index ac3387d7b6..6b0940ba55 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb @@ -1,17 +1,18 @@ +/* Generated file. */ args @ { fetchurl, ... }: rec { - baseName = ''<% @var filename %>''; - version = ''<% @var version %>'';<% @if parasites %> + baseName = "<% @var filename %>"; + version = "<% @var version %>";<% @if parasites %> parasites = [<% (dolist (p (getf env :parasites)) (format t " \"~A\"" p)) %> ];<% @endif %> - description = ''<% @var description %>''; + description = <%= (format nil "~s" (cl-emb::getf-emb "description")) %>; deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>]; src = fetchurl { - url = ''<% @var url %>''; - sha256 = ''<% @var sha256 %>''; + url = "<% @var url %>"; + sha256 = "<% @var sha256 %>"; }; packageName = "<% @var name %>"; diff --git a/third_party/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix b/third_party/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix deleted file mode 100644 index 38b1df3ca3..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/qmk_firmware/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub -, avrgcc, avrbinutils -, gcc-arm-embedded, gcc-armhf-embedded -, teensy-loader-cli, dfu-programmer, dfu-util }: - -let version = "0.6.144"; - -in stdenv.mkDerivation { - pname = "qmk_firmware"; - inherit version; - src = fetchFromGitHub { - owner = "qmk"; - repo = "qmk_firmware"; - rev = version; - sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn"; - fetchSubmodules = true; - }; - postPatch = '' - substituteInPlace tmk_core/arm_atsam.mk \ - --replace arm-none-eabi arm-none-eabihf - rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk - ''; - buildFlags = [ "all:default" ]; - doCheck = true; - checkTarget = "test:all"; - installPhase = '' - mkdir $out - ''; - NIX_CFLAGS_COMPILE = "-Wno-error"; - nativeBuildInputs = [ - avrgcc - avrbinutils - gcc-arm-embedded - gcc-armhf-embedded - teensy-loader-cli - dfu-programmer - dfu-util - ]; -} diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f74b949a7b..26d6a847b4 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -14,10 +14,14 @@ deployAndroidPackage { patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + # Fix the shebangs of the auto-generated scripts. + substituteInPlace ./build/tools/make_standalone_toolchain.py \ + --replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true - wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + wrapProgram ./build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' + '' # TODO: allow this stuff diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix index 98687262c3..f966e0b90b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "bigstring"; - version = "0.2"; + version = "0.3"; + + useDune2 = true; minimumOCamlVersion = "4.03"; @@ -10,10 +12,11 @@ buildDunePackage rec { owner = "c-cube"; repo = "ocaml-bigstring"; rev = version; - sha256 = "0ypdf29cmwmjm3djr5ygz8ls81dl41a4iz1xx5gbcdpbrdiapb77"; + sha256 = "0bkxwdcswy80f6rmx5wjza92xzq4rdqsb4a9fm8aav8bdqx021n8"; }; - doCheck = true; + # Circular dependency with bigstring-unix + doCheck = false; meta = with lib; { homepage = "https://github.com/c-cube/ocaml-bigstring"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix index 083f00d5d5..33702ca182 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpu/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "cpu"; version = "2.0.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "UnixJunkie"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix index d05d15286b..e114e7d843 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { pname = "crowbar"; version = "0.2"; + useDune2 = true; + src = fetchFromGitHub { owner = "stedolan"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/1.2.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/1.2.nix deleted file mode 100644 index e81202ea58..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/1.2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchurl, buildDunePackage -, checkseum, bigarray-compat, optint -}: - -buildDunePackage rec { - 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 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i"; - }; - - propagatedBuildInputs = [ optint bigarray-compat checkseum ]; - # required hxd version is not available in nixpkgs - doCheck = false; - - meta = { - description = "Pure OCaml implementation of Zlib"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/mirage/decompress"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix index 62fa7cd08c..da075f5c79 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dtoa/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "dtoa"; version = "0.3.2"; + useDune2 = true; + minimumOCamlVersion = "4.02"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gnuplot/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gnuplot/default.nix index d939b884e8..038863aad9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gnuplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gnuplot/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "gnuplot"; version = "0.7"; + useDune2 = true; + minimumOCamlVersion = "4.03"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix index 046c92afca..eacdda27f4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "gsl"; version = "1.24.3"; + useDune2 = true; + minimumOCamlVersion = "4.08"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix index cd95b34fa2..0de997881c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchurl, buildDunePackage, pkg-config +{ pkgs, lib, fetchurl, buildDunePackage, pkg-config, dune-configurator , bigstring, }: @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "hidapi"; version = "1.1.1"; + useDune2 = true; + src = fetchurl { url = "https://github.com/vbmithr/ocaml-hidapi/releases/download/${version}/${pname}-${version}.tbz"; sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; @@ -13,7 +15,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - buildInputs = [ pkgs.hidapi pkg-config ]; + buildInputs = [ pkgs.hidapi pkg-config dune-configurator ]; propagatedBuildInputs = [ bigstring ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix index f7ca279b98..0a846214dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "20200929"; + version = "20210402"; pname = "imagelib"; useDune2 = true; src = fetchurl { - url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/ocaml-imagelib_${version}/imagelib-ocaml-imagelib_${version}.tbz"; - sha256 = "1wyq4xxj0dxwafbcmd7jylsd8w1gbyl7j4ak6jbq1n0ardwmpwca"; + url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; + sha256 = "b3c8ace02b10b36b6c60b3ce3ae0b9109d4a861916ec320c59cc1194f4cc86e3"; }; propagatedBuildInputs = [ decompress stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix index 01b2c813f2..3ddae57e9e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix @@ -5,14 +5,14 @@ buildDunePackage rec { pname = "mimic"; - version = "0.0.1"; + version = "0.0.2"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; - sha256 = "0j4l99sgm5mdmv67vakkz2pw45l6i89bpza88xqkgmskfk50c5pk"; + sha256 = "3ad5af3caa1120ecfdf022de41ba5be8edfbf50270fc99238b82d3d2d6e7c317"; }; # don't install changelogs for other packages @@ -25,7 +25,6 @@ buildDunePackage rec { mirage-flow result rresult - cstruct logs ]; @@ -35,6 +34,7 @@ buildDunePackage rec { alcotest-lwt bigstringaf bigarray-compat + cstruct ke ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix index d0d8661dd7..de8cfd311e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { useDune2 = true; + minimumOCamlVersion = "4.06"; + src = fetchurl { url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz"; sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/freestanding.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/freestanding.nix new file mode 100644 index 0000000000..ef278f1cd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/freestanding.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, mirage-clock +}: + +buildDunePackage { + pname = "mirage-clock-freestanding"; + + inherit (mirage-clock) + version + src + useDune2 + minimumOCamlVersion + ; + + propagatedBuildInputs = [ + mirage-clock + ]; + + meta = mirage-clock.meta // { + description = "Paravirtual implementation of the MirageOS Clock interface"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index ab48e01950..3265413d98 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,14 +1,17 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config }: +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config +, withFreestanding ? false +, ocaml-freestanding +}: buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.10"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc"; + sha256 = "53e0ae90f19651ab7f09156557ea5ec07bce7a52468ec6687471e0333f3e2133"; }; useDune2 = true; @@ -17,12 +20,20 @@ buildDunePackage rec { checkInputs = [ ounit ]; nativeBuildInputs = [ dune-configurator pkg-config ]; - propagatedBuildInputs = [ cstruct eqaf ]; + propagatedBuildInputs = [ + cstruct eqaf + ] ++ lib.optionals withFreestanding [ + ocaml-freestanding + ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; - license = licenses.isc; + license = [ + licenses.isc # default license + licenses.bsd2 # mirage-crypto-rng-mirage + licenses.mit # mirage-crypto-ec + ]; maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix new file mode 100644 index 0000000000..bcd7a1f04f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -0,0 +1,55 @@ +{ lib +, buildDunePackage +, mirage-crypto +, dune-configurator +, pkg-config +, cstruct +, mirage-crypto-rng +, mirage-crypto-pk +, hex +, alcotest +, asn1-combinators +, ppx_deriving_yojson +, ppx_deriving +, yojson +, withFreestanding ? false +, ocaml-freestanding +}: + +buildDunePackage { + pname = "mirage-crypto-ec"; + + inherit (mirage-crypto) + minimumOCamlVersion + src + version + useDune2 + ; + + nativeBuildInputs = [ + pkg-config + dune-configurator + ]; + propagatedBuildInputs = [ + cstruct + mirage-crypto + mirage-crypto-rng + ] ++ lib.optionals withFreestanding [ + ocaml-freestanding + ]; + + doCheck = true; + checkInputs = [ + hex + alcotest + asn1-combinators + ppx_deriving_yojson + ppx_deriving + yojson + mirage-crypto-pk + ]; + + meta = mirage-crypto.meta // { + description = "Elliptic Curve Cryptography with primitives taken from Fiat"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index a777b7b22b..cf72397057 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ solo5 ]; + propagatedBuildInputs = [ solo5 ]; configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix new file mode 100644 index 0000000000..012f3b61ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -0,0 +1,16 @@ +{ buildDunePackage, ocaml_gettext, camomile, ounit, fileutils }: + +buildDunePackage { + pname = "gettext-camomile"; + inherit (ocaml_gettext) src version useDune2; + + propagatedBuildInputs = [ camomile ocaml_gettext ]; + + doCheck = true; + checkInputs = [ ounit fileutils ]; + + meta = ocaml_gettext.meta // { + description = "Internationalization library using camomile (i18n)"; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix index 9638e8e0d4..4ce5087912 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opti/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "opti"; version = "1.0.3"; + useDune2 = true; + minimumOCamlVersion = "4.02"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix index afe9e7d39b..a4378016b4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "parany"; version = "8.0.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "UnixJunkie"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix index 37006bf30d..7adc8482b2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix @@ -1,14 +1,18 @@ -{ lib, buildDunePackage, fetchurl }: +{ lib, buildDunePackage, fetchurl, dune-configurator }: buildDunePackage rec { pname = "parmap"; version = "1.2"; + useDune2 = true; + src = fetchurl { url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; sha256 = "sha256-XUXptzD0eytaypaBQ+EBp4iVFRE6/Y0inS93t/YZrM8="; }; + buildInputs = [ dune-configurator ]; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix new file mode 100644 index 0000000000..1ecf213f6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, fetchurl +, mirage-crypto +, alcotest +}: + +buildDunePackage rec { + pname = "pbkdf"; + version = "1.1.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/abeaumont/ocaml-pbkdf/releases/download/${version}/pbkdf-${version}.tbz"; + sha256 = "e53ed1bd9abf490c858a341c10fb548bc9ad50d4479acdf95a9358a73d042264"; + }; + + propagatedBuildInputs = [ mirage-crypto ]; + checkInputs = [ alcotest ]; + doCheck = true; + + meta = { + description = "Password based key derivation functions (PBKDF) from PKCS#5"; + maintainers = [ lib.maintainers.sternenseemann ]; + license = lib.licenses.bsd2; + homepage = "https://github.com/abeaumont/ocaml-pbkdf"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix index 4278989341..3687f2be99 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix @@ -1,7 +1,11 @@ { lib, fetchFromGitHub, stdenv -, findlib, nonstd, ocaml, ocamlbuild +, findlib, ocaml, ocamlbuild }: +if !lib.versionAtLeast ocaml.version "4.02" +then throw "sosa is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-sosa-${version}"; version = "0.3.0"; @@ -13,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; - buildInputs = [ nonstd ocaml ocamlbuild findlib ]; + buildInputs = [ ocaml ocamlbuild findlib ]; buildPhase = "make build"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix index db6d184655..009b2ce326 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "spacetime_lib"; version = "0.3.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "lpw25"; repo = "spacetime_lib"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix index 80fa01066f..4d9f97480e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl -, bisect_ppx, ppx_cstruct +, bisect_ppx, ppx_cstruct, pkg-config , rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock , mirage-random, mirage-stack, mirage-protocols, mirage-time , ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt @@ -7,22 +7,29 @@ , alcotest, mirage-flow, mirage-vnetif, pcap-format , mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test , lru +, withFreestanding ? false +, ocaml-freestanding }: buildDunePackage rec { pname = "tcpip"; - version = "6.0.0"; + version = "6.1.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s"; + sha256 = "7b3ed2e1ca835c1cc65ac911bcb0de12ebc2b580dd195006bdea2cb387510474"; }; + patches = [ + ./makefile-no-opam.patch + ]; + nativeBuildInputs = [ bisect_ppx ppx_cstruct + pkg-config ]; propagatedBuildInputs = [ @@ -48,6 +55,8 @@ buildDunePackage rec { randomconv ethernet lru + ] ++ lib.optionals withFreestanding [ + ocaml-freestanding ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch new file mode 100644 index 0000000000..1603a1278b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch @@ -0,0 +1,12 @@ +diff --git a/freestanding/Makefile b/freestanding/Makefile +index f22d220d..3e97b4c5 100644 +--- a/freestanding/Makefile ++++ b/freestanding/Makefile +@@ -1,4 +1,6 @@ +-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig ++ifneq (, $(shell command -v opam)) ++ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig ++endif + + EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) + diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Net-CIDR-Lite-prevent-leading-zeroes-ipv4.patch b/third_party/nixpkgs/pkgs/development/perl-modules/Net-CIDR-Lite-prevent-leading-zeroes-ipv4.patch new file mode 100644 index 0000000000..337111b6c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Net-CIDR-Lite-prevent-leading-zeroes-ipv4.patch @@ -0,0 +1,53 @@ +From 734d31aa2f65b69f5558b9b0dd67af0461ca7f80 Mon Sep 17 00:00:00 2001 +From: Stig Palmquist +Date: Tue, 30 Mar 2021 12:13:37 +0200 +Subject: [PATCH] Security: Prevent leading zeroes in ipv4 octets + +https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/ +Related to CVE-2021-28918 +--- + Lite.pm | 2 +- + t/base.t | 13 ++++++++++++- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/Lite.pm b/Lite.pm +index fd6df73..d44f881 100644 +--- a/Lite.pm ++++ b/Lite.pm +@@ -181,7 +181,7 @@ sub _pack_ipv4 { + my @nums = split /\./, shift(), -1; + return unless @nums == 4; + for (@nums) { +- return unless /^\d{1,3}$/ and $_ <= 255; ++ return unless /^\d{1,3}$/ and !/^0\d{1,2}$/ and $_ <= 255; + } + pack("CC*", 0, @nums); + } +diff --git a/t/base.t b/t/base.t +index cf32c5e..292456d 100644 +--- a/t/base.t ++++ b/t/base.t +@@ -8,7 +8,7 @@ + use Test; + use strict; + $|++; +-BEGIN { plan tests => 39 }; ++BEGIN { plan tests => 42 }; + use Net::CIDR::Lite; + ok(1); # If we made it this far, we are ok. + +@@ -133,3 +133,14 @@ ok(join(', ', @list_short_range), '10.0.0.1-2, 10.0.0.5'); + })->list_short_range; + ok(join(', ', @list_short_range), '10.0.0.250-255, 10.0.1.0-20, 10.0.1.22, 10.0.2.250-255, 10.0.3.0-255, 10.0.4.0-255, 10.0.5.0-8'); + ++ ++# Tests for vulnerability: https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/ ++eval { Net::CIDR::Lite->new("010.0.0.0/8") }; ++ok($@=~/Can't determine ip format/); ++ ++my $err_octal = Net::CIDR::Lite->new; ++eval { $err_octal->add("010.0.0.0/8") }; ++ok($@=~/Can't determine ip format/); ++ ++eval { $err_octal->add("10.01.0.0/8") }; ++ok($@=~/Can't determine ip format/); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix index da2feef18c..01a299c89f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -1,47 +1,48 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestrunner , aiohttp , aioresponses -, pytestCheckHook -, pytestcov +, buildPythonPackage +, fetchFromGitHub , pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "accuweather"; - version = "0.1.0"; - + version = "0.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "0jp2x7fgg1shgr1fx296rni00lmjjmjgg141giljzizgd04dwgy3"; + sha256 = "sha256-fjOwa13hxY8/gCM6TCAFWVmEY1oZyqKyc6o3OSsxHpY="; }; postPatch = '' - # we don't have pytest-error-for-skips packaged - substituteInPlace pytest.ini --replace "--error-for-skips" "" + substituteInPlace setup.py \ + --replace "pytest-runner" "" + substituteInPlace pytest.ini \ + --replace "--cov --cov-report term-missing" "" ''; - nativeBuildInputs = [ pytestrunner ]; - - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ aioresponses - pytestCheckHook - pytestcov pytest-asyncio + pytest-error-for-skips + pytestCheckHook ]; + pythonImportsCheck = [ "accuweather" ]; + meta = with lib; { - description = - "Python wrapper for getting weather data from AccuWeather servers."; + description = "Python wrapper for getting weather data from AccuWeather servers"; homepage = "https://github.com/bieniu/accuweather"; license = licenses.asl20; maintainers = with maintainers; [ jamiemagee ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix index e63a26e5f7..97e725bb71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix @@ -10,7 +10,6 @@ , requests-toolbelt , six , werkzeug -, mock , ndg-httpsclient }: @@ -21,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six - werkzeug mock ndg-httpsclient josepy + werkzeug ndg-httpsclient josepy ]; # does not contain any tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix index 0e25ab3581..edd2796eca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix @@ -2,7 +2,6 @@ , asyncssh , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-asyncio , pytest-mock , pytestCheckHook @@ -10,24 +9,18 @@ buildPythonPackage rec { pname = "aioasuswrt"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "kennedyshead"; repo = pname; rev = "V${version}"; - sha256 = "0bzl11224vny4p9vhi1n5s9p04kfavdzs9xkq5qimbisz9sg4ysj"; + sha256 = "1h1qwc7szgrcwiz4q6x4mlf26is20lj1ds5rcb9i611j26656v6d"; }; - 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.py \ + --replace "cryptography==3.3.2" "cryptography" substituteInPlace setup.cfg \ --replace "--cov-report html" "" \ --replace "--cov-report term-missing" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix index 5b27031966..8e2078f521 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix @@ -1,13 +1,18 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, attrs }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, attrs +}: buildPythonPackage rec { pname = "aiorpcx"; - version = "0.18.4"; + version = "0.18.7"; src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "0jpvrkan6w8bpq017m8si7r9hb1pyw3ip4vr1fl2pmi8ngzc1jdy"; + sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7"; }; propagatedBuildInputs = [ attrs ]; @@ -17,9 +22,12 @@ buildPythonPackage rec { # Checks needs internet access doCheck = false; - meta = { + pythonImportsCheck = [ "aiorpcx" ]; + + meta = with lib; { description = "Transport, protocol and framing-independent async RPC client and server implementation"; - license = lib.licenses.mit; homepage = "https://github.com/kyuupichan/aiorpcX"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 058282b4c3..aa5e227ca6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-2igN5mmkXyYpQeAoPAYzhirictuionVMbqifNigEYdw="; + sha256 = "sha256-vlIon+VAHeJiaSIVMEKEpwQC4gXA52vxfEkiQMC9yiw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix index 7bdddb42d4..c204261644 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix @@ -1,9 +1,9 @@ { lib, isPy3k, fetchFromGitHub, buildPythonPackage -, atpublic }: +, attrs, atpublic }: buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.2.1"; + version = "1.4.2"; disabled = !isPy3k; # Release not published to Pypi @@ -11,11 +11,11 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = version; - sha256 = "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7"; + sha256 = "0hbpyns1j1fpvpj7gyb8cz359j7l4hzfqbig74xp4xih59sih0wj"; }; propagatedBuildInputs = [ - atpublic + atpublic attrs ]; # Tests need network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix index e75653fb68..40cb085a17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix @@ -1,29 +1,40 @@ { lib +, aiohttp +, aioresponses +, aiounittest , buildPythonPackage , fetchFromGitHub -, aiohttp , pytestCheckHook }: buildPythonPackage rec { pname = "airly"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ak-ambi"; repo = "python-airly"; rev = "v${version}"; - sha256 = "0an6nbl0i5pahxm6x4z03s9apzgqrw9zf7srjcs0r3y1ppicb4s6"; + sha256 = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI="; }; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + aioresponses + aiounittest + pytestCheckHook + ]; + + preCheck = '' + cd tests + ''; disabledTests = [ "InstallationsLoaderTestCase" "MeasurementsSessionTestCase" ]; + pythonImportsCheck = [ "airly" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index 23899d4901..e404edddbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -4,52 +4,71 @@ , isPy27 , ansible , pyyaml -, setuptools_scm -, ruamel_yaml +, ruamel-yaml , rich , pytestCheckHook -, pytestcov -, pytest_xdist +, pytest-xdist , git +, wcmatch +, enrich +, python }: buildPythonPackage rec { pname = "ansible-lint"; - version = "4.3.7"; - # pip is not able to import version info on raumel.yaml + version = "5.0.2"; disabled = isPy27; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0kwwv9dv9rgsqvp15r2vma7hii9lkkqn0n2irvp5h32cbhzzq4hh"; + sha256 = "sha256-vgt/KqNozTPaON/I19SybBZuo7bbl3Duq5dTBTMlj44="; }; - format = "pyproject"; - - nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pyyaml ansible ruamel_yaml rich ]; - checkInputs = [ pytestCheckHook pytestcov pytest_xdist git ]; - postPatch = '' - patchShebangs bin/ansible-lint - substituteInPlace setup.cfg \ - --replace "setuptools_scm_git_archive>=1.0" "" + substituteInPlace src/ansiblelint/file_utils.py \ + --replace 'raise RuntimeError("Unable to determine file type for %s" % pathex)' 'return "playbook"' ''; - # give a hint to setuptools_scm on package version - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" + buildInputs = [ python ]; + + propagatedBuildInputs = [ ansible enrich pyyaml rich ruamel-yaml wcmatch ]; + + checkInputs = [ pytestCheckHook pytest-xdist git ]; + + preCheck = '' + # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) + export PATH=$PATH:${lib.makeBinPath [ ansible ]} + + # create a working ansible-lint executable + export PATH=$PATH:$PWD/src/ansiblelint + ln -rs src/ansiblelint/__main__.py src/ansiblelint/ansible-lint + patchShebangs src/ansiblelint/__main__.py ''; - checkPhase = '' - pytest -W ignore::DeprecationWarning -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script' - ''; + disabledTests = [ + # requires network + "test_prerun_reqs_v1" + "test_prerun_reqs_v2" + # Assertion error with negative numbers; maybe requieres an ansible update? + "test_negative" + "test_example" + "test_playbook" + "test_included_tasks" + "test_long_line" + + "test_get_yaml_files_umlaut" + "test_run_inside_role_dir" + "test_role_handler_positive" + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; meta = with lib; { - homepage = "https://github.com/ansible/ansible-lint"; + homepage = "https://github.com/ansible-community/ansible-lint"; description = "Best practices checker for Ansible"; license = licenses.mit; - maintainers = [ maintainers.sengaya ]; + maintainers = with maintainers; [ sengaya SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix index a6bb058401..4ee3add12b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, configobj, six, traitsui +, fetchpatch, configobj, six, traitsui , pytestCheckHook, tables, pandas , pythonOlder, importlib-resources }: @@ -13,6 +13,15 @@ buildPythonPackage rec { sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh"; }; + patches = [ + # python39: importlib_resources -> importlib.resources. This patch will be included + # in the next release after 5.1.0. + (fetchpatch { + url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch"; + sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw"; + }) + ]; + propagatedBuildInputs = [ configobj six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix index a6081858af..9a23ebd82a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix @@ -1,21 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pyserial , pytestCheckHook }: buildPythonPackage rec { pname = "aqualogic"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "swilson"; repo = pname; rev = version; - sha256 = "sha256-yxd+A5dsB9gBwVlPNjz+IgDHKTktNky84bWZMhA/xa4="; + sha256 = "sha256-dAC/0OjvrC8J/5pu5vcOKV/WqgkAlz0LuFl0up6FQRM="; }; + patches = [ + (fetchpatch { + name = "allow-iobase-objects.patch"; + url = "https://github.com/swilson/aqualogic/commit/185fe25a86c82c497a55c78914b55ed39f5ca339.patch"; + sha256 = "072jrrsqv86bn3skibjc57111jlpm8pq2503997fl3h4v6ziwdxg"; + }) + ]; + propagatedBuildInputs = [ pyserial ]; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 5f6d68b9ca..a25916bc99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -1,17 +1,26 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml -, pytestCheckHook, pytest-asyncio }: +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, defusedxml +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, python-didl-lite +, pythonOlder +, voluptuous +}: buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.14.15"; + version = "0.16.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "1mr65msdc51wq7326z3q41x79yi9dsmcjrmyzkgj9h9vgpxdk2nw"; + sha256 = "sha256-vgy/zn1Xm7Fm7u/YMe/nJa3tyRNKx/WHz0AHfhFaVKo="; }; propagatedBuildInputs = [ @@ -27,8 +36,10 @@ buildPythonPackage rec { pytest-asyncio ]; + pythonImportsCheck = [ "async_upnp_client" ]; + meta = with lib; { - description = "Asyncio UPnP Client library for Python/asyncio."; + description = "Asyncio UPnP Client library for Python"; homepage = "https://github.com/StevenLooman/async_upnp_client"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index efe4780c0a..2f9cd1a0b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, botocore -, requests, requests-kerberos, click, configparser, fido2, isPy27 }: +{ lib +, botocore +, buildPythonPackage +, click +, configparser +, fetchPypi +, fido2 +, glibcLocales +, isPy27 +, lxml +, mock +, pyopenssl +, pytestCheckHook +, requests +, requests-kerberos +}: buildPythonPackage rec { pname = "aws-adfs"; @@ -12,8 +25,25 @@ buildPythonPackage rec { sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55"; }; + propagatedBuildInputs = [ + botocore + click + configparser + fido2 + lxml + pyopenssl + requests + requests-kerberos + ]; + + checkInputs = [ + glibcLocales + mock + pytestCheckHook + ]; + # Relax version constraint - patchPhase = '' + postPatch = '' sed -i 's/coverage < 4/coverage/' setup.py ''; @@ -23,9 +53,6 @@ buildPythonPackage rec { # Required for python3 tests, along with glibcLocales LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; - propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ]; - pythonImportsCheck = [ "aws_adfs" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix index 707d958bab..b926a1abc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "axis"; - version = "43"; + version = "44"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "1p9yfixsrkw7rxbvgybcb653rbqv0x18wzqkh620g193snm9sgm2"; + sha256 = "sha256-GC8GiDP/QHU+8swe60VFPRx8kSMMHuXjIPEKCja8HPE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_lzma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_lzma/default.nix index 1ebae86dec..bf346f3a3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_lzma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_lzma/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k -, lzma +, xz , python , pythonOlder }: @@ -18,7 +18,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { sha256 = "16d8b68e4d3cd4e6c9ddb059850452946da3914c8a8e197a7f2b0954559f2df4"; }; - buildInputs = [ lzma ]; + buildInputs = [ xz ]; checkPhase = '' ${python.interpreter} test/test_lzma.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 4371c8c8ea..79bcaa91cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "0il2cwnrcvgxx9jkj1xr2caqyza3kqjys3fpmcx7avy04xbf5dbv"; + sha256 = "sha256-c9rKRmGMlYrzVQmUuM9P3c/Jm4QVM2aBRSZ0OkyrPTY="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index b9120d412c..a3e48d20c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -14,7 +14,6 @@ , cramfsswap , sasquatch , squashfsTools -, lzma , matplotlib , nose , pycrypto @@ -32,7 +31,7 @@ buildPythonPackage rec { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index e1733116dd..bf5604e6d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.39"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.41"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-tYFP9ztbj8hgHBtztwZ1gH+c5kcTVi4YOghBWiUW7tQ="; + sha256 = "sha256-2FsOBdfelhabACS3aykr5isB729cqFOlElBjRrgtKrs="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; @@ -35,6 +35,8 @@ buildPythonPackage rec { # Network access doCheck = false; + pythonImportsCheck = [ "boto3" ]; + meta = { homepage = "https://github.com/boto/boto3"; license = lib.licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 3fb30ba8a7..a0555d7f1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , dateutil , jmespath @@ -12,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.39"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.41"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-KFBtI/+pq/VmbCyQnH7cg6ERLNRP506xpJYN9WFTHpg="; + sha256 = "sha256-Y/ZQ/Ja84UHoGUp2HmiQ/qL7puASU676Ma5p8UUBXCE="; }; propagatedBuildInputs = [ @@ -37,9 +38,11 @@ buildPythonPackage rec { # Network access doCheck = false; - meta = { + pythonImportsCheck = [ "botocore" ]; + + meta = with lib; { homepage = "https://github.com/boto/botocore"; - license = "bsd"; + license = licenses.asl20; description = "A low-level interface to a growing number of Amazon Web Services"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix new file mode 100644 index 0000000000..0f8282ae7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: + +buildPythonPackage rec { + pname = "bracex"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-AfcVzQ7XpiLsizIyLnFYE/dXTeUx8Jtw9vOywQ9oJCU="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "bracex" ]; + + meta = with lib; { + description = "Bash style brace expansion for Python"; + homepage = "https://github.com/facelessuser/bracex"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 7ad0b5604f..28b6fccfca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.6.0"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ef19892f99fa497c90684db6d41442e94b2d3b0ed00afe2c574e46d89cb9a89c"; + sha256 = "25a95f95acb7f180b37f8dcf4df7efa84ae0ba6ad9dc4ba0e724e2cc534c3483"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix index 120fd5df12..a160c5ea94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, isPy27 , fetchFromGitHub , pytestCheckHook }: @@ -8,6 +9,8 @@ buildPythonPackage rec { pname = "cachetools"; version = "4.2.1"; + disabled = isPy27; + src = fetchFromGitHub { owner = "tkem"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 129ef932bd..7ae6a3fa0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -3,19 +3,19 @@ , python, runCommand , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface -, dialog, mock, gnureadline -, pytest_xdist, pytest, pytestCheckHook, dateutil +, dialog, gnureadline +, pytest_xdist, pytestCheckHook, dateutil }: buildPythonPackage rec { pname = "certbot"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM="; + sha256 = "1cwhhybj2fjalhhyd184ndn3bid3qib1yy5a93m146cqqgwpw4j6"; }; sourceRoot = "source/${pname}"; @@ -37,16 +37,19 @@ buildPythonPackage rec { zope_interface ]; - buildInputs = [ dialog mock gnureadline ]; + buildInputs = [ dialog gnureadline ]; checkInputs = [ dateutil - pytest pytestCheckHook pytest_xdist ]; - pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; + pytestFlagsArray = [ + "-o cache_dir=$(mktemp -d)" + # See https://github.com/certbot/certbot/issues/8746 + "-W ignore::ResourceWarning" + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index 16c61f2e89..f0b576299b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, freezegun , google-api-core , matplotlib , networkx @@ -14,8 +13,10 @@ , scipy , sortedcontainers , sympy +, tqdm , typing-extensions # test inputs +, freezegun , pytestCheckHook , pytest-asyncio , pytest-benchmark @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.9.1"; + version = "0.10.0"; disabled = pythonOlder "3.6"; @@ -35,42 +36,36 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "0mygvpq7kzga8l1w2jvwv9a2n3akpss45hrx250gdrnqjp6xrw64"; + sha256 = "0xinml44n2lfl0q2lb2apmn69gsszlwim83082f66vyk0gpwd4lr"; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "freezegun~=0.3.15" "freezegun" \ --replace "matplotlib~=3.0" "matplotlib" \ --replace "networkx~=2.4" "networkx" \ --replace "numpy~=1.16" "numpy" \ - --replace "protobuf~=3.12.0" "protobuf" - - # Fix serialize_sympy_constants test by allowing small errors in pi - substituteInPlace cirq/google/arg_func_langs_test.py \ - --replace "'float_value': float(str(np.float32(sympy.pi)))" "'float_value': pytest.approx(float(str(np.float32(sympy.pi))))" + --replace "protobuf~=3.13.0" "protobuf" ''; propagatedBuildInputs = [ - freezegun google-api-core - numpy matplotlib networkx + numpy pandas protobuf requests scipy sortedcontainers sympy + tqdm typing-extensions ]; - doCheck = true; # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here - dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook + freezegun pytest-asyncio pytest-benchmark ply @@ -84,9 +79,7 @@ buildPythonPackage rec { "--ignore=cirq/contrib/" # requires external (unpackaged) python packages, so untested. "--benchmark-disable" # Don't need to run benchmarks when packaging. ]; - disabledTests = [ - "test_convert_to_ion_gates" # fails on some systems due to rounding error, 0.75 != 0.750...2 - ] ++ lib.optionals stdenv.isAarch64 [ + disabledTests = lib.optionals stdenv.isAarch64 [ # Seem to fail due to math issues on aarch64? "expectation_from_wavefunction" "test_single_qubit_op_to_framed_phase_form_output_on_example_case" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 95f2effc04..a5ae90c57e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.1.12"; + version = "0.1.13"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = version; - sha256 = "1q75n84yxv2cb6x7gqyk3vcwkxpq7pni30wgz3d1bk6pmi2pqgw6"; + sha256 = "sha256-KJRfkUyUI0M7HevY4XKOtCvU+SFlsJIl3kTIccWfNmw="; }; propagatedBuildInputs = [ pysha3 setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix index 2a80523a65..21dcffc4a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix @@ -1,61 +1,55 @@ -{ lib, fetchPypi, buildPythonPackage -, nose -, parameterized -, mock -, flake8 -, glibcLocales -, six -, jdatetime -, dateutil -, umalqurra -, pytz -, tzlocal -, regex -, ruamel_yaml -, python +{ lib +, buildPythonPackage , isPy3k +, fetchFromGitHub +, dateutil +, pytz +, regex +, tzlocal +, hijri-converter +, convertdate +, parameterized +, pytestCheckHook +, GitPython +, ruamel_yaml }: buildPythonPackage rec { pname = "dateparser"; version = "1.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "159cc4e01a593706a15cd4e269a0b3345edf3aef8bf9278a57dac8adf5bf1e4a"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "scrapinghub"; + repo = "dateparser"; + rev = "v${version}"; + sha256 = "0i6ci14lqfsqrmaif57dyilrjbxzmbl98hps1b565gkiy1xqmjhl"; }; - checkInputs = [ - flake8 - nose - mock - parameterized - six - glibcLocales - ]; - preCheck ='' - # skip because of missing convertdate module, which is an extra requirement - rm tests/test_jalali.py - ''; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; - - # Strange - # AttributeError: 'module' object has no attribute 'config' - doCheck = false; - propagatedBuildInputs = [ # install_requires dateutil pytz regex tzlocal # extra_requires - jdatetime ruamel_yaml umalqurra + hijri-converter convertdate ]; + checkInputs = [ + parameterized + pytestCheckHook + GitPython + ruamel_yaml + ]; + + # Upstream only runs the tests in tests/ in CI, others use git clone + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "dateparser" ]; + meta = with lib; { description = "Date parsing library designed to parse dates from HTML pages"; homepage = "https://github.com/scrapinghub/dateparser"; license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix index dcad0c3698..e71a532a80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateutil/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, six +}: + buildPythonPackage rec { pname = "python-dateutil"; version = "2.8.1"; @@ -8,19 +14,27 @@ buildPythonPackage rec { sha256 = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ six setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; - checkPhase = '' - py.test dateutil/test - ''; + propagatedBuildInputs = [ six ]; - # Requires fixing + # cyclic dependency: tests need freezegun, which depends on python-dateutil doCheck = false; + pythonImportsCheck = [ + "dateutil.easter" + "dateutil.parser" + "dateutil.relativedelta" + "dateutil.rrule" + "dateutil.tz" + "dateutil.utils" + "dateutil.zoneinfo" + ]; + meta = with lib; { description = "Powerful extensions to the standard datetime module"; - homepage = "https://pypi.python.org/pypi/python-dateutil"; - license = "BSD-style"; + homepage = "https://github.com/dateutil/dateutil/"; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix index eef8d51ae9..0dde3c51c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , zlib -, lzma +, xz }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1xnl80nblysj6dylj4683wgrfa425rkx4dp5k65hvwdns9pw753x"; }; - buildInputs = [ zlib lzma ]; + buildInputs = [ zlib xz ]; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix index db26b089e4..8fba64d0a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.0"; + version = "0.17.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-g82YmlxlBdyNn7KPU+k+J3/P7ABWMMdLXUpXWnCkdpM="; + sha256 = "sha256-5PaIZPwikDmT4kmh0Qfg65gBAUYralmO6a22GtzoB7A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index 9c30606f75..94181def86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.6.0"; + version = "1.7.0"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -17,13 +17,12 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "036prc4iw91qx31zz48hy3b30kn2qnlg68lgrvv2mcvsjxf2gd1l"; + sha256 = "1i5k2qb894rjksn21pk9shash1y7v4138rkk8mqr1a1yvgnr5ibg"; }; propagatedBuildInputs = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ - --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp" \ --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets" '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docloud/default.nix index f1ec269f7c..2c92b32c74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docloud/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , requests +, six }: buildPythonPackage rec { @@ -15,6 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests + six ]; # Pypi's tarball doesn't contain tests. Source not available. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index d69ece809b..ab1d551fea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -1,13 +1,15 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - inflection, - ruamel_yaml, - setuptools_scm, - six, - coreapi, - djangorestframework, +{ lib +, buildPythonPackage +, fetchPypi +, inflection +, ruamel_yaml +, setuptools_scm +, six +, coreapi +, djangorestframework +, pytestCheckHook +, pytest-django +, datadiff }: buildPythonPackage rec { @@ -19,6 +21,11 @@ buildPythonPackage rec { sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a"; }; + postPatch = '' + # https://github.com/axnsan12/drf-yasg/pull/710 + substituteInPlace requirements/base.txt --replace packaging "" + ''; + nativeBuildInputs = [ setuptools_scm ]; @@ -31,6 +38,17 @@ buildPythonPackage rec { djangorestframework ]; + checkInputs = [ + pytestCheckHook + pytest-django + datadiff + ]; + + # ImportError: No module named 'testproj.settings' + doCheck = false; + + pythonImportsCheck = [ "drf_yasg" ]; + meta = with lib; { description = "Generation of Swagger/OpenAPI schemas for Django REST Framework"; homepage = "https://github.com/axnsan12/drf-yasg"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drivelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drivelib/default.nix new file mode 100644 index 0000000000..526e58d143 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/drivelib/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonApplication +, fetchPypi +, expiringdict +, google-auth-httplib2 +, google-auth-oauthlib +, google-api-python-client +}: + +buildPythonApplication rec { + pname = "drivelib"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bz3dn6wm9mlm2w8czwjmhvf3ws3iggr57hvd8z8acl1qafr2g4m"; + }; + + propagatedBuildInputs = [ + google-api-python-client + google-auth-oauthlib + google-auth-httplib2 + expiringdict + ]; + + # tests depend on a google auth token + doCheck = false; + + pythonImportsCheck = [ "drivelib" ]; + + meta = with lib; { + description = "Easy access to the most common Google Drive API calls"; + homepage = "https://pypi.org/project/drivelib/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ gravndal ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix new file mode 100644 index 0000000000..2b81577af2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, setuptools-scm, rich, pytest-mock }: + +buildPythonPackage rec { + pname = "enrich"; + version = "1.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Dpn/V9h/e13vDKeZF+iPuTUaoNUuIo7ji/982FgxX+Q="; + }; + + buildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ rich ]; + + checkInputs = [ pytestCheckHook pytest-mock ]; + + pythonImportsCheck = [ "enrich" ]; + + meta = with lib; { + description = "Enrich adds few missing features to the wonderful rich library"; + homepage = "https://github.com/pycontribs/enrich"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix index 397e573a25..f53184a816 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchPypi, fetchpatch, isPy27 +{ lib, fetchPypi, isPy27 , buildPythonPackage -, traits, apptools -, python, ipykernel, ipython +, traits, apptools, pytestCheckHook +, ipykernel, ipython }: buildPythonPackage rec { pname = "envisage"; - version = "4.9.2"; + version = "5.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd"; + sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic"; }; propagatedBuildInputs = [ traits apptools ]; @@ -21,22 +21,10 @@ buildPythonPackage rec { export HOME=$PWD/HOME ''; - # fix a test failure; should be merged in next release - patches = [ (fetchpatch { - url = "https://github.com/enthought/envisage/pull/248/commits/7b6d2dd615d5cb7455b200eb8f37e030bbf4df9e.patch"; - sha256 = "0a3dmbpxwsn1bkjcjv9v7b751rcmppj6hc9wcgiayg4l9r2nrvyh"; - }) ]; - checkInputs = [ - ipykernel ipython + ipykernel ipython pytestCheckHook ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest - runHook postCheck - ''; - meta = with lib; { description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'"; homepage = "https://github.com/enthought/envisage"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix index 946665add3..9daf9a00bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "exdown"; - version = "0.8.5"; + version = "0.8.6"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1ly67whyfn74nr0dncarf3xbd96hacvzgjihx4ibckkc4h9z46bj"; + sha256 = "sha256-BCn+rkMxQSw/gO+dpzgpYSOqEiooWFzSh7LUYIFr6wE="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix new file mode 100644 index 0000000000..23ca9c1c3f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, dill +, coverage +, coveralls +, mock +, nose +}: + +buildPythonApplication rec { + pname = "expiringdict"; + version = "1.2.1"; + + # use fetchFromGitHub instead of fetchPypi because the test suite of + # the package is not included into the PyPI tarball + src = fetchFromGitHub { + owner = "mailgun"; + repo = pname; + rev = "v${version}"; + sha256 = "07g1vxznmim78bankfl9brr01s31sksdcpwynq1yryh6xw9ri5xs"; + }; + + checkInputs = [ + dill + coverage + coveralls + mock + nose + ]; + + checkPhase = '' + nosetests -v --with-coverage --cover-package=expiringdict + ''; + + pythonImportsCheck = [ "expiringdict" ]; + + meta = with lib; { + description = "Dictionary with auto-expiring values for caching purposes"; + homepage = "https://pypi.org/project/expiringdict/"; + license = licenses.asl20; + maintainers = with maintainers; [ gravndal ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 665bb0c8df..42f1a41062 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -2,6 +2,7 @@ , attrs, click, cligj, click-plugins, six, munch, enum34 , pytest, boto3, mock, giflib, pytz , gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745 +, certifi }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + certifi click cligj click-plugins diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index d22096f914..4182255501 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -1,16 +1,60 @@ -{ lib, fetchPypi, buildPythonPackage, flask, limits }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, flask-restful +, hiro +, limits +, mock +, ordereddict +, pymemcache +, pytestCheckHook +, redis +}: buildPythonPackage rec { pname = "Flask-Limiter"; version = "1.4"; - src = fetchPypi { - inherit pname version; - sha256 = "021279c905a1e24f181377ab3be711be7541734b494f4e6db2b8edeba7601e48"; + src = fetchFromGitHub { + owner = "alisaifee"; + repo = "flask-limiter"; + rev = version; + sha256 = "1k1b4b3s1acphqnar0y5g747bh1y7w35gcl5g819idq2a5vqnass"; }; propagatedBuildInputs = [ flask limits ]; + checkInputs = [ + pytestCheckHook + hiro + mock + redis + flask-restful + pymemcache + ordereddict + ]; + + postPatch = '' + sed -i "/--cov/d" pytest.ini + ''; + + # Some tests requires a local Redis instance + disabledTests = [ + "test_fallback_to_memory" + "test_reset_unsupported" + "test_constructor_arguments_over_config" + "test_fallback_to_memory_config" + "test_fallback_to_memory_backoff_check" + "test_fallback_to_memory_with_global_override" + "test_custom_key_prefix" + "test_redis_request_slower_than_fixed_window" + "test_redis_request_slower_than_moving_window" + "test_custom_key_prefix_with_headers" + ]; + + pythonImportsCheck = [ "flask_limiter" ]; + meta = with lib; { description = "Rate limiting for flask applications"; homepage = "https://flask-limiter.readthedocs.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix new file mode 100644 index 0000000000..54a6ce8662 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, importlib-metadata +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "freebox-api"; + version = "0.0.10"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-yUcHdSHSgWxZl0z7Ue0MestvGhiXkDsxArNoDk0ZkR4="; + }; + + patches = [ + # Switch to poetry-core, https://github.com/hacf-fr/freebox-api/pull/187 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/hacf-fr/freebox-api/commit/07356ac65483bc24fb1ed32612e77f2c2eed0134.patch"; + sha256 = "1zwricrwsqy01pmhrjy41gh4kxb3gki8z8yxlpywd66y7gid547r"; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "freebox_api" ]; + + meta = with lib; { + description = "Python module to interact with the Freebox OS API"; + homepage = "https://github.com/hacf-fr/freebox-api"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index d583de9c07..cf456317f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -13,6 +13,7 @@ , responses , rsa , six +, pyopenssl }: buildPythonPackage rec { @@ -24,7 +25,13 @@ buildPythonPackage rec { sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; }; - propagatedBuildInputs = [ pyasn1-modules cachetools rsa six ]; + propagatedBuildInputs = [ + cachetools + pyasn1-modules + rsa + six + pyopenssl + ]; checkInputs = [ flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix index c74501c621..1965e0d3ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix @@ -1,8 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage -, attrs, boto3, requests, gradient_statsd, terminaltables -, click-completion , click-didyoumean, click-help-colors -, colorama, requests_toolbelt, gradient-utils, halo, progressbar2 -, marshmallow, pyyaml, websocket_client +{ lib +, attrs +, boto3 +, buildPythonPackage +, click-completion +, click-didyoumean +, click-help-colors +, colorama +, fetchPypi +, gradient_statsd +, gradient-utils +, halo +, marshmallow +, progressbar2 +, pyopenssl +, pyyaml +, requests +, requests_toolbelt +, terminaltables +, websocket_client }: buildPythonPackage rec { @@ -21,11 +36,26 @@ buildPythonPackage rec { --replace 'PyYAML==' 'PyYAML>=' \ --replace 'marshmallow<' 'marshmallow>=' \ --replace 'websocket-client==' 'websocket-client>=' - ''; + ''; - propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables - click-completion click-didyoumean click-help-colors requests_toolbelt - colorama gradient-utils halo marshmallow progressbar2 pyyaml websocket_client + propagatedBuildInputs = [ + attrs + boto3 + click-completion + click-didyoumean + click-help-colors + colorama + gradient_statsd + gradient-utils + halo + marshmallow + progressbar2 + pyopenssl + pyyaml + requests + requests_toolbelt + terminaltables + websocket_client ]; # tries to use /homeless-shelter to mimic container usage, etc @@ -33,9 +63,9 @@ buildPythonPackage rec { meta = with lib; { description = "The command line interface for Gradient"; - homepage = "https://github.com/Paperspace/gradient-cli"; - license = licenses.isc; - platforms = platforms.unix; + homepage = "https://github.com/Paperspace/gradient-cli"; + license = licenses.isc; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index 17ac913291..81260110f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir +{ lib, buildPythonPackage, fetchPypi +, django +, memcached +, txamqp +, django_tagging +, gunicorn +, pytz +, pyparsing +, cairocffi +, whisper +, whitenoise +, scandir +, urllib3 +, six }: + buildPythonPackage rec { pname = "graphite-web"; version = "1.1.7"; @@ -15,8 +28,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - django django_tagging whisper pycairo cairocffi - ldap memcached pytz urllib3 scandir + django + memcached + txamqp + django_tagging + gunicorn + pytz + pyparsing + cairocffi + whisper + whitenoise + scandir + urllib3 + six ]; # Carbon-s default installation is /opt/graphite. This env variable ensures @@ -28,6 +52,8 @@ buildPythonPackage rec { --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; + pythonImportsCheck = [ "graphite" ]; + meta = with lib; { homepage = "http://graphiteapp.org/"; description = "Enterprise scalable realtime graphing"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix index 8eefb1f431..b23cfc71e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, numpy -, pytest +, cython, numpy +, pytestCheckHook }: buildPythonPackage rec { - version = "1.9.3"; + version = "2.4.1"; pname = "gsd"; disabled = isPy27; @@ -12,14 +12,18 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "07hw29r2inyp493dia4fx3ysfr1wxi2jb3n9cmwdi0l54s2ahqvf"; + sha256 = "02zxfmqw7a5kz8qjdph9a9961mbkd4haxwwa28yjkxs5hzs5x3c8"; }; + nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytest ]; - checkPhase = '' - pytest + checkInputs = [ pytestCheckHook ]; + preCheck = '' + pushd gsd/test + ''; + postCheck = '' + popd ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index 9d6e479595..55aafc6204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.2.15"; + version = "2021.3.29"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-vHq4DjDh7hBNAK/h/KdzqaEgrG5bg7VQ8fVWuxV7vOg="; + sha256 = "sha256-F5EXwCoXYmFkV0VWT5leIWZU2xH1t6T0LuxodAANS8E="; }; # tests require network connection diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpsig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpsig/default.nix index 30c918d86f..accc731eea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpsig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpsig/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pycryptodome , requests +, six }: buildPythonPackage rec { @@ -15,13 +16,17 @@ buildPythonPackage rec { sha256 = "1rkc3zwsq53rjsmc47335m4viljiwdbmw3y2zry4z70j8q1dbmki"; }; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pycryptodome requests ]; + buildInputs = [ + setuptools-scm + ]; - # Jailbreak pycryptodome - preBuild = '' - substituteInPlace setup.py --replace "==3.4.7" "" - ''; + propagatedBuildInputs = [ + pycryptodome + requests + six + ]; + + pythonImportsCheck = [ "httpsig" ]; meta = with lib; { description = "Sign HTTP requests with secure signatures"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kerberos/default.nix index 7a9ce3aab4..c4772d6065 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kerberos/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, kerberos +, libkrb5 }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c"; }; - nativeBuildInputs = [ kerberos ]; + nativeBuildInputs = [ libkrb5 ]; # No tests in archive doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix index 4bead99619..0b4c24afa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "dfc6aef6760ea9a9620577e01540617678d78cab3111a0f03e8b9f987d0f08ca"; + sha256 = "16aa47240add6badd933a0b27576f3c090d7469177dc941e3ece05ca88123199"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index fd8c4da638..ed6e7755bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.17"; + version = "0.3.18"; # Some files for tests missing from PyPi # https://github.com/Instagram/LibCST/issues/331 @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mlSeB9OjCiUVYwcPYNrQdlfcj9DV/+wqVWt91uFsQsU="; + sha256 = "sha256-19yGaKBLpGASSPv/aSX0kx9lh2JxKExHJDKKtuBbuqI="; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index f8ddac600a..7ed7a0ff32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "5.1.1"; + version = "5.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "release-${version}"; - sha256 = "1a3qrl6w76ayqkl1knaz5ai0brrzpjfdk33lyb1n1p7gnc73nhlr"; + sha256 = "16k5vcqpd9r7mm1cg9khzba42rcxs491h8gk2klymav249yzrwk7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix index 998f0a58b2..afdab1194b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix @@ -4,31 +4,32 @@ , appdirs , argcomplete , colorama -, gnugrep +, nose2 +, semver }: buildPythonPackage rec { pname = "milc"; - version = "1.0.10"; + version = "1.3.0"; src = fetchFromGitHub { owner = "clueboard"; repo = "milc"; rev = version; - sha256 = "04mk057b6jh0k4maqkg80kpilxak9r7vlr9xqwzczh2gs3g2x573"; + sha256 = "sha256-koyOBz+pB/vkTHOR1p77ACO11/ULDIBzqsszUUpnE88="; }; - checkInputs = [ gnugrep ]; propagatedBuildInputs = [ appdirs argcomplete colorama ]; - # Upstream has a nose2 test suite that runs this hello script in a handful of - # ways, but it's not in setup.py and makes assumptions about relative paths in - # the src repo, so just sanity-check basic functionality. + checkInputs = [ nose2 semver ]; + checkPhase = '' - patchShebangs ./hello - ./hello | grep "Hello, World" + patchShebangs example hello + nose2 ''; + pythonImportsCheck = [ "milc" ]; + meta = with lib; { description = "An Opinionated Batteries-Included Python 3 CLI Framework"; homepage = "https://milc.clueboard.co"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix index 00ea5b06c6..09389f7cf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -8,6 +8,7 @@ , pytz , pytestCheckHook , urllib3 +, certifi }: buildPythonPackage rec { @@ -26,6 +27,7 @@ buildPythonPackage rec { python-dateutil pytz urllib3 + certifi ]; checkInputs = [ faker mock nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix index 74c214d923..2f26cc0c86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.6.0"; + version = "8.7.0"; src = fetchPypi { inherit pname version; - sha256 = "b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"; + sha256 = "c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"; }; checkInputs = [ nose ]; @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = { homepage = "https://more-itertools.readthedocs.org"; + changelog = "https://more-itertools.readthedocs.io/en/stable/versions.html"; description = "Expansion of the itertools module"; license = lib.licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index 69178edb69..6c6ea7b7b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchPypi, buildPythonApplication, protobuf }: +{ lib, fetchPypi, buildPythonApplication, protobuf, pythonOlder }: buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.23"; + version = "2.4"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; + sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix index 080734bd25..d56fccde05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage +, cryptography , fetchFromGitHub , mock -, pytest +, pytestCheckHook , requests -, unittest2 , six }: @@ -19,13 +19,18 @@ buildPythonPackage rec { sha256 = "00dpf5bfsy07frsjihv1k10zmwcyq4bvkilbxha7h6nlwpcm2409"; }; - checkInputs = [ mock pytest requests unittest2 ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + cryptography + six + ]; - # Functional tests require networking - checkPhase = '' - py.test --ignore=tests/functional/test_iis.py - ''; + checkInputs = [ + mock + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ "ntlm_auth" ]; meta = with lib; { description = "Calculates NTLM Authentication codes"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix index 0a747a7576..a261c8c1e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix @@ -5,7 +5,7 @@ , six , pytestCheckHook , pretend -, flit-core +, setuptools }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + setuptools ]; propagatedBuildInputs = [ pyparsing six ]; @@ -29,10 +29,6 @@ buildPythonPackage rec { pretend ]; - checkPhase = '' - py.test tests - ''; - # Prevent circular dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix index 37f0a13599..c28a009016 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix @@ -11,16 +11,22 @@ buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-XJnrrpU0x2Axu7W4G3oDTjSJuqEyh3C/0Aga5D0gw9k="; + sha256 = "sha256-k2om2LjkFRCT53ECPAJEztCiMdz4fF5eoipVUvSoyGo="; fetchSubmodules = true; }; + patches = [ + # Subset of https://github.com/privacyidea/privacyidea/commit/359db6dd10212b8a210e0a83536e92e9e796a1f8, + # fixes app context errors in tests. Can be removed on the next bump. + ./fix-tests.patch + ]; + propagatedBuildInputs = [ cryptography pyrad pymysql python-dateutil flask-versioned flask_script defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow @@ -36,6 +42,7 @@ buildPythonPackage rec { "AESHardwareSecurityModuleTestCase" "test_01_cert_request" "test_01_loading_scripts" + "test_02_api_push_poll" "test_02_cert_enrolled" "test_02_enroll_rights" "test_02_get_resolvers" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/fix-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/fix-tests.patch new file mode 100644 index 0000000000..67c22d2052 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/fix-tests.patch @@ -0,0 +1,28 @@ +diff --git a/privacyidea/lib/resolvers/LDAPIdResolver.py b/privacyidea/lib/resolvers/LDAPIdResolver.py +index ae9d87764..cfc609931 100644 +--- a/privacyidea/lib/resolvers/LDAPIdResolver.py ++++ b/privacyidea/lib/resolvers/LDAPIdResolver.py +@@ -97,11 +97,6 @@ + SERVERPOOL_ROUNDS = 2 + # The number of seconds a non-responding server is removed from the server pool + SERVERPOOL_SKIP = 30 +-# The number of seconds that ldap3 waits if no server is left in the pool, before +-# starting the next round +-pooling_loop_timeout = get_app_config_value("PI_LDAP_POOLING_LOOP_TIMEOUT", 10) +-log.info("Setting system wide POOLING_LOOP_TIMEOUT to {0!s}.".format(pooling_loop_timeout)) +-ldap3.set_config_parameter("POOLING_LOOP_TIMEOUT", pooling_loop_timeout) + + # 1 sec == 10^9 nano secs == 10^7 * (100 nano secs) + MS_AD_MULTIPLYER = 10 ** 7 +@@ -314,6 +309,11 @@ def __init__(self): + self.serverpool_rounds = SERVERPOOL_ROUNDS + self.serverpool_skip = SERVERPOOL_SKIP + self.serverpool = None ++ # The number of seconds that ldap3 waits if no server is left in the pool, before ++ # starting the next round ++ pooling_loop_timeout = get_app_config_value("PI_LDAP_POOLING_LOOP_TIMEOUT", 10) ++ log.info("Setting system wide POOLING_LOOP_TIMEOUT to {0!s}.".format(pooling_loop_timeout)) ++ ldap3.set_config_parameter("POOLING_LOOP_TIMEOUT", pooling_loop_timeout) + + def checkPass(self, uid, password): + """ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix index 68668812fc..403f0c0979 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix @@ -1,41 +1,35 @@ { buildPythonPackage -, fetchPypi +, fetchFromGitHub , lib - -, coveralls -, gevent +, six +, pytestCheckHook , mock , pytest-asyncio -, pytest-benchmark -, pytestcov -, six }: buildPythonPackage rec { pname = "promise"; - version = "2.3"; + version = "2.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1l4kknj97dj5pxfpsz3ln78x9a843561c740b1m4pfi3qlvq7lfz"; + src = fetchFromGitHub { + owner = "syrusakbary"; + repo = "promise"; + rev = "v${version}"; + sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; }; - patchPhase = '' - substituteInPlace setup.py \ - --replace '"futures",' "" - ''; - propagatedBuildInputs = [ - gevent six ]; checkInputs = [ - coveralls + pytestCheckHook mock pytest-asyncio - pytest-benchmark - pytestcov + ]; + + disabledTestPaths = [ + "tests/test_benchmark.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index 4784dcdfa2..120d5215b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.13.0"; + version = "1.18.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1i5jjnwpd288378h37zads08h695iwmhxm0sxbr3ln6aax97rdb1"; + sha256 = "sha256-z8RUdMftoP48S57KJUISTyoP9VQyQr7GHo0IvOD1vUg="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix index e77c6dda84..961b00e153 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,29 +1,19 @@ -{ buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytest, isPy3k }: +{ buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytestCheckHook, asn1crypto }: buildPythonPackage rec { - version = "0.3.24"; + version = "0.3.26"; pname = "pyaxmlparser"; - # the PyPI tarball doesn't ship tests. src = fetchFromGitHub { owner = "appknox"; repo = pname; rev = "v${version}"; - sha256 = "0fys26p7xhbnbdzp80zm6n3mragp38p08nyrsnilfgnlpi6rjpg0"; + sha256 = "sha256-wD0rN00q4ipKnKubptrgrjNwkBpqsA+ix2xedOOr8Yg="; }; - disabled = !isPy3k; + propagatedBuildInputs = [ asn1crypto click lxml ]; - postPatch = '' - substituteInPlace setup.py --replace "click==6.7" "click" - ''; - - propagatedBuildInputs = [ lxml click ]; - - checkInputs = [ pytest ]; - checkPhase = '' - py.test tests/ - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index b2cf038f79..73d989468c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "77"; + version = "78"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "0qpipw3si3a23c3nafagfx3zl3v481ha8yakcz1d42mbwsc6hkk4"; + sha256 = "sha256-uIRuLNGFX7gq59/ntfks9pECiGkX7jjKh2jmjxFRcv4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix index 258c97a3c1..ef9a7f1368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "09igdym2qj2fvfcazbz25qybmgz7ccrn25xn3havfkdkka0z0i3p"; }; - doCheck = stdenv.is64bit && !stdenv.isDarwin; + doCheck = stdenv.hostPlatform.system == "x86_64-linux"; checkPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index 22290695cc..ade4c01833 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "20.12.1"; + version = "21.3.0"; # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "17yl67dgw75dghljcfwzblm11kqnh6sxf47w62mxz86aq9zrvcxd"; + sha256 = "sha256-2vW4BN5qwJZYQ8FU3bpSA2v1dX6TOhcHDbHRMDPoRAs="; }; propagatedBuildInputs = [ @@ -32,7 +32,6 @@ buildPythonPackage rec { checkInputs = [ aresponses - awesomeversion pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix new file mode 100644 index 0000000000..7aa5bebfaa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -0,0 +1,43 @@ +{ lib +, authlib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "pylitterbot"; + version = "2021.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "natekspencer"; + repo = pname; + rev = version; + sha256 = "sha256-w2iyzCYoma8zQsXGIQnpgijDHNqmlvCnbeyF7PmLz9c="; + }; + + propagatedBuildInputs = [ + authlib + httpx + pytz + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pylitterbot" ]; + + meta = with lib; { + description = "Python package for controlling a Litter-Robot"; + homepage = "https://github.com/natekspencer/pylitterbot"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix new file mode 100644 index 0000000000..d0089e8edb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pymemcache"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "pinterest"; + repo = pname; + rev = "v${version}"; + sha256 = "0xkw76y4059jg2a902wlpk6psyh2g4x6j6vlj9gzd5vqb7ihg2y7"; + }; + + checkInputs = [ + future + mock + pytestCheckHook + ]; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + disabledTests = [ + # python-memcached is not available (last release in 2017) + "TestClientSocketConnect" + ]; + + pythonImportsCheck = [ "pymemcache" ]; + + meta = with lib; { + description = "Python memcached client"; + homepage = "https://pymemcache.readthedocs.io/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix index 44e884dab8..9bdf4885dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynanoleaf"; - version = "0.0.7"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "7d212f35eac9d94248858ec63ca63545ea7fce1cdda11ae5878f4d4d74f055d0"; + sha256 = "sha256-BiLJgsey7kIIeN5+CKKnrTB2bSKMNEbeMLwGi2LRLcg="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix index 77308a1966..192827566d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm"; + sha256 = "sha256-xYwnv30I0+CAx4QODSeMNhdlM2NuM8v4J3rx99NdYCc="; }; propagatedBuildInputs = [ @@ -32,14 +32,22 @@ buildPythonPackage rec { disabledTests = [ # Some tests needs network capabilities "test_str_types_empty" + "test_associate_reject" "TestEchoSCP" "TestEchoSCPCLI" + "TestFindSCP" + "TestFindSCPCLI" + "TestGetSCP" + "TestGetSCPCLI" + "TestMoveSCP" + "TestMoveSCPCLI" + "TestQRGetServiceClass" + "TestQRMoveServiceClass" "TestStoreSCP" "TestStoreSCPCLI" "TestStoreSCU" "TestStoreSCUCLI" - "TestQRGetServiceClass" - "TestQRMoveServiceClass" + "TestState" ]; pythonImportsCheck = [ "pynetdicom" ]; @@ -49,7 +57,7 @@ buildPythonPackage rec { homepage = "https://github.com/pydicom/pynetdicom"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - # Tests are not passing on Darwin, thus it's assumed that it doesn't work - broken = stdenv.isDarwin; + # Tests are not passing on Darwin/Aarch64, thus it's assumed that it doesn't work + broken = stdenv.isDarwin || stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index 577f00fd11..6bd3600360 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, pythonOlder, isPyPy }: +, nose, shapely, pythonOlder, isPyPy, lz4 }: buildPythonPackage rec { pname = "pyosmium"; - version = "3.1.0"; + version = "3.1.3"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,11 +12,11 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h"; + sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 ]; + buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; preBuild = "cd .."; @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for libosmium"; homepage = "https://osmcode.org/pyosmium"; + changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix index 2f40a29733..31e01e83db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix @@ -7,7 +7,7 @@ , cython , htslib , libdeflate -, lzma +, xz , pytest , samtools , zlib @@ -33,7 +33,7 @@ buildPythonPackage rec { curl cython libdeflate - lzma + xz zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix index ceba7489e8..626f55fc92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.17"; + version = "0.2.18"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "00274fbclj5kmwxi2bfx4913r4l0y8qvkfcc9d7ryalvf8jq24k6"; + sha256 = "sha256-DnRtKr8aGZ6rcN/wTpcFNaI+EJm07nObfWyBpLkQF38="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index fdf350bd37..704f3c44c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -3,12 +3,12 @@ , fetchFromGitHub , isPy3k , xmltodict -, requests , ifaddr +, requests -# Test dependencies -, pytest, pylint, flake8, graphviz -, mock, sphinx, sphinx_rtd_theme + # Test dependencies +, pytestCheckHook +, mock , requests-mock }: @@ -26,17 +26,17 @@ buildPythonPackage rec { sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg"; }; - propagatedBuildInputs = [ xmltodict requests ifaddr ]; + propagatedBuildInputs = [ ifaddr requests xmltodict ]; checkInputs = [ - pytest pylint flake8 graphviz - mock sphinx sphinx_rtd_theme + pytestCheckHook + mock requests-mock ]; - checkPhase = '' - pytest --deselect=tests/test_discovery.py::TestDiscover::test_discover - ''; + disabledTests = [ + "test_desc_from_uri" # test requires network access + ]; meta = { homepage = "https://github.com/amelchio/pysonos"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index 39fab3e7bf..c0ae2be9e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -3,17 +3,17 @@ buildPythonPackage rec { pname = "pystray"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - sha256 = "sha256-/dU+jwe/3qhypq7e5tawhJKzSryW7EIbmrpP+VLDvHA="; + sha256 = "sha256-da2ZkehyXrxW5LdMR3K5AEQhiCpx8ygn6eswTC8fsRo="; }; - propagatedBuildInputs = [ pillow xlib six ]; nativeBuildInputs = [ sphinx ]; + propagatedBuildInputs = [ pillow xlib six ]; checkInputs = [ xvfb_run ]; checkPhase = '' @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/moses-palmer/pystray"; description = "This library allows you to create a system tray icon"; - license = licenses.lgpl3; + license = with licenses; [ gpl3Only lgpl3Only ]; platforms = platforms.linux; maintainers = with maintainers; [ jojosch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix new file mode 100644 index 0000000000..39d1116f0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, defusedxml +, fetchFromGitHub +, marshmallow +, pytest-datafiles +, pytest-vcr +, pytestCheckHook +, python-box +, python-dateutil +, requests +, requests-pkcs12 +, responses +, restfly +, semver +}: + +buildPythonPackage rec { + pname = "pytenable"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "tenable"; + repo = "pyTenable"; + rev = version; + sha256 = "12x0w1c4blm73ixv07w90jkydl7d8dx5l27ih9vc1yv9v2zzb53k"; + }; + + propagatedBuildInputs = [ + semver + ]; + + buildInputs = [ + defusedxml + marshmallow + python-box + python-dateutil + requests + requests-pkcs12 + restfly + ]; + + checkInputs = [ + responses + pytest-datafiles + pytest-vcr + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests that requires a Docker container + "test_uploads_docker_push_name_typeerror" + "test_uploads_docker_push_tag_typeerror" + "test_uploads_docker_push_cs_name_typeerror" + "test_uploads_docker_push_cs_tag_typeerror" + ]; + + pythonImportsCheck = [ "tenable" ]; + + meta = with lib; { + description = "Python library for the Tenable.io and TenableSC API"; + homepage = "https://github.com/tenable/pyTenable"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix index fad9a70af0..4e45477c8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -9,7 +9,9 @@ buildPythonPackage rec { sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; }; - propagatedBuildInputs = [ pytest aiohttp ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ aiohttp ]; # There are no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 4ca6bdac6e..25d5aa3054 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -21,10 +21,12 @@ buildPythonPackage rec { sed -i "s/'setuptools-markdown'//g" setup.py ''; + buildInputs = [ pytest ]; + # requires pandoc < 2.0 # buildInputs = [ setuptools-markdown ]; checkInputs = [ mock ]; - propagatedBuildInputs = [ ansible pytest ]; + propagatedBuildInputs = [ ansible ]; # tests not included with release, even on github doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix index 8b1de360f4..5c6f9cf2b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -16,10 +16,11 @@ buildPythonPackage rec { sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy six - pytest ]; # The tests requires astropy, which itself requires diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix index 4b40280ed7..963e621986 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -31,8 +31,7 @@ buildPythonPackage rec { }) ]; - - propagatedBuildInputs = [ + buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix index ae3bc04d0b..5d5a0de447 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix @@ -25,9 +25,10 @@ buildPythonPackage rec { setuptools_scm ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ hypothesis - pytest pytest-astropy-header pytest-doctestplus pytest-filter-subpackage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index 83757c2e16..e71b3e7350 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -22,7 +22,9 @@ buildPythonPackage rec { sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz"; }; - propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ glob2 Mako parse parse-type py six ]; # Tests require extra dependencies checkInputs = [ execnet mock pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix index eedbbc274f..b84b42e351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj"; }; - propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ]; meta = { description = "Py.test fixture for benchmarking code"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix index 6f23c00baf..629b4292f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ black pytest toml ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ black toml ]; # does not contain tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix index 4c3e9dd96f..a772954587 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s"; }; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index 0c23a907cb..887fe7fe7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -19,8 +19,9 @@ buildPythonPackage rec { sha256 = "197nvlqlyfrqpy5lrkmfh1ywpr6j9zipxl9d7syg2a2n7jz3a8rj"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest click ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index 6e243b55bb..fc6b716397 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index c9c373a275..bf8dc9f8df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -17,10 +17,11 @@ buildPythonPackage rec { sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ six numpy - pytest ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix index e63b7329c9..39d6bc127e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -21,10 +21,11 @@ buildPythonPackage rec { sha256 = "0v6b4ly0p8nknpnp3f4dbslfsifzzjx2vv27rfylx04kzdhg4m9p"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ factory_boy inflection - pytest ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 6caf4d9c77..67f759cb59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -21,8 +21,9 @@ buildPythonPackage rec { setuptools_scm ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest pytest-doctestplus pytestcov pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix index 805c19751e..e016b68837 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix @@ -15,8 +15,9 @@ buildPythonPackage rec { sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pyflakes ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ pytest pyflakes ]; # no longer passes doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix index 7b459b4a29..e55d98ce46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix @@ -12,8 +12,9 @@ buildPythonPackage rec { doCheck = false; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest flask werkzeug ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix index 1b09d6863b..4df30e3f19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pytest pytest-metadata ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pytest-metadata ]; meta = with lib; { description = "Plugin for generating HTML reports"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index 508b7b7781..d6f30486f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -18,9 +18,10 @@ buildPythonPackage rec { sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ httpx - pytest ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix index f7766003be..1a03ec2f91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; meta = with lib; { description = "Plugin for accessing test session metadata"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix index 9062284d5d..370416c4aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix @@ -18,7 +18,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pytest mypy filelock ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ mypy filelock ]; # does not contain tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix index bb7bdf03d0..baa5438dfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -20,8 +20,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest psutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix index cde0554d4b..8e10cd4f58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "9c9e4f1b060414c642e88ad98ca60f1fd37937debd704bd8f4a2ef8e08b9cb6d"; }; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; checkInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix index e35d2ebc73..16a1fb92dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -21,8 +21,9 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest pylint six toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pythonpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pythonpath/default.nix index 4194b7bd0e..117471aa8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pythonpath/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0qhxh0z2b3p52v3i0za9mrmjnb1nlvvyi2g23rf88b3xrrm59z33"; }; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix index 201da93b01..c91c3eae4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix index d84bb3c9ac..d95af8651f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-random-order/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; meta = with lib; { homepage = "https://github.com/jbasko/pytest-random-order"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix index 94bc02159b..fb91f46132 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -14,9 +14,10 @@ buildPythonPackage rec { sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ six - pytest ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 1bd91fe70f..b0b0e2372f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { sha256 = "1cb11a17fc121b3918414eb5eaf314ee325f2e693ac7cb3f6abf7560790827f2"; }; - checkInputs = [ mock pytest ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest ]; + checkInputs = [ mock pytest ]; checkPhase = '' py.test test_pytest_rerunfailures.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix index e2353c4840..84330cfd62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp , async_generator , buildPythonPackage , doCheck ? true @@ -21,7 +22,10 @@ buildPythonPackage rec { sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ + aiohttp async_generator httpx pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix index 761fe1d5d5..7ab175a893 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix @@ -25,10 +25,11 @@ buildPythonPackage rec { toml ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ requests psutil - pytest zc_lockfile ] ++ lib.optional (!isPy3k) subprocess32; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix index 9d088e44f8..0483063c53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; }; + buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; - nativeBuildInputs = [ pytest ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index d57c7f66c2..f38f395432 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ packaging pytest ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ packaging ]; # pypi does not contain tests and GitHub archive is not supported because setuptools-scm can't detect the version doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix index dcfa203601..05f632d39b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1jbzkyp4xki81h01yl4vg3nrg9b6shsk1ryrmkaslffyhrqnj8zh"; }; - propagatedBuildInputs = [ + buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix index d1f271ea2b..953e56ae0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix @@ -16,9 +16,10 @@ buildPythonPackage rec { sha256 = "b1b2186b0a72aada6859bea2a5764145e3aaa2c1cfbb23c3a19b5f7b697563d3"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ termcolor - pytest packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix index 658ca7122f..bd1ce2a597 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix @@ -17,7 +17,9 @@ buildPythonPackage rec { # package has no tests doCheck = false; - propagatedBuildInputs = [ pytest tornado ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ tornado ]; meta = with lib; { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix index be1e76d21e..f037ab86d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -15,8 +15,9 @@ buildPythonPackage rec { sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest tornado ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix index 7bf05013f2..a9327e2b23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix @@ -13,11 +13,12 @@ buildPythonPackage rec { sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ trio async_generator outcome - pytest ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix index 19e1091c8c..789af67694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sha256 = "cee2320becc5625050ab221b8f38533e636651a24644612f4726891fdf1f1847"; }; - propagatedBuildInputs = [ greenlet pytest decorator ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ greenlet decorator ]; meta = with lib; { description = "A twisted plugin for py.test"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix index 119f3021b4..3887261ba5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix @@ -16,8 +16,9 @@ buildPythonPackage rec { sha256 = "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest vcrpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-warnings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-warnings/default.nix index 600ffbfdc7..d088bde8b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-warnings/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5939f76fe04ad18297e53af0c9fb38aca1ec74db807bd40ad72733603adbbc7d"; }; - propagatedBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; meta = { description = "Plugin to list Python warnings in pytest report"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix index 0088bf45e4..077b3eca6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9"; }; - propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ colorama docopt watchdog ]; # No Tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix index 124adb8b2a..6e557a7adc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -14,7 +14,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ psutil pytest ]; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ psutil ]; # Remove test QoL package from install_requires postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix index 64078d68a8..c3dabe7f6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -16,8 +16,9 @@ buildPythonPackage rec { sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"; }; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ - pytest virtual-display ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix index 8489247399..b676a7a3de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix @@ -2,7 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-awair"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,10 +20,10 @@ buildPythonPackage rec { owner = "ahayworth"; repo = "python_awair"; rev = version; - sha256 = "1fqjigc1a0lr9q6bjjq3j8pa39wg1cbkb0l67w94a0i4dkdfri8r"; + sha256 = "sha256-5+s1aSvt+rXyumvf/qZ58Uvmq0p45mu23Djbwgih3qI="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix new file mode 100644 index 0000000000..cb176109fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, msgpack +, pytestCheckHook +, pythonOlder +, pyyaml +, ruamel_yaml +, toml +}: + +buildPythonPackage rec { + pname = "python-box"; + version = "5.3.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "cdgriffith"; + repo = "Box"; + rev = version; + sha256 = "0fhmkjdcacpwyg7fajqfvnv3n9xd9rxjdpvi8z3j73a1gls36gf4"; + }; + + propagatedBuildInputs = [ + msgpack + pyyaml + ruamel_yaml + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "box" ]; + + meta = with lib; { + description = "Python dictionaries with advanced dot notation access"; + homepage = "https://github.com/cdgriffith/Box"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix index edde064a33..64fcd189c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix @@ -1,17 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder , defusedxml -, pytest }: +, pytestCheckHook +}: buildPythonPackage rec { pname = "python-didl-lite"; - version = "1.2.5"; + version = "1.2.6"; disabled = pythonOlder "3.5.3"; src = fetchFromGitHub { owner = "StevenLooman"; repo = pname; rev = version; - sha256 = "0wm831g8k9xahw20y0461cvy6lp45sxppicxah1rg9isdc3vy3nh"; + sha256 = "sha256-1rr26dnV5As15HeFLWEDBDYPiRDHkGfYOYFhSJi7iyU="; }; propagatedBuildInputs = [ @@ -19,12 +23,10 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ "didl_lite" ]; meta = with lib; { description = "DIDL-Lite (Digital Item Declaration Language) tools for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 07d7ba9b3c..1d9025a035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'croniter = "^0"' 'croniter = "*"' \ - --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' + --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \ + --replace 'zeroconf = "^0.28"' 'zeroconf = "*"' ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix index 3e5889b935..372c12c359 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.19"; + version = "0.0.21"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "01i4pvgvpl7inwhy53c6b34pi5zvfiv2scn507j8jdg5cjs04g80"; + sha256 = "sha256-7phx6CI6sqUCZIUxL6ea25UWAcI3NAz66hIleUfN4bk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 22a87b386e..145c9a2407 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -116,7 +116,7 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.8.0"; + version = "1.8.1"; disabled = !isPy3k; @@ -131,7 +131,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-qdZUtlxHZjCYoGfTdp5Bq3MtfXolWZrvib0kuzF3uIc="; + sha256 = "sha256-HERbvmrfhWwH164GFHU/M0KbhVAuhI5sBZSxCZy8mRk="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix new file mode 100644 index 0000000000..f47e6af16c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytube"; + version = "10.6.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pytube"; + repo = "pytube"; + rev = "v${version}"; + sha256 = "sha256-b0tN4m3/+K243zQ7L4wW4crk9r69Tj64is6C4I5oFZU="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytube" ]; + + meta = with lib; { + description = "Python 3 library for downloading YouTube Videos"; + homepage = "https://github.com/nficano/pytube"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix new file mode 100644 index 0000000000..1eebc05d89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, python +, buildPythonPackage +, fetchPypi +, substituteAll +, libjpeg_turbo +, numpy +}: + +buildPythonPackage rec { + pname = "pyturbojpeg"; + version = "1.4.1"; + + src = fetchPypi { + pname = "PyTurboJPEG"; + inherit version; + sha256 = "09688a93331281e566569b4d313e1d1a058ca32ccae1a2473847a10e4ca2f2a7"; + }; + + patches = [ + (substituteAll { + src = ./lib-path.patch; + libturbojpeg = "${libjpeg_turbo.out}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + numpy + ]; + + # upstream has no tests, but we want to test whether the library is found + checkPhase = '' + ${python.interpreter} -c 'from turbojpeg import TurboJPEG; TurboJPEG()' + ''; + + pythonImportsCheck = [ "turbojpeg" ]; + + meta = with lib; { + description = "A Python wrapper of libjpeg-turbo for decoding and encoding JPEG image"; + homepage = "https://github.com/lilohuang/PyTurboJPEG"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/lib-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/lib-path.patch new file mode 100644 index 0000000000..30e6ed58ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/lib-path.patch @@ -0,0 +1,28 @@ +diff --git a/turbojpeg.py b/turbojpeg.py +index 73edb38..bfa8c67 100644 +--- a/turbojpeg.py ++++ b/turbojpeg.py +@@ -408,22 +408,7 @@ class TurboJPEG(object): + + def __find_turbojpeg(self): + """returns default turbojpeg library path if possible""" +- lib_path = find_library('turbojpeg') +- if lib_path is not None: +- return lib_path +- for lib_path in DEFAULT_LIB_PATHS[platform.system()]: +- if os.path.exists(lib_path): +- return lib_path +- if platform.system() == 'Linux' and 'LD_LIBRARY_PATH' in os.environ: +- ld_library_path = os.environ['LD_LIBRARY_PATH'] +- for path in ld_library_path.split(':'): +- lib_path = os.path.join(path, 'libturbojpeg.so.0') +- if os.path.exists(lib_path): +- return lib_path +- raise RuntimeError( +- 'Unable to locate turbojpeg library automatically. ' +- 'You may specify the turbojpeg library path manually.\n' +- 'e.g. jpeg = TurboJPEG(lib_path)') ++ return '@libturbojpeg@' + + def __getaddr(self, nda): + """returns the memory address for a given ndarray""" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix new file mode 100644 index 0000000000..8743e5014e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, hypothesis +, pandas +}: + +buildPythonPackage rec { + pname = "rapidfuzz"; + version = "1.4.1"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "RapidFuzz"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-uZdD25ATJgRrDAHYSQNp7NvEmW7p3LD9vNmxAbf5Mwk="; + }; + + checkInputs = [ + pytestCheckHook + hypothesis + pandas + ]; + + disabledTests = [ + "test_levenshtein_block" # hypothesis data generation too slow + ]; + + pythonImportsCheck = [ + "rapidfuzz.fuzz" + "rapidfuzz.string_metric" + "rapidfuzz.process" + "rapidfuzz.utils" + ]; + + meta = with lib; { + description = "Rapid fuzzy string matching"; + homepage = "https://github.com/maxbachmann/rapidfuzz"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix index 73272990e0..0a023dab87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, cryptography +, requests +, pykerberos +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "requests-kerberos"; @@ -12,16 +20,26 @@ buildPythonPackage rec { sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6"; }; - checkInputs = [ mock ]; - propagatedBuildInputs = [ requests pykerberos ]; + propagatedBuildInputs = [ + cryptography + requests + pykerberos + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; # they have a setup.py which mentions a test suite that doesn't exist... patches = [ ./fix_setup.patch ]; + pythonImportsCheck = [ "requests_kerberos" ]; + meta = with lib; { - description = "An authentication handler for using Kerberos with Python Requests."; - homepage = "https://github.com/requests/requests-kerberos"; - license = licenses.isc; + description = "An authentication handler for using Kerberos with Python Requests"; + homepage = "https://github.com/requests/requests-kerberos"; + license = licenses.isc; maintainers = with maintainers; [ catern ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix new file mode 100644 index 0000000000..c58e8a926c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyopenssl +, requests +}: + +buildPythonPackage rec { + pname = "requests-pkcs12"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "m-click"; + repo = "requests_pkcs12"; + rev = version; + sha256 = "09nm3c6v911d1vwwi0f7mzapbkq7rnsl7026pb13j6ma8pkxznms"; + }; + + propagatedBuildInputs = [ + requests + pyopenssl + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "requests_pkcs12" ]; + + meta = with lib; { + description = "PKCS#12 support for the Python requests library"; + homepage = "https://github.com/m-click/requests_pkcs12"; + license = with licenses; [ isc ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix new file mode 100644 index 0000000000..b572b0a385 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix @@ -0,0 +1,43 @@ +{ lib +, arrow +, buildPythonPackage +, fetchFromGitHub +, pytest-datafiles +, pytest-vcr +, pytestCheckHook +, python-box +, requests +}: + +buildPythonPackage rec { + pname = "restfly"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "stevemcgrath"; + repo = pname; + rev = version; + sha256 = "0cq07wj6g3kg7i4qyjp3n3pv13k9p4p43rd6kn139wsn1mh8fr56"; + }; + + propagatedBuildInputs = [ + requests + arrow + python-box + ]; + + checkInputs = [ + pytest-datafiles + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ "restfly" ]; + + meta = with lib; { + description = "Python RESTfly API Library Framework"; + homepage = "https://github.com/stevemcgrath/restfly"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/2.nix index e178d3c821..3108861e9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/2.nix @@ -9,7 +9,7 @@ , rWrapper , rPackages , pcre -, lzma +, xz , bzip2 , zlib , icu @@ -35,7 +35,7 @@ buildPythonPackage rec { readline R pcre - lzma + xz bzip2 zlib icu diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index c913ab53b2..c5443a3738 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -7,7 +7,7 @@ , rWrapper , rPackages , pcre -, lzma +, xz , bzip2 , zlib , icu @@ -46,7 +46,7 @@ buildPythonPackage rec { buildInputs = [ pcre - lzma + xz bzip2 zlib icu diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index c62f5ede3c..8364075243 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -10,6 +10,7 @@ , protobuf3-to-dict , smdebug-rulesconfig , pandas +, packaging }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { google-pasta importlib-metadata numpy + packaging protobuf protobuf3-to-dict smdebug-rulesconfig diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix index ba716c313f..fa3a3de853 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pip, pytest }: +{ lib, buildPythonPackage, fetchPypi, toml }: buildPythonPackage rec { pname = "setuptools_scm"; @@ -9,13 +9,16 @@ buildPythonPackage rec { sha256 = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8"; }; + propagatedBuildInputs = [ toml ]; + # Requires pytest, circular dependency doCheck = false; + pythonImportsCheck = [ "setuptools_scm" ]; meta = with lib; { - homepage = "https://bitbucket.org/pypa/setuptools_scm/"; + homepage = "https://github.com/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index bce0bc74f9..a5ca456271 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "solax"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "0h7q6y2cdkj9dqxw0k7pgz7a7vbpq1qw50pmy9rajphhv2600cbc"; + sha256 = "sha256-3WhJBBnIl6C0AdEsmSX3ZEVDThzCBguS4UUri80ifGg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index e4a3c94711..9ce0015cdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -28,6 +28,7 @@ , sphinxcontrib-websupport , typing , setuptools +, packaging }: buildPythonPackage rec { @@ -52,6 +53,7 @@ buildPythonPackage rec { pygments alabaster Babel + packaging setuptools snowballstemmer six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 931af4b4dd..51d9824f63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.1.4"; + version = "2.2.0"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f53ec0cd534d2c8f0a51b4b3473ced46e9cb0dd99a7c5019249fe0ef9cbef18e"; + sha256 = "sha256-dQCEPhVNdpg8I7ylynOAll4HJcRrj0hMEyLQtYps47I="; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 63ec4abcac..6f29db2581 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.16.1"; + version = "2.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1f50xczv8kgly6wz6zrvqzwdj6nvhdlgx8wnrhmbipjrb6qacr25"; + sha256 = "sha256-KcYMi5naHEufDXIhabwx5iS4wH1xhrjq3ZwC6NLULL8="; }; propagatedBuildInputs = [ requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 3ad8b6fea1..48eb36d6e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -5,6 +5,7 @@ , pythonOlder , asdf , astropy +, setuptools-scm , astropy-helpers , astropy-extension-helpers , beautifulsoup4 @@ -38,6 +39,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools-scm astropy-extension-helpers ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix index 10c8f28e44..93569fe3da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, buildPythonPackage, isPy3k, fetchPypi , mock -, meld3 , pytest , setuptools }: @@ -22,7 +21,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ meld3 setuptools ]; + propagatedBuildInputs = [ setuptools ]; meta = with lib; { description = "A system for controlling process state under UNIX"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix index 0772b73a15..7f1803d12c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, pytest-subtests +, importlib-resources +}: buildPythonPackage rec { pname = "tzdata"; @@ -10,6 +17,11 @@ buildPythonPackage rec { sha256 = "sha256-4ZxzUfiHUioaxznSEEHlkt3ebdG3ZP3vqPeys1UdPTg="; }; + checkInputs = [ + pytestCheckHook + pytest-subtests + ] ++ lib.optional (pythonOlder "3.7") importlib-resources; + pythonImportsCheck = [ "tzdata" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix index a7cd91d684..c5514cfa53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix @@ -15,9 +15,12 @@ buildPythonPackage rec { # test fail (timezone test fail) doCheck = false; + pythonImportsCheck = [ "tzlocal" ]; + meta = with lib; { description = "Tzinfo object for the local timezone"; homepage = "https://github.com/regebro/tzlocal"; license = licenses.cddl; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix index aca6095d33..9fb9807d39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.1"; pname = "uproot3-methods"; src = fetchPypi { inherit pname version; - sha256 = "1rk9i1ra3panli96ghz80ddpqk77xb1kpxs3wf8rw0jy5d88pc26"; + sha256 = "sha256-3Wj5C+HqJ2NguWNpg2hJ3ykEX3/k5TT5rCHqAHmO41g="; }; nativeBuildInputs = [ awkward0 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix index ff262d6b0a..0c068428f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, python, cmake -, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: +, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { version = "4.7.1"; @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5.0"; buildInputs = [ python gettext ]; - propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus ]; + propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus cryptography ]; nativeBuildInputs = [ cmake doxygen ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index b4fb9a0e71..b7a3f81c72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -1,11 +1,11 @@ { lib , brotli , buildPythonPackage -, certifi , cryptography , dateutil , fetchPypi , idna +, isPy27 , mock , pyopenssl , pysocks @@ -20,7 +20,6 @@ buildPythonPackage rec { pname = "urllib3"; version = "1.26.3"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -29,11 +28,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ brotli - certifi + pysocks + ] ++ lib.optionals isPy27 [ cryptography idna pyopenssl - pysocks ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix index bd592d6868..4928c2adc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "vsure"; - version = "1.7.3"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tnUL9krKHqHR79EROsmVflCy9uO1n0iV6evQc/YpxnM="; + sha256 = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 28c9b8b5c1..373e7a0a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { description = "Python extension to run WebAssembly binaries"; homepage = "https://github.com/wasmerio/wasmer-python"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix new file mode 100644 index 0000000000..ade529e562 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, bracex }: + +buildPythonPackage rec { + pname = "wcmatch"; + version = "8.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-e6CRkflYLoLYZIKb37qwLfRuJqRqME5Xx/5WUvB/KXo="; + }; + + propagatedBuildInputs = [ bracex ]; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + "TestTilde" + ]; + + pythonImportsCheck = [ "wcmatch" ]; + + meta = with lib; { + description = "Wilcard File Name matching library"; + homepage = "https://github.com/facelessuser/wcmatch"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 7f35dd124d..73bebd8366 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -25,5 +25,6 @@ buildPythonPackage rec { homepage = "https://palletsprojects.com/p/werkzeug/"; description = "A WSGI utility library for Python"; license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index a245efe7e4..42402c259a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -6,6 +6,7 @@ , pandas , setuptools , isPy3k +, setuptools-scm }: buildPythonPackage rec { @@ -18,6 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-OOhDnWyRvNW3wPyjSdr44GQ6xohQyYcmLVNSbp19AeQ="; }; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ numpy pandas setuptools ]; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 26f6516829..8ad4df2620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.17.4"; + version = "0.17.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-QMtpGd7JFPGTLHbhyjOsan1Ow32v8B2ss84GpHA0qqs="; + sha256 = "sha256-oLm1Bh58mKwbQf9FloqEnypzANikxgdFpAB99h/Mb9U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix new file mode 100644 index 0000000000..a7c08ddc0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, poetry-core +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xpath-expressions"; + version = "1.1.0"; + disabled = pythonOlder "3.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "orf"; + repo = pname; + rev = "v${version}"; + sha256 = "0l289iw2zmzxyfi3g2z7b917vmsaz47h5jp871zvykpmpigc632h"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + lxml + pytestCheckHook + ]; + + postPatch = '' + # Was fixed upstream but not released + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + pythonImportsCheck = [ "xpath" ]; + + meta = with lib; { + description = "Python module to handle XPath expressions"; + homepage = "https://github.com/orf/xpath-expressions"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 84fbacca26..2178e4d257 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -5,16 +5,17 @@ , pytestCheckHook , pythonOlder , pyyaml +, stdenv }: buildPythonPackage rec { pname = "yamllint"; - version = "1.25.0"; + version = "1.26.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519"; + sha256 = "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h"; }; propagatedBuildInputs = [ @@ -27,8 +28,13 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test failure could be related to https://github.com/adrienverge/yamllint/issues/334 + # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373 "test_find_files_recursively" + ] ++ lib.optional stdenv.isDarwin [ + # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307 + "test_locale_accents" + "test_locale_case" + "test_run_with_locale" ]; pythonImportsCheck = [ "yamllint" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix new file mode 100644 index 0000000000..267052f5c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "yaswfp"; + version = "unstable-20210331"; + + src = fetchFromGitHub { + owner = "facundobatista"; + repo = pname; + rev = "2a2cc6ca4c0b4d52bd2e658fb5f80fdc0db4924c"; + sha256 = "1dxdz89hlycy1rnn269fwl1f0qxgxqarkc0ivs2m77f8xba2qgj9"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "yaswfp" ]; + + meta = with lib; { + description = "Python SWF Parser"; + homepage = "https://github.com/facundobatista/yaswfp"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index a3b00ec323..5105cbfff0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -3,27 +3,26 @@ , buildPythonPackage , fetchPypi , ifaddr -, typing -, isPy27 , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.28.8"; - disabled = isPy27; + version = "0.29.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb"; + sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8="; }; - propagatedBuildInputs = [ ifaddr ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; + propagatedBuildInputs = [ ifaddr ]; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "zeroconf/test.py" ]; + disabledTests = [ # disable tests that expect some sort of networking in the build container "test_launch_and_close" @@ -33,6 +32,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "zeroconf" ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index bc4599f08f..34a4c90d19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,25 +1,34 @@ { lib +, aiohttp +, asynctest , buildPythonPackage , fetchFromGitHub -, aiohttp -, zigpy -, asynctest , pytestCheckHook +, zigpy }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.54"; + version = "0.0.55"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "1xc4rky9x2n15rsb18vyg4lb2897k14gkz03khgf8gp37bg2dk5h"; + sha256 = "sha256-mc7mOaxn2FCvwYv9yE0mIOSQ1F+xJJ+1LynOdEV07I8="; }; - propagatedBuildInputs = [ aiohttp zigpy ]; - checkInputs = [ pytestCheckHook asynctest ]; + propagatedBuildInputs = [ + aiohttp + zigpy + ]; + + checkInputs = [ + asynctest + pytestCheckHook + ]; + + pythonImportsCheck = [ "zhaquirks" ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index d9c7854bf9..0b7c027c0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = version; - sha256 = "1p9mdsfc200iyszppcflazzfwqg4v8nqqwqsx114nip5km7a5s37"; + sha256 = "sha256-d/yAk8owMu+J1BzlwR5mzF9HkXiE6Kc81AznvsAboy8="; }; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index dbc42561db..f03b9e9675 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "18grqx1fzh539ccar0865shgd2mnfni65rjj787cq5j5p5rn0yc7"; + sha256 = "sha256-oEf4GnvbQ6LY4NaNFWRmnNz1TK2tMpIVUxskhU38g4w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix index a80b3155b8..9d67577935 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix @@ -2,14 +2,15 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "512892714f0e3dcc9a77222cb509ed519f41ce2b92467e47a4b406a23b48561a"; + sha256 = "8b977dc07e3797907ab59e08096583bcd0b7e6c739849fbbeec09263f6356623"; extension = "zip"; }; + # doesn't work with pytestCheckHook checkInputs = [ pytest ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 24f6e7ccfc..ae23b32b71 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -310,10 +310,10 @@ let RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; Rhdf5lib = [ pkgs.zlib ]; - Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.mpi pkgs.pcre.dev ]; - Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.lzma.dev pkgs.curl.dev ]; + Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ]; + Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ]; rjags = [ pkgs.jags ]; - rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; + rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; Rlibeemd = [ pkgs.gsl_1 ]; rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; @@ -334,7 +334,7 @@ let RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; rzmq = [ pkgs.zeromq pkgs.pkg-config ]; clustermq = [ pkgs.zeromq ]; - SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; + SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.xz pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; @@ -939,7 +939,7 @@ let }); littler = old.littler.overrideAttrs (attrs: with pkgs; { - buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs; + buildInputs = [ pcre xz zlib bzip2 icu which ] ++ attrs.buildInputs; postInstall = '' install -d $out/bin $out/share/man/man1 ln -s ../library/littler/bin/r $out/bin/r diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix index f3ac42b940..4eb06f76ab 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix @@ -1,29 +1,20 @@ { buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, - nix-prefetch-git, fetchpatch }: + nix-prefetch-git }: buildRubyGem rec { inherit (bundler) ruby; name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "bundix"; rev = version; - sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8"; + sha256 = "sha256-iMp6Yj7TSWDqge3Lw855/igOWdTIuFH1LGeIN/cpq7U="; }; - patches = [ - # write trailing newline to gemset.nix - # https://github.com/nix-community/bundix/pull/78 - (fetchpatch { - url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch"; - sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb"; - }) - ]; - buildInputs = [ ruby bundler ]; nativeBuildInputs = [ makeWrapper ]; @@ -47,7 +38,7 @@ buildRubyGem rec { ''; homepage = "https://github.com/manveru/bundix"; license = "MIT"; - maintainers = with lib.maintainers; [ manveru qyliss zimbatm ]; + maintainers = with lib.maintainers; [ manveru zimbatm ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 791ae3d0d3..3f1c2190a3 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl @@ -211,7 +211,16 @@ in ''; }; - pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + pg_query = attrs: lib.optionalAttrs (attrs.version == "2.0.2") { + dontBuild = false; + postPatch = '' + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.2"; + sha256 = "0ms2s6hmy8qyzv4g1hj4i2p5fws1v8lrj73b2knwbp2ipd45yj7y"; + }}';" ext/pg_query/extconf.rb + ''; + } // lib.optionalAttrs (attrs.version == "1.3.0") { + # Needed for gitlab dontBuild = false; postPatch = '' sed -i "s;'https://codeload.github.com.*';'${fetchurl { @@ -598,7 +607,7 @@ in }; timfel-krb5-auth = attrs: { - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; }; tiny_tds = attrs: { diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix index eab5716d10..9a8cc799bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "sha256-yRahBY2ob3EkBKXZN9K7UqgHM4k5CVOcWG0/oOWQFuk="; + sha256 = "sha256-wtUWmvAm7iTiP8eYgPiRasYjzeCIJCQd3D+8f1kMONA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index d6fa39036a..563119f6b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.41"; + version = "8.41.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-+XMCstfxOabLDp66pRQtYelrLUOMCWnTc3KbiOlfVzI="; + sha256 = "sha256-zW6gjRu5YEH04xCbsW20FeFfmBg+i+aW3WpViBQigXI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 47c7b0fac9..aa3ba723cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.147.0"; + version = "0.148.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3U8BOYUHl1YiOnxAIV2V6Ib+LZ0DydtSfwAxN2Hj09g="; + sha256 = "sha256-DPHDuTBCsRq+u5kYHwImIXPxq04kW2HiqYsxJrun6n8="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix index 15891e7404..4b294bf8ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python3, libiberty, libopcodes}: stdenv.mkDerivation rec { pname = "kcov"; @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { }; preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; + buildInputs = [ curl zlib elfutils libiberty libopcodes ]; + + strictDeps = true; meta = with lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix index 49e31f53a8..58bb58fa2b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, yacc, gcc +{ stdenv, lib, fetchurl, makeWrapper, bison, gcc , withISpin ? true, tk, swarm, graphviz }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ yacc ]; + buildInputs = [ bison ]; sourceRoot = "Spin/Src${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 8aa9c97a9a..c8ae231dea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1n234ivpjfvppfqcpgbvsqg869m4g5xyi536di3ckm3sba9r4jwr"; + sha256 = "054g0lr0r1xzbss4b4j9ixkls9p1llmw61afib1381z4k0lvzgwn"; }; - vendorSha256 = "101bw29c2dn0mf5n32r7rkqrb9r71z3afbhwnzrm31xckbkvlwsa"; + vendorSha256 = "0j2avkhyq6vz6113lkf004d4hysygc6iw78v70z98s6m15mg9imn"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix new file mode 100644 index 0000000000..3d887d6c89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, jdk8 }: + +stdenv.mkDerivation rec { + pname = "async-profiler"; + version = "1.8.4"; + + src = fetchFromGitHub { + owner = "jvm-profiling-tools"; + repo = "async-profiler"; + rev = "v${version}"; + sha256 = "sha256-R/TFElytq3mBG+jKjb7XlFUqpXBpSZGfbscUdg2vevE="; + }; + + buildInputs = [ jdk8 ]; + + installPhase = '' + runHook preInstall + install -D "$src/profiler.sh" "$out/bin/async-profiler" + install -D build/jattach "$out/bin/jattach" + install -D build/libasyncProfiler.so "$out/lib/libasyncProfiler.so" + install -D -t "$out/share/java/" build/*.jar + runHook postInstall + ''; + + fixupPhase = '' + substituteInPlace $out/bin/async-profiler \ + --replace 'JATTACH=$SCRIPT_DIR/build/jattach' \ + 'JATTACH=${placeholder "out"}/bin/jattach' \ + --replace 'PROFILER=$SCRIPT_DIR/build/libasyncProfiler.so' \ + 'PROFILER=${placeholder "out"}/lib/libasyncProfiler.so' + ''; + + meta = with lib; { + description = "A low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; + homepage = "https://github.com/jvm-profiling-tools/async-profiler"; + license = licenses.asl20; + maintainers = with maintainers; [ mschuwalow ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix index 8566edd231..a821e661a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix @@ -1,34 +1,39 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, bison +}: stdenv.mkDerivation rec { pname = "boost-build"; - version = "2016.03"; + version = "4.4.1"; src = fetchFromGitHub { owner = "boostorg"; repo = "build"; rev = version; - sha256 = "1qw5marmp7z09nwcjlqrmqdg9b6myfqj3zvfz888x9mbidrmhn6p"; + sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; }; - hardeningDisable = [ "format" ]; - - patchPhase = '' - grep -r '/usr/share/boost-build' \ - | awk '{split($0,a,":"); print a[1];}' \ - | xargs sed -i "s,/usr/share/boost-build,$out/share/boost-build," - ''; + nativeBuildInputs = [ + bison + ]; buildPhase = '' + runHook preBuild ./bootstrap.sh + runHook postBuild ''; installPhase = '' - ./b2 install --prefix=$out + runHook preInstall + ./b2 install --prefix="$out" + ln -s b2 "$out/bin/bjam" + runHook postInstall ''; meta = with lib; { - homepage = "http://www.boost.org/boost-build2/"; + homepage = "https://www.boost.org/build/"; license = lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ ivan-tkatchev ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch new file mode 100644 index 0000000000..da5e923e0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/CorrosionConfig.cmake.in b/cmake/CorrosionConfig.cmake.in +index c042a00..491f53c 100644 +--- a/cmake/CorrosionConfig.cmake.in ++++ b/cmake/CorrosionConfig.cmake.in +@@ -4,11 +4,11 @@ if (Corrosion_FOUND) + return() + endif() + +-list(APPEND CMAKE_MODULE_PATH "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_DATADIR@/cmake") ++list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_FULL_DATADIR@/cmake") + + add_executable(Corrosion::Generator IMPORTED GLOBAL) + set_property( + TARGET Corrosion::Generator +- PROPERTY IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_LIBEXECDIR@/corrosion-generator") ++ PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_LIBEXECDIR@/corrosion-generator") + + include(Corrosion) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix new file mode 100644 index 0000000000..2285579b0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/corrosion/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, rustPlatform +}: + +stdenv.mkDerivation rec { + pname = "corrosion"; + version = "unstable-2021-02-23"; + + src = fetchFromGitHub { + owner = "AndrewGaspar"; + repo = "corrosion"; + rev = "e6c35c7e55a59c8223577b5abc4d253b4a82898b"; + sha256 = "0vq6g3ggnqiln0q8gsr8rr5rrdgpfcgfly79jwcygxrviw37m44d"; + }; + + patches = [ + # https://github.com/AndrewGaspar/corrosion/issues/84 + ./cmake-install-full-dir.patch + ]; + + cargoRoot = "generator"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${src.name}/${cargoRoot}"; + name = "${pname}-${version}"; + sha256 = "1fsq8zzzq28fj2fh92wmg8kmdj4y10mcpdmlgxsygy5lbh4xs13f"; + }; + + nativeBuildInputs = [ + cmake + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + cmakeFlags = [ + "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo" + + # tests cannot find cargo because Rust_CARGO is unset before tests + "-DCORROSION_BUILD_TESTS=OFF" + ]; + + meta = with lib; { + description = "Tool for integrating Rust into an existing CMake project"; + homepage = "https://github.com/AndrewGaspar/corrosion"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix index dcc0c3aef9..dfa65736f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nix-update-source, lib, python +{ stdenv, fetchFromGitHub, nix-update-source, lib, python3 , which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; }; pname = "gup"; - buildInputs = lib.remove null [ python which pychecker ]; + nativeBuildInputs = [ python3 which pychecker ]; + buildInputs = [ python3 ]; + strictDeps = true; SKIP_PYCHECKER = pychecker == null; buildPhase = "make python"; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix index 6f5ecde8f8..859497345f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, yacc }: +{ lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { name = "jam-2.6.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc"; }; - nativeBuildInputs = [ yacc ]; + nativeBuildInputs = [ bison ]; preConfigure = '' unset AR diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index bbe4a8ba40..d4d4c75527 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "483533f7fad8e5de57a5c37bc387f5e7a94b4493"; - version = "2021-03-13"; + rev = "b430596eb8566a59793ea0b8ddd2c693505e801f"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1z6ass2w1hrp5yxki0d4zrsrrnqbl6k0bvxia090mqrcm9mig2y3"; + sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index ae62ce539b..4d4bb6957e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "waf"; - version = "2.0.20"; + version = "2.0.22"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "${pname}-${version}"; - sha256 = "1xbd1lmchq9pdrplkr2db28xqafyw753qbhnrfn8pxdg3inxxqvq"; + sha256 = "sha256-WGGyhvQdFYmC0NOA5VVqCRMF1fvfPcTI42x1nHvz0W0="; }; buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 4ca0343d8f..cebd80ff83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -45,15 +45,19 @@ buildGoModule rec { ]; buildPhase = '' + runHook preBuild patchShebangs . make bin/buildah GIT_COMMIT="unknown" make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man" + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 bin/buildah $out/bin/buildah installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix b/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix index 7e0a07ad83..bc44741cff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: +{lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: stdenv.mkDerivation { name = "cdecl-2.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; mkdir -p $out/bin; ''; - buildInputs = [yacc flex readline ncurses]; + buildInputs = [bison flex readline ncurses]; meta = { description = "Translator English -- C/C++ declarations"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index e729b8c448..0be4faf0ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.25"; + version = "0.1.27"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tbwmHsiR/RJl3CJrzJtI6GA3v9mNAirbEHXX+wDMd2k="; + sha256 = "1708g8msv5cw0b4gljyjqns328wbci3p3avwysms4aknm4vky0g0"; }; - vendorSha256 = "sha256-vOaklBsMuKTQ3cJgXDClM1RWh+ovemO1uDWXeK1ygU4="; + vendorSha256 = "0m7k6k790i06i8a5r8y7787mmikfibbvl7s8xqxygq1f5cpdspd6"; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix b/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix index 0d9edebe19..85efc5f19c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix @@ -6,6 +6,7 @@ , jinja2 , pylint , pyyaml +, six }: buildPythonApplication rec { @@ -21,7 +22,7 @@ buildPythonApplication rec { sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; - propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; + propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml six ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index c6d609e38c..a2bc47b640 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,7 +1,8 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule +, enableUnfree ? true }: buildGoModule rec { - name = "drone.io-${version}"; + pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; version = "1.10.0"; vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0="; @@ -15,9 +16,13 @@ buildGoModule rec { sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; }; + preBuild = '' + buildFlagsArray+=( "-tags" "${lib.optionalString (!enableUnfree) "oss nolimit"}" ) + ''; + meta = with lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; - license = licenses.asl20; + license = with licenses; if enableUnfree then unfreeRedistributable else asl20; description = "Continuous Integration platform built on container technology"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix index 57fd984dc1..dac1848865 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix @@ -1,15 +1,13 @@ { buildGoModule, fetchFromGitHub, lib }: -let +buildGoModule rec { pname = "dapr"; - version = "0.9.0"; - sha256 = "1vdbh5pg3j7kqqqhhf4d9xfzbpqmjc4x373sk43pb05prg4w71s7"; - vendorSha256 = "19qcpd5i60xmsr8m8mx16imm5falkqcgqpwpx3clfvqxjyflglpp"; -in buildGoModule { - inherit pname version vendorSha256; + version = "1.0.1"; + + vendorSha256 = "13fb6fdjqrsl74569nh2l7x9w7w61bcvkksj410s2f85bicc29rf"; src = fetchFromGitHub { - inherit sha256; + sha256 = "15zz212sm83l6l7npislixxn23fg190b44bfxnrjrlyjbz370kch"; owner = "dapr"; repo = "cli"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix index 447dbc23fd..a25a395645 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , withMySQL ? true, withPSQL ? false, withSQLite ? false -, mysql, postgresql, sqlite, gawk, gnugrep, findutils, gnused +, mariadb, postgresql, sqlite, gawk, gnugrep, findutils, gnused , lib }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace shmig \ - --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb.client}/bin/mysql"}" \ --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ --replace "awk" "${gawk}/bin/awk" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 5905e05d07..5bca873377 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -32,9 +32,9 @@ buildPythonApplication rec { sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a"; }; - buildInputs = [ glibcLocales pkginfo check-manifest ]; + buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ py devpi-common pluggy setuptools ]; + propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ]; checkInputs = [ pytest pytest-flake8 webtest mock diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch deleted file mode 100644 index 342ac1baa1..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/allow-warnings.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs -index 4e743eb4..97c53ed8 100644 ---- a/diesel/src/lib.rs -+++ b/diesel/src/lib.rs -@@ -131,7 +131,6 @@ - #![cfg_attr(feature = "unstable", feature(specialization, try_from))] - // Built-in Lints - #![deny( -- warnings, - missing_debug_implementations, - missing_copy_implementations, - missing_docs -diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs -index 741ca003..cf93bb8f 100644 ---- a/diesel_cli/src/main.rs -+++ b/diesel_cli/src/main.rs -@@ -1,5 +1,5 @@ - // Built-in Lints --#![deny(warnings, missing_copy_implementations)] -+#![deny(missing_copy_implementations)] - // Clippy lints - #![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)] - #![warn( -diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs -index 2edee846..c96917c4 100644 ---- a/diesel_cli/tests/tests.rs -+++ b/diesel_cli/tests/tests.rs -@@ -1,5 +1,3 @@ --#![deny(warnings)] -- - extern crate chrono; - extern crate diesel; - #[macro_use] -diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs -index 2c43b2a3..44dcf3f9 100644 ---- a/diesel_derives/src/lib.rs -+++ b/diesel_derives/src/lib.rs -@@ -1,6 +1,6 @@ - #![recursion_limit = "1024"] - // Built-in Lints --#![deny(warnings, missing_copy_implementations)] -+#![deny(missing_copy_implementations)] - // Clippy lints - #![allow( - clippy::needless_pass_by_value, -diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs -index 636fea66..f86f3dcc 100644 ---- a/diesel_derives/tests/tests.rs -+++ b/diesel_derives/tests/tests.rs -@@ -1,5 +1,3 @@ --#![deny(warnings)] -- - #[macro_use] - extern crate cfg_if; - #[macro_use] -diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs -index 933e21a8..7c4d0222 100644 ---- a/diesel_migrations/migrations_internals/src/lib.rs -+++ b/diesel_migrations/migrations_internals/src/lib.rs -@@ -1,5 +1,5 @@ - // Built-in Lints --#![deny(warnings, missing_debug_implementations, missing_copy_implementations)] -+#![deny(missing_debug_implementations, missing_copy_implementations)] - // Clippy lints - #![allow( - clippy::option_map_unwrap_or_else, -diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs -index 0a83234e..2f509c04 100644 ---- a/diesel_migrations/migrations_macros/src/lib.rs -+++ b/diesel_migrations/migrations_macros/src/lib.rs -@@ -1,5 +1,5 @@ - // Built-in Lints --#![deny(warnings, missing_debug_implementations, missing_copy_implementations)] -+#![deny(missing_debug_implementations, missing_copy_implementations)] - // Clippy lints - #![allow( - clippy::option_map_unwrap_or_else, -diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs -index c85414e5..f025f237 100644 ---- a/diesel_migrations/src/lib.rs -+++ b/diesel_migrations/src/lib.rs -@@ -1,5 +1,5 @@ - // Built-in Lints --#![deny(warnings, missing_copy_implementations)] -+#![deny(missing_copy_implementations)] - // Clippy lints - #![allow( - clippy::needless_pass_by_value, diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch index 26d583f9a1..aefc40c849 100644 --- a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch +++ b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/cargo-lock.patch @@ -1,1589 +1,1497 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..f20a5bf +index 0000000..c4a129e --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1583 @@ +@@ -0,0 +1,1491 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. ++version = 3 ++ ++[[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 = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ +[[package]] +name = "advanced-blog-cli" +version = "0.1.0" +dependencies = [ -+ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "assert_matches", ++ "bcrypt", ++ "chrono", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", ++ "lazy_static", ++ "structopt", ++ "structopt-derive", ++ "tempfile 2.2.0", +] + +[[package]] +name = "aho-corasick" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" +dependencies = [ -+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 0.1.11", +] + +[[package]] +name = "aho-corasick" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" +dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.4", +] + +[[package]] +name = "all_about_inserts" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", ++ "serde_derive", ++ "serde_json", +] + +[[package]] +name = "all_about_inserts_mysql" +version = "0.1.0" +dependencies = [ -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", ++ "serde_derive", ++ "serde_json", +] + +[[package]] +name = "all_about_inserts_sqlite" +version = "0.1.0" +dependencies = [ -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", ++ "serde_derive", ++ "serde_json", +] + +[[package]] +name = "all_about_updates" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[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 = "assert_matches" -+version = "1.3.0" ++version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "atty" -+version = "0.2.13" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "libc 0.2.62 (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.6" ++version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "backtrace" -+version = "0.3.35" ++version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" +dependencies = [ -+ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (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.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "addr2line", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", +] + +[[package]] +name = "barrel" -+version = "0.2.0" ++version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d67c978b1322c8031145b1f6c236fc371292f52c565bc96018b2971afcbffe1" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.2.0", +] + +[[package]] +name = "base64" -+version = "0.9.3" ++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)", -+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", +] + +[[package]] +name = "bcrypt" -+version = "0.1.6" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d27c1ac8b4a79e27fc37d00060f152ebc59c95a7cfc946943d177d6799c19184" +dependencies = [ -+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64", ++ "blowfish", ++ "byteorder", ++ "lazy_static", ++ "rand 0.6.5", +] + +[[package]] +name = "bigdecimal" -+version = "0.0.14" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1374191e2dd25f9ae02e3aa95041ed5d747fc77b3c102b49fe2dd9a8117a6244" +dependencies = [ -+ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-bigint", ++ "num-integer", ++ "num-traits", +] + +[[package]] +name = "bitflags" -+version = "1.1.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] -+name = "bumpalo" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "byteorder" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.2" ++name = "block-cipher-trait" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "generic-array", +] + +[[package]] -+name = "cc" -+version = "1.0.41" ++name = "blowfish" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6aeb80d00f2688459b8542068abd974cfb101e7a82182414a99b5026c0d85cc3" ++dependencies = [ ++ "block-cipher-trait", ++ "byteorder", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "cc" ++version = "1.0.67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + +[[package]] +name = "cfg-if" -+version = "0.1.9" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" -+version = "0.4.8" ++version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ -+ "js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi 0.3.9", +] + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.1.0 (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.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ -+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", +] + +[[package]] +name = "derive-error-chain" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15", ++ "syn 0.11.11", +] + +[[package]] +name = "diesel" -+version = "1.4.0" ++version = "1.4.6" +dependencies = [ -+ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "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)", -+ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bigdecimal", ++ "bitflags", ++ "byteorder", ++ "cfg-if 0.1.10", ++ "chrono", ++ "diesel_derives 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", ++ "ipnetwork", ++ "libc", ++ "libsqlite3-sys", ++ "mysqlclient-sys", ++ "num-bigint", ++ "num-integer", ++ "num-traits", ++ "pq-sys", ++ "quickcheck", ++ "r2d2", ++ "serde_json", ++ "tempdir", ++ "time", ++ "url", ++ "uuid 0.6.5", ++ "uuid 0.8.2", +] + +[[package]] +name = "diesel" -+version = "1.4.2" ++version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" ++replace = "diesel 1.4.6" + +[[package]] +name = "diesel_cli" -+version = "1.4.0" ++version = "1.4.1" +dependencies = [ -+ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (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)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "barrel", ++ "chrono", ++ "clap", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "difference", ++ "dotenv", ++ "libsqlite3-sys", ++ "migrations_internals 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11", ++ "serde", ++ "tempdir", ++ "tempfile 3.2.0", ++ "toml", ++ "url", +] + +[[package]] +name = "diesel_demo_step_1_mysql" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_1_pg" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_1_sqlite" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_2_mysql" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_2_pg" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_2_sqlite" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_3_mysql" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_3_pg" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_demo_step_3_sqlite" +version = "0.1.0" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", +] + +[[package]] +name = "diesel_derives" -+version = "1.4.0" ++version = "1.4.1" +dependencies = [ -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.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)", ++ "cfg-if 0.1.10", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", ++ "proc-macro2", ++ "quote 1.0.9", ++ "syn 1.0.67", +] + +[[package]] +name = "diesel_derives" -+version = "1.4.0" ++version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+replace = "diesel_derives 1.4.0" ++checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" ++replace = "diesel_derives 1.4.1" + +[[package]] +name = "diesel_infer_schema" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680" +dependencies = [ -+ "infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "infer_schema_macros", +] + +[[package]] +name = "diesel_migrations" +version = "1.4.0" +dependencies = [ -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", ++ "migrations_internals 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_macros 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "diesel_migrations" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" +replace = "diesel_migrations 1.4.0" + +[[package]] +name = "diesel_tests" +version = "0.1.0" +dependencies = [ -+ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.0", -+ "diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "assert_matches", ++ "bigdecimal", ++ "chrono", ++ "diesel 1.4.6", ++ "diesel_infer_schema", + "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", ++ "ipnetwork", ++ "quickcheck", ++ "serde_json", ++ "uuid 0.8.2", +] + +[[package]] +name = "difference" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" + +[[package]] +name = "dotenv" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3" +dependencies = [ -+ "derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "derive-error-chain", ++ "error-chain", ++ "regex 0.2.11", +] + +[[package]] +name = "env_logger" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" +dependencies = [ -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9", ++ "regex 0.1.80", +] + +[[package]] +name = "error-chain" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" +dependencies = [ -+ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] -+name = "gcc" -+version = "0.3.55" ++name = "generic-array" ++version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" ++dependencies = [ ++ "typenum", ++] + +[[package]] +name = "getrandom" -+version = "0.1.11" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", +] + +[[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.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", +] + +[[package]] +name = "infer_schema_internals" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64" +dependencies = [ -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "infer_schema_macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6" +dependencies = [ -+ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dotenv", ++ "infer_schema_internals", ++ "quote 0.3.15", ++ "syn 0.11.11", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++dependencies = [ ++ "cfg-if 1.0.0", +] + +[[package]] +name = "ipnetwork" -+version = "0.13.1" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" +dependencies = [ -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", +] + +[[package]] +name = "itoa" -+version = "0.4.4" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "js-sys" -+version = "0.3.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "wasm-bindgen 0.2.50 (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 = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" -+version = "0.2.62" ++version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" + +[[package]] +name = "libsqlite3-sys" -+version = "0.12.0" ++version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" +dependencies = [ -+ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "lock_api" -+version = "0.2.0" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +dependencies = [ -+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard", +] + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.14", +] + +[[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 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "memchr" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "memchr" -+version = "2.2.1" ++version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "migrations_internals" -+version = "1.4.0" ++version = "1.4.1" +dependencies = [ -+ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "barrel", ++ "diesel 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir", +] + +[[package]] +name = "migrations_internals" -+version = "1.4.0" ++version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+replace = "migrations_internals 1.4.0" ++checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" ++replace = "migrations_internals 1.4.1" + +[[package]] +name = "migrations_macros" -+version = "1.4.0" ++version = "1.4.2" +dependencies = [ -+ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "migrations_internals 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote 1.0.9", ++ "syn 1.0.67", ++ "tempdir", +] + +[[package]] +name = "migrations_macros" -+version = "1.4.0" ++version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+replace = "migrations_macros 1.4.0" ++checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" ++replace = "migrations_macros 1.4.2" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" ++dependencies = [ ++ "adler", ++ "autocfg 1.0.1", ++] + +[[package]] +name = "mysqlclient-sys" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85" +dependencies = [ -+ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "num-bigint" -+version = "0.2.2" ++version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "num-integer", ++ "num-traits", +] + +[[package]] +name = "num-integer" -+version = "0.1.41" ++version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "num-traits", +] + +[[package]] +name = "num-traits" -+version = "0.2.8" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", +] + +[[package]] -+name = "parking_lot" -+version = "0.8.0" ++name = "object" ++version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "parking_lot" -+version = "0.9.0" ++version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ -+ "lock_api 0.3.1 (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)", ++ "instant", ++ "lock_api", ++ "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" -+version = "0.5.0" ++version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ -+ "cfg-if 0.1.9 (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.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5 (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.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.9 (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.62 (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.10 (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", ++ "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 = "pkg-config" -+version = "0.3.15" ++version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "ppv-lite86" -+version = "0.2.5" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "pq-sys" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda" +dependencies = [ -+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg", +] + +[[package]] +name = "proc-macro2" -+version = "0.4.30" ++version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ -+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.1", +] + +[[package]] +name = "quickcheck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406" +dependencies = [ -+ "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger", ++ "log 0.3.9", ++ "rand 0.3.23", +] + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "quote" -+version = "0.6.13" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", +] + +[[package]] +name = "r2d2" -+version = "0.8.5" ++version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" +dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.14", ++ "parking_lot", ++ "scheduled-thread-pool", +] + +[[package]] +name = "rand" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" +dependencies = [ -+ "libc 0.2.62 (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.62 (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.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (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.0" ++version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ -+ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (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.6 (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.2 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[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.62 (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.62 (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.6 (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 = "regex" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +dependencies = [ -+ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.5.3", ++ "memchr 0.1.11", ++ "regex-syntax 0.3.9", ++ "thread_local 0.2.7", ++ "utf8-ranges 0.1.3", +] + +[[package]] +name = "regex" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" +dependencies = [ -+ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.6.10", ++ "memchr 2.3.4", ++ "regex-syntax 0.5.6", ++ "thread_local 0.3.6", ++ "utf8-ranges 1.0.4", +] + +[[package]] +name = "regex-syntax" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" + +[[package]] +name = "regex-syntax" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" +dependencies = [ -+ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ucd-util", +] + +[[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)", -+] -+ -+[[package]] -+name = "rust-crypto" -+version = "0.2.36" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", +] + +[[package]] +name = "rustc-demangle" -+version = "0.1.16" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rustc-serialize" -+version = "0.3.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" + +[[package]] +name = "ryu" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "safemem" -+version = "0.3.2" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "scheduled-thread-pool" -+version = "0.2.2" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" +dependencies = [ -+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot", +] + +[[package]] +name = "scopeguard" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" -+version = "1.0.99" ++version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +dependencies = [ -+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.99" ++version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +dependencies = [ -+ "proc-macro2 1.0.2 (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.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote 1.0.9", ++ "syn 1.0.67", +] + +[[package]] +name = "serde_json" -+version = "1.0.40" ++version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ -+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa", ++ "ryu", ++ "serde", +] + +[[package]] +name = "smallvec" -+version = "0.6.10" ++version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f" +dependencies = [ -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", +] + +[[package]] +name = "structopt-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15", ++ "syn 0.11.11", +] + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.3.15", ++ "synom", ++ "unicode-xid 0.0.4", +] + +[[package]] +name = "syn" -+version = "0.15.44" ++version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" +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)", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.2 (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", ++ "quote 1.0.9", ++ "unicode-xid 0.2.1", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.0.4", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +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)", ++ "rand 0.4.6", ++ "remove_dir_all", +] + +[[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.62 (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.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.0 (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 = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "thread-id" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" +dependencies = [ -+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "libc", +] + +[[package]] +name = "thread_local" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" +dependencies = [ -+ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread-id", +] + +[[package]] +name = "thread_local" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", +] + +[[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 0.2.62 (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)", ++ "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 = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ -+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", +] + +[[package]] -+name = "ucd-util" -+version = "0.1.5" ++name = "typenum" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" + +[[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.8" ++version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +dependencies = [ -+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tinyvec", +] + +[[package]] +name = "unicode-width" -+version = "0.1.6" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "unicode-xid" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[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", ++ "matches", ++ "percent-encoding", +] + +[[package]] +name = "utf8-ranges" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" + +[[package]] +name = "utf8-ranges" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" + +[[package]] +name = "uuid" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" +dependencies = [ -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", +] + +[[package]] +name = "uuid" -+version = "0.7.4" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "vcpkg" -+version = "0.2.7" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" + +[[package]] +name = "vec_map" -+version = "0.8.1" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "wasi" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bumpalo 2.6.0 (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)", -+ "proc-macro2 1.0.2 (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.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.2 (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.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.50" ++version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -+"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" -+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" -+"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55" -+"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" -+"checksum barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2016bcea86b2a1a807753dc2b6ba682fa24e14e50c7474f4b1a0330949c86fb" -+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6f09cde06fb2cd52a77123c36bfd1e8e60cf13a8bac6ba8f451dabff4644c8" -+"checksum bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "679e21a6734fdfc63378aea80c2bf31e6ac8ced21ed33e1ee37f8f7bf33c2056" -+"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" -+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" -+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -+"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" -+"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -+"checksum chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a" -+"checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7" -+"checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4" -+"checksum diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680" -+"checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" -+"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" -+"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3" -+"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" -+"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" -+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64" -+"checksum infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6" -+"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c" -+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+"checksum js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4" -+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" -+"checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1" -+"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" -+"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" -+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"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 memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9" -+"checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe" -+"checksum mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85" -+"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718" -+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -+"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" -+"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -+"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" -+"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" -+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" -+"checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda" -+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -+"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95" -+"checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406" -+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"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 r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bc42ce75d9f4447fb2a04bbe1ed5d18dd949104572850ec19b164e274919f81b" -+"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.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" -+"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 regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -+"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -+"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" -+"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" -+"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" -+"checksum scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd07742e081ff6c077f5f6b283f12f32b9e7cc765b316160d66289b74546fbb3" -+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+"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.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f" -+"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425" -+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" -+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f" -+"checksum structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c" -+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"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 textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -+"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" -+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"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 utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" -+"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" -+"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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" -+"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc" -+"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0" -+"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9" -+"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e" -+"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d" -+"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-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix index 20185ff7d1..8a976f44bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security , sqliteSupport ? true, sqlite , postgresqlSupport ? true, postgresql -, mysqlSupport ? true, mysql, zlib, libiconv +, mysqlSupport ? true, mariadb, zlib, libiconv }: assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true) @@ -16,26 +16,37 @@ in rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "diesel-rs"; repo = "diesel"; - rev = "v${version}"; - sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb"; + # diesel and diesel_cli are independently versioned. diesel_cli + # 1.4.1 first became available in diesel 1.4.5, but we can use + # a newer diesel tag. + rev = "v1.4.6"; + sha256 = "0c8a2f250mllzpr20j7j0msbf2csjf9dj8g7j6cl04ifdg7gwb9z"; }; patches = [ - # Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated` - # - # Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c - # is in a release. - ./allow-warnings.patch + # Fixes: + # Compiling diesel v1.4.6 (/build/source/diesel) + # error: this `#[deprecated]` annotation has no effect + # --> diesel/src/query_builder/insert_statement/mod.rs:205:1 + # | + # 205 | / #[deprecated( + # 206 | | since = "1.2.0", + # 207 | | note = "Use `<&'a [U] as Insertable>::Values` instead" + # 208 | | )] + # | |__^ help: remove the unnecessary deprecation attribute + # | + # = note: `#[deny(useless_deprecated)]` on by default + ./fix-deprecated.patch ]; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; + cargoSha256 = "1vkwp861vm20agj0lkhnnxgg4vwg4d5clvvyzxrmm4y4yw46cdl2"; nativeBuildInputs = [ pkg-config ]; @@ -44,7 +55,7 @@ rustPlatform.buildRustPackage rec { ++ optional (stdenv.isDarwin && mysqlSupport) libiconv ++ optional sqliteSupport sqlite ++ optional postgresqlSupport postgresql - ++ optionals mysqlSupport [ mysql zlib ]; + ++ optionals mysqlSupport [ mariadb zlib ]; buildAndTestSubdir = "diesel_cli"; diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/fix-deprecated.patch b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/fix-deprecated.patch new file mode 100644 index 0000000000..3f50990979 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/fix-deprecated.patch @@ -0,0 +1,10 @@ +diff --git a/diesel/src/query_builder/insert_statement/mod.rs b/diesel/src/query_builder/insert_statement/mod.rs +index b6bb34df9d..7486eb7a59 100644 +--- a/diesel/src/query_builder/insert_statement/mod.rs ++++ b/diesel/src/query_builder/insert_statement/mod.rs +@@ -1,3 +1,5 @@ ++#![allow(useless_deprecated)] ++ + mod column_list; + mod insert_from_select; + diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index c83b6142b0..227834da97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.57.0"; + version = "1.58.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-waaBillxI7tKQAugyolAWQWf4CG+uIkjtvNXNNFpqRY="; + sha256 = "sha256-zOEd7e9OgkQxVaHIw9LZJ7ufl2sNpMnTTM3KetiWl+w="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix new file mode 100644 index 0000000000..186045c9aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -0,0 +1,94 @@ +{ lib +, fetchFromGitLab +, fetchpatch +, meson +, ninja +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gi-docgen"; + version = "2021.2"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "ebassi"; + repo = pname; + rev = version; + sha256 = "17swx4s60anfyyb6dcsl8fq3s0j9cy54qcw0ciq4qj59d4039w5h"; + }; + + patches = [ + # Add pkg-config file so that Meson projects can find this. + # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/26 + (fetchpatch { + url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/d65ed2e4827c4129d26e3c1df9a48054b4e72c50.patch"; + sha256 = "BEefcHiAd/HTW5zo39J2WtfQjGXUkNFB6MDJj8/Ge80="; + }) + + # Name generated devhelp files correctly. + # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/27 + (fetchpatch { + url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/7c4de72f55cbce5670c3a6a1451548e97e5f07f7.patch"; + sha256 = "ov/PvrZzKmCzw7nHJkbeLCnhtUVw1UbZQjFrWT3AtVg="; + }) + + # Fix broken link in Devhelp TOC. + # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/28 + (fetchpatch { + url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/56f0e6f8b4bb9c92d635df60aa5d68f55b036711.patch"; + sha256 = "5gFGiO9jPpkyZBL4qtWEotE5jY3sCGFGUGN/Fb6jZ+0="; + }) + + # Devhelp does not like subsections without links. + # https://gitlab.gnome.org/GNOME/devhelp/-/issues/28 + (fetchpatch { + # Only visual but needed for the other two to apply. + # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/28 + url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/7f67fad5107b73489cb7bffca49177d9ad78e422.patch"; + sha256 = "OKbC690nJsl1ckm/y9eeKDYX6AEClsNvIFy7DK+JYEc="; + }) + # Add links to index. + (fetchpatch { + url = "https://gitlab.gnome.org/ebassi/gi-docgen/commit/f891cc5fd481bc4180eec144d14f32c15c91833b.patch"; + sha256 = "Fcnvdgxei+2ulGoWoCZ8WFrNy01tlNXMkHru3ArGHVQ="; + }) + # Use different link for each symbol type name. + # https://gitlab.gnome.org/ebassi/gi-docgen/merge_requests/29 + (fetchpatch { + url = "https://gitlab.gnome.org/jtojnar/gi-docgen/commit/08dcc31f62be1a5af9bd9f8f702f321f4b5cffde.patch"; + sha256 = "vAT8s7zQ9zCoZWK+6PsxcD5/48ZAfIOl4RSNljRCGWQ="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + ]; + + pythonPath = with python3.pkgs; [ + jinja2 + markdown + markupsafe + pygments + toml + typogrify + ]; + + doCheck = false; # no tests + + postFixup = '' + # Do not propagate Python + substituteInPlace $out/nix-support/propagated-build-inputs \ + --replace "${python3}" "" + ''; + + meta = with lib; { + description = "Documentation generator for GObject-based libraries"; + homepage = "https://gitlab.gnome.org/ebassi/gi-docgen"; + license = licenses.asl20; # OR GPL-3.0-or-later + maintainers = teams.gnome.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index 3fda533c52..7f0db1f712 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.6"; + version = "2.1.8"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-l3Aftu1RkcDgzdzrKIAlziDgbjYfj5xLIbysS0a5JZw="; + sha256 = "sha256-sK8HOfeiV0xn540bU7inZl/hV6uzitJ4Szqk96a8DMc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index d75dae12bc..6c6d6343d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-/DpsB3MS0iPYFSug3RTWOprB8tclVP6v3dbS3mC3S+g="; + sha256 = "sha256-xUDhJLTO3JZ7rlUUzcypUev60qmRK9zOlO2VYeXqT4o="; }; - vendorSha256 = "sha256-AOdWv0PkDi8o5V71DVzAd/sRibbMf3CkqmJGmuxHtuc="; + vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/grabserial/default.nix b/third_party/nixpkgs/pkgs/development/tools/grabserial/default.nix index ce336241b6..2ce3ff49c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/grabserial/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "grabserial"; version = "2.0.2"; @@ -11,7 +11,10 @@ pythonPackages.buildPythonApplication rec { sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3"; }; - propagatedBuildInputs = [ pythonPackages.pyserial ]; + propagatedBuildInputs = [ python3Packages.pyserial ]; + + # no usable tests + doCheck = false; meta = with lib; { description = "Python based serial dump and timing program"; diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix index 81c059d293..35fccf0e62 100644 --- a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.47.11"; + version = "7.51.0"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "1inf2radpkd9jndap91cw0wbb2qmi71i287vyydl492372cf3cs2"; + sha256 = "0wcqk4iy4r57k6fd6l0732yp5mclqfla1lfvx96ay45jnhh7rknx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/hexio/default.nix b/third_party/nixpkgs/pkgs/development/tools/hexio/default.nix index 5b3fca815e..0b4e474515 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hexio/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hexio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, pcsclite, pth }: +{ lib, stdenv, fetchFromGitHub, pcsclite, pth, python2 }: stdenv.mkDerivation rec { pname = "hexio"; @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { repo = "hexio"; }; - propagatedBuildInputs = [ python ]; - buildInputs = [ pcsclite pth ]; + strictDeps = true; + + buildInputs = [ pcsclite pth python2 ]; patchPhase = '' substituteInPlace Makefile \ diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix index 81661dce8b..d3e72811db 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix @@ -18,7 +18,7 @@ let pname = "hover"; - version = "0.46.2"; + version = "0.46.3"; libs = with xorg; [ libX11.dev @@ -46,13 +46,13 @@ let subPackages = [ "." ]; - vendorSha256 = "0hdh4vwzvwlarjzg6pv9dp665r9px9yplfjpgyyfjyy5b9sxl795"; + vendorSha256 = "sha256-qTBGmONlcFJcN+9bMZbVY+6kOQ97JmJWWvgmNeDWBL0="; src = fetchFromGitHub { rev = "v${version}"; owner = "go-flutter-desktop"; repo = pname; - sha256 = "1gmsv7hmj7zzfwbz50az3kvgzqvj0jn8i2pv7sjyl9dx1bavi5g3"; + sha256 = "sha256-0qzbRzpqoZcAt3k52+omqZ3Fq1KdS++wPpQkBkG1p6o="; }; nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch b/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch index 27d49197e5..00b1900bf7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch +++ b/third_party/nixpkgs/pkgs/development/tools/hover/fix-assets-path.patch @@ -53,7 +53,7 @@ index cb75563..3822e80 100644 -func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox *rice.Box, templateData interface{}) { - templateString, err := assetsBox.String(boxed) +func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox string, templateData interface{}) { -+ templateString, err := ioutil.ReadFile(boxed + "/" + boxed) ++ templateString, err := ioutil.ReadFile(assetsBox + "/" + boxed) if err != nil { log.Errorf("Failed to find template file: %v\n", err) os.Exit(1) diff --git a/third_party/nixpkgs/pkgs/development/tools/icr/default.nix b/third_party/nixpkgs/pkgs/development/tools/icr/default.nix index 11e52f77cb..095055cbed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/icr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/icr/default.nix @@ -13,13 +13,13 @@ crystal.buildCrystalPackage rec { pname = "icr"; - version = "unstable-2020-10-06"; + version = "unstable-2021-03-14"; src = fetchFromGitHub { owner = "crystal-community"; repo = "icr"; - rev = "8c57cd7c1fdf8088cb05c1587bd6c40d244a8a80"; - sha256 = "sha256-b0w6oG2npNgdi2ZowMlJy0iUxQWqb9+DiruQl7Ztb0E="; + rev = "b6b335f40aff4c2c07d21250949935e8259f7d1b"; + sha256 = "sha256-Qoy37lCdHFnMAuuqyB9uT15/RLllksFyApYAGy+RmDs="; }; shardsFile = ./shards.nix; diff --git a/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix b/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix index 24aa43cdeb..5c3e2046bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jindrapetrik/jpexs-decompiler"; license = licenses.gpl3; platforms = jdk8.meta.platforms; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix index ad4304fc6e..39819db47d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix @@ -1,26 +1,52 @@ -{ lib, stdenv, nixosTests, fetchurl, oniguruma }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook +, onigurumaSupport ? true, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; version = "1.6"; - src = fetchurl { - url = - "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256 = "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; + src = fetchFromGitHub { + owner = "stedolan"; + repo = "jq"; + rev = "${pname}-${version}"; + hash = "sha256-CIE8vumQPGK+TFAncmpBijANpFALLTadOvkob0gVzro"; }; + patches = [ + (fetchpatch { + name = "fix-tests-when-building-without-regex-supports.patch"; + url = "https://github.com/stedolan/jq/pull/2292/commits/f6a69a6e52b68a92b816a28eb20719a3d0cb51ae.patch"; + sha256 = "pTM5FZ6hFs5Rdx+W2dICSS2lcoLY1Q//Lan3Hu8Gr58="; + }) + ]; + outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; - buildInputs = [ oniguruma ]; + # Upstream script that writes the version that's eventually compiled + # and printed in `jq --help` relies on a .git directory which our src + # doesn't keep. + preConfigure = '' + echo "#!/bin/sh" > scripts/version + echo "echo ${version}" >> scripts/version + patchShebangs scripts/version + ''; + + # paranoid mode: make sure we never use vendored version of oniguruma + # Note: it must be run after automake, or automake will complain + preBuild = '' + rm -r ./modules/oniguruma + ''; + + buildInputs = lib.optionals onigurumaSupport [ oniguruma ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--bindir=\${bin}/bin" "--sbindir=\${bin}/bin" "--datadir=\${doc}/share" "--mandir=\${man}/share/man" - ] - # jq is linked to libjq: + ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" + # jq is linked to libjq: ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; @@ -31,6 +57,8 @@ stdenv.mkDerivation rec { $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null ''; + passthru = { inherit onigurumaSupport; }; + meta = with lib; { description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index e073c4f2e9..4b448b4697 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aJGYkWMMg26V/T5BcWo3ibtHJBm4g2iIQn8cxs105Ys="; + sha256 = "sha256-XZoevXYSlBj8umxC8UNucE21pjDNaeX1c65QAwEuqWQ="; }; - vendorSha256 = "sha256-6yfsGGzdUQySyQNuB58gwbsMjJgtUhfgfPI2zYlyUQo="; + vendorSha256 = "sha256-kJtJ2ut+yhgNoPIY5i3dKmQV0g+8RvcGnxCyay7wy2A="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix index e5280d46b5..26d6d9178e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, m4, perl, lzma}: +{lib, stdenv, fetchurl, m4, perl, xz}: stdenv.mkDerivation rec { name = "autoconf-2.13"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - nativebuildInputs = [ lzma ]; + nativebuildInputs = [ xz ]; buildInputs = [ m4 perl ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix index 4d95310c34..9cfd938001 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline +{ lib, stdenv, fetchurl, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] + buildInputs = [ bison flex libusb-compat-0_1 libelf libftdi1 readline ] ++ lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index 080bc7a7f7..f3b3b0b2d0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, fetchpatch , gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config , python3 }: @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Fix deprecation warning with libftdi 1.5 + (fetchpatch { + url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch"; + sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5"; + }) + ]; + nativeBuildInputs = [ gcc-arm-embedded pkg-config python3 diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 72c8c2fab9..8954ff2bc4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts , musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs -, argp-standalone }: +, argp-standalone +, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive +}: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { @@ -52,17 +54,25 @@ stdenv.mkDerivation rec { }) ] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; + outputs = [ "bin" "dev" "out" "man" ]; + 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 ] - ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ]; + ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ] + ++ lib.optional enableDebuginfod [ pkg-config ]; buildInputs = [ zlib bzip2 xz ] ++ lib.optional stdenv.hostPlatform.isMusl [ argp-standalone musl-fts musl-obstack + ] ++ lib.optionals enableDebuginfod [ + sqlite + curl + libmicrohttpd_0_9_70 + libarchive ]; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -74,6 +84,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" + ] ++ lib.optionals (!enableDebuginfod) [ "--disable-libdebuginfod" "--disable-debuginfod" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gede/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gede/default.nix index 486557d921..00ce9958b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gede/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gede/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, makeWrapper, python, qmake, ctags, gdb }: +{ mkDerivation, lib, fetchurl, makeWrapper, python3, qmake, ctags, gdb }: mkDerivation rec { pname = "gede"; @@ -9,10 +9,12 @@ mkDerivation rec { sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3"; }; - nativeBuildInputs = [ qmake makeWrapper python ]; + nativeBuildInputs = [ qmake makeWrapper python3 ]; buildInputs = [ ctags ]; + strictDeps = true; + dontUseQmakeConfigure = true; buildPhase = ":"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix index fb3ddfcb29..7ace6f857c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix @@ -1,8 +1,10 @@ { fetchurl, lib, stdenv, libtool, makeWrapper -, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags +, coreutils, ctags, ncurses, python3Packages, sqlite, universal-ctags }: -stdenv.mkDerivation rec { +let + pygments = python3Packages.pygments; +in stdenv.mkDerivation rec { pname = "global"; version = "6.6.5"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - propagatedBuildInputs = [ pythonPackages.pygments ]; + propagatedBuildInputs = [ pygments ]; configureFlags = [ "--with-ltdl-include=${libtool}/include" @@ -34,9 +36,9 @@ stdenv.mkDerivation rec { cp -v *.el "$out/share/emacs/site-lisp" wrapProgram $out/bin/gtags \ - --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" + --prefix PYTHONPATH : "$(toPythonPath ${pygments})" wrapProgram $out/bin/global \ - --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" + --prefix PYTHONPATH : "$(toPythonPath ${pygments})" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/md2man/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/tools/misc/md2man/default.nix rename to third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix index 7db3c902c7..fe43da91b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/md2man/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix @@ -1,10 +1,10 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-md2man"; version = "2.0.0"; - goPackagePath = "github.com/cpuguy83/go-md2man"; + vendorSha256 = null; src = fetchFromGitHub { rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix index ba1fa720dd..4a205268c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "help2man-1.47.17"; + name = "help2man-1.48.1"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "sha256-2jo1xQseH4yPoyLWn6R8kBHORDqPuNHWcbHwG4sACOs="; + sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k="; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index c557f9600c..0cc7769d3c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -2,7 +2,7 @@ , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json -, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar +, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] , tests ? {}, mdbook @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy + gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ autoreconfHook pkg-config mdbook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index a49f223131..40a480a090 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -2,12 +2,12 @@ { hydra-unstable = callPackage ./common.nix { - version = "2021-03-10"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "930f05c38eeac63ad6c3e3250de2667e2df2e96e"; - sha256 = "06s2lg119p96i1j4rdbg3z097n25bgvq8ljdn4vcwcw3yz0lnswm"; + rev = "9bb04ed97af047968196bad1728f927f7a6d905f"; + sha256 = "sha256-gN/zNI2hGDMnYUjeGnU7SAuXP4KCmNqG+AYOVfINaQE="; }; nix = nixFlakes; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix index 7a3379d592..967fc442a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # fix "unescaped left brace" errors when using intltool in some cases patches = [(fetchpatch { name = "perl5.26-regex-fixes.patch"; - url = [ + urls = [ "https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch" "https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix index 042d085c1e..217cbe5e02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }: +{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }: stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { ./jsfalse_to_null.patch ]; - nativeBuildInputs = [ unzip ]; - buildInputs = [ autoconf makedepend perl python zip ]; + nativeBuildInputs = [ unzip perl python3 zip ]; + + strictDeps = true; # It works without MOZ_FIX_LINK_PATHS, circumventing an impurity # issue. Maybe we could kick js/ (spidermonkey) completely and diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix index 3b355b6218..ae757f0d80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }: +{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; @@ -10,17 +10,15 @@ stdenv.mkDerivation rec { url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ bison flex gperf pkg-config ]; + buildInputs = [ bash ncurses python3 ]; + + strictDeps = true; configureFlags = [ "--enable-frontends=conf,mconf,nconf" ]; - postInstall = '' - wrapPythonPrograms - ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix index c39ef5e005..86e1dac021 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.17"; + version = "1.20"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "13dxsmhpf9n2wqggf4gd6f12rm0vhv0q96jd50gkvaxzzvgpzzbc"; + sha256 = "11q9dpfi4qj2v8z0nlf8c0079mlv10ljhh0d1yr0j4ds3saacd15"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/"; description = "Pahole and other DWARF utils"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bosu ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix index d1496bcdf4..f36b1cf449 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -1,5 +1,9 @@ { lib, stdenv, fetchurl, perl, libunwind, buildPackages }: +# libunwind does not have the supportsHost attribute on darwin, thus +# when this package is evaluated it causes an evaluation error +assert stdenv.isLinux; + stdenv.mkDerivation rec { pname = "strace"; version = "5.11"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix index 5f4478bd4f..b8da38ace6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, ncurses, lzma }: +{ stdenv, fetchurl, texinfo, ncurses, xz }: stdenv.mkDerivation rec { pname = "texinfo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ lzma ]; + nativeBuildInputs = [ xz ]; # Disabled because we don't have zdiff in the stdenv bootstrap. #doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index 50c1ba4075..f1365792fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.4"; + version = "2.8.5"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1b78f8gk53m68i9igvfpylmvi55h4qqfwymknz1vval4flbj0r2f"; + sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br"; }; buildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 5ed83c5411..51f731c943 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.4"; + version = "1.37.8"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2"; + sha256 = "0kgv4l15rli9a7grmcsbv72csmxi7vqa7lrrr8bd4cq9ighh54q3"; }; nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix b/third_party/nixpkgs/pkgs/development/tools/oq/default.nix index 3a3e8addf7..f10136793b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oq/default.nix @@ -1,35 +1,26 @@ -{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper, fetchpatch }: +{ lib +, fetchFromGitHub +, crystal +, jq +, libxml2 +, makeWrapper +}: crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw"; + sha256 = "sha256-vMW+N3N6H8S6dNm4eBJo2tSxSiouG92t4Nq3cYSWcw0="; }; - patches = [ - (fetchpatch { - # remove once we have upgraded to oq 1.1.2+ - name = "yaml-test-leniency.patch"; - url = "https://github.com/Blacksmoke16/oq/commit/93ed2fe50c9ce3fd8d35427e007790ddaaafce60.patch"; - sha256 = "1iyz0c0w0ykz268bkrlqwvh1jnnrja0mqip6y89sbpa14lp0l37n"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jq libxml2 ]; - format = "crystal"; - crystalBinaries.oq.src = "src/oq_cli.cr"; - - preCheck = '' - mkdir bin - cp oq bin/oq - ''; + format = "shards"; postInstall = '' wrapProgram "$out/bin/oq" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index a39e29983c..8331e3b92a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,25 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { pname = "packer"; - version = "1.7.0"; - - goPackagePath = "github.com/hashicorp/packer"; - - subPackages = [ "." ]; + version = "1.7.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-x62C44vTIysk9Lx9HZeTBf8k1+P5hfMIijvTWu3cZrA="; + sha256 = "sha256-PZwKvb43Xf8HaC148Xo076u3sP53nwC4fJ2X7HU0gDo="; }; + vendorSha256 = null; + + subPackages = [ "." ]; + buildFlagsArray = [ "-ldflags=-s -w" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion --zsh go/src/${goPackagePath}/contrib/zsh-completion/_packer + installShellCompletion --zsh contrib/zsh-completion/_packer ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 42c9ee872f..1de45b0844 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.7.5"; + version = "3.7.6"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FRy18ScW4/6TonoxfNRIeDKWWfJ1s0J3m/rvSlJrv3A="; + sha256 = "sha256-adwLtG6o/DB9TKHgthyMNV6yB9Cwxp9PhGIyjnTXueo="; }; nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index ac2ad69fea..0ce151f650 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -135,7 +135,5 @@ rustPlatform.buildRustPackage { ''; license = licenses.mit; maintainers = with maintainers; [ Profpatsch ]; - # Aarch has test failures with how tree-sitter compiles the generated C files - broken = stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix new file mode 100644 index 0000000000..9f94e3c78f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "protoc-gen-go"; + version = "1.26.0"; + + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf-go"; + rev = "v${version}"; + sha256 = "sha256-n2LHI8DXQFFWhTPOFCegBgwi/0tFvRE226AZfRW8Bnc="; + }; + + vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; + + subPackages = [ "cmd/protoc-gen-go" ]; + + meta = with lib; { + description = "Go support for Google's protocol buffers"; + homepage = "https://google.golang.org/protobuf"; + license = licenses.bsd3; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix new file mode 100644 index 0000000000..ae92a10550 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "protoc-gen-twirp"; + version = "7.1.1"; + + src = fetchFromGitHub { + owner = "twitchtv"; + repo = "twirp"; + rev = "v${version}"; + sha256 = "sha256-GN7akAp0zzS8wVhgXlT1ceFUFKH4Sz74XQ8ofIE8T/k="; + }; + + goPackagePath = "github.com/twitchtv/twirp"; + + subPackages = [ + "protoc-gen-twirp" + "protoc-gen-twirp_python" + ]; + + meta = with lib; { + description = "A simple RPC framework with protobuf service definitions"; + homepage = "https://github.com/twitchtv/twirp"; + license = licenses.asl20; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix new file mode 100644 index 0000000000..40df9e974e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchgit }: + +buildGoModule rec { + pname = "protoc-gen-twirp_php"; + version = "0.6.0"; + + # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored + src = fetchgit { + url = "https://github.com/twirphp/twirp.git"; + rev = "v${version}"; + sha256 = "sha256-WnvCdAJIMA4A+f7H61qcVbKNn23bNVOC15vMCEKc+CI="; + }; + + vendorSha256 = "sha256-LIMxrWXlK7+JIRmtukdXPqfw8H991FCAOuyEf7ZLSTs="; + + subPackages = [ "protoc-gen-twirp_php" ]; + + preBuild = '' + go generate ./... + ''; + + meta = with lib; { + description = "PHP port of Twitch's Twirp RPC framework"; + homepage = "https://github.com/twirphp/twirp"; + license = licenses.mit; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix new file mode 100644 index 0000000000..3348759c01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "protoc-gen-twirp_swagger"; + version = "unstable-2021-03-29"; + + src = fetchFromGitHub { + owner = "elliots"; + repo = "protoc-gen-twirp_swagger"; + rev = "f21ef47d69e37c1602a7fb26146de05c092d30b6"; + sha256 = "sha256-uHU15NbHK7SYgNS3VK21H/OqDo/JyyTZdXw3i9lsgLY="; + }; + + vendorSha256 = "sha256-g0+9l83Fc0XPzsZAKjLBrjD+tv2+Fot57hcilqAhOZk="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Swagger generator for twirp"; + homepage = "https://github.com/elliots/protoc-gen-twirp_swagger"; + license = licenses.bsd3; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix new file mode 100644 index 0000000000..2aabe3bcce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "protoc-gen-twirp_typescript"; + version = "unstable-2021-03-29"; + + src = fetchFromGitHub { + owner = "larrymyers"; + repo = "protoc-gen-twirp_typescript"; + rev = "97fd63e543beb2d9f6a90ff894981affe0f2faf1"; + sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; + }; + + vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Protobuf Plugin for Generating a Twirp Typescript Client"; + homepage = "https://github.com/larrymyers/protoc-gen-twirp_typescript"; + license = licenses.mit; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock index 913009f6b2..61792b3ec5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock @@ -8,7 +8,7 @@ GEM rainbow (3.0.0) regexp_parser (2.1.1) rexml (3.2.4) - rubocop (1.12.0) + rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix b/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix index a388377ae0..2122236af5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix @@ -11,7 +11,7 @@ bundlerEnv { meta = with lib; { description = "Automatic Ruby code style checking tool"; - homepage = "https://docs.rubocop.org/"; + homepage = "https://rubocop.org/"; license = licenses.mit; maintainers = with maintainers; [ marsam leemachin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix index fc919235e2..a979374962 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3y0h6awywx4rdmjdan908jmnyk589pndbjypxkfbkqvjx514fw"; + sha256 = "0hi2c3a6alya9yx07nirnjzlc0mvmidnx67874njp6wf7d5xqqr9"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; rubocop-ast = { dependencies = ["parser"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 15ec7518e8..8d12da30a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.3"; + version = "0.8.0"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0df87kx8dfq2fvz00k6advwg2iw9djkflhrbsjw0xhac78623c56"; + sha256 = "1rvbikhbqsfa2sh79kapqg4yz19r1yhqfykl6cf4yjg6vawkwfw1"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "18l54jf9q5xb908bwyyil1sblxxa9mkrgr33gm0r6nxicw6kf8in"; + sha256 = "17cdac8ym59jwjxs3k4isazknhrlr6lw0j0r76n5xf0dd7apfgcs"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0z7sjfnnmld5bijn14c7v7arh0vzqmbkjk7bf9ky67acq2r2cv2f"; + cargoSha256 = "1rmhg9xhljgd5yq3xs0fzw1b0bgz7jfpf5mr2gviwqahl5vxvfiq"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index fd99521628..54eead5d2a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.14"; + version = "0.32.16"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g="; + sha256 = "sha256-FrrQcZHy5WjNYCod2TBWVAj4clNWPLWLIR2/Kvkz4q0="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74="; + cargoSha256 = "sha256-QEHl/Hhug0Ua/SZV0iq1jc6QGGxA1NwheEgGBZRYunI="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix index 177b12aea0..3cfea72743 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = version; - sha256 = "0knsq6n3wrsd3ir2r1wpxm6ks7rgkw33bk008s8fq33m3bq2yvm7"; + sha256 = "sha256-PltYUU2O/D1PrU+K8JN4+aUVLzHCeNyIsXMU6HLodXE="; }; - cargoSha256 = "09mhdi12wgg7s4wdnn0vfxhj7hwj5hjrq32mjgjr2hwm6yzhkzr2"; + cargoSha256 = "sha256-zR826fFSCSsJxGKSc7ugrLwMDvsjRBjs4eotKTfhGqI="; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 6ddd7b00d1..43f13b2e99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.5.1"; + version = "7.6.1"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eqg+Ke5n2H6/bPd1W8HL4XLMfdV8ard4SDrCeK0MFOg="; + sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80="; }; - cargoSha256 = "sha256-s7ip+/1hZJ8dQGix6yI5fQ4gAw2nHU8+dxxYcVvyTAs="; + cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k="; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index da552600cd..5dad37d081 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "1w9gf6fl1ncm2zlh0p29lislfsd35zd1mhns2mrxl2n734zavaqf"; + sha256 = "sha256-S3t1hv/mRn6vwyzT78DPIacqiJV3CnjGdOKsdSyYs8g="; }; - cargoSha256 = "12jw1m842gzy0ma4drgmwk1jac663vysllfpl9cglr039j1sfsx2"; + cargoSha256 = "sha256-uaeJmGEQHVSuILlYlJOHmRWWdN6FPvrHu6CbJyb60MY="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/scry/default.nix b/third_party/nixpkgs/pkgs/development/tools/scry/default.nix index 7346ace2ff..04307d02c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scry/default.nix @@ -1,23 +1,19 @@ -{ lib, fetchFromGitHub, crystal_0_35, coreutils, makeWrapper }: -let - crystal = crystal_0_35; +{ lib, fetchFromGitHub, crystal, coreutils, makeWrapper }: -in crystal.buildCrystalPackage rec { pname = "scry"; - version = "unstable-2020-09-02"; # to make it work with crystal 0.35 + version = "0.9.1"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = pname; - # rev = "v${version}"; - rev = "580a1879810a9f5d63d8a0d90fbdaa99d86b58da"; - sha256 = "sha256-WjpkkHfy38wDj/ejXyyMtd5rLfTRoj/7D+SAhRROnbU="; + rev = "v${version}"; + sha256 = "sha256-hqyG1aKY3M8q8lZEKzpUUKl9jS7NF+VMsma6+C0sCbg="; }; - # we are already testing for this, so we can ignore the failures + # a bunch of tests fail when built in the sandbox while perfectly fine outside postPatch = '' - rm spec/scry/executable_spec.cr + rm spec/scry/{client,completion_provider,context,executable}_spec.cr ''; format = "shards"; diff --git a/third_party/nixpkgs/pkgs/development/tools/scry/shards.nix b/third_party/nixpkgs/pkgs/development/tools/scry/shards.nix index 31660ef7cd..df3d084847 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scry/shards.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scry/shards.nix @@ -1,8 +1,14 @@ { + json_mapping = { + owner = "crystal-lang"; + repo = "json_mapping.cr"; + rev = "v0.1.0"; + sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; + }; lsp = { owner = "crystal-lang-tools"; repo = "lsp"; - rev = "v0.1.0"; - sha256 = "1sgsdgm2dmkp92a2lbaf2pgf80gljdlqzp9xkqvwz0rr92la6810"; + rev = "v0.2.0"; + sha256 = "1lnviqrywh0w05mx67mzw7d1qz328p52z4k69pcqw66gs44i7b5c"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix index 9cb70db3c7..30c77bb875 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.27"; + version = "1.0.29"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aJxSLOUmTuPzBJCnXv2d09Kdh/jPPBUmFnuq8629PWY="; + sha256 = "sha256-Po6kP6kAY5W3SQJ3iFCtzifSlQ+JgLIDhuk2UHSwAxM="; }; - vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; + vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/shellharden/default.nix b/third_party/nixpkgs/pkgs/development/tools/shellharden/default.nix new file mode 100644 index 0000000000..09c77f087d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/shellharden/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "shellharden"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "anordal"; + repo = pname; + rev = "v${version}"; + sha256 = "1003kgnql0z158d3rzz8s3i7s7rx9hjqqvp3li8xhzrgszvkgqk4"; + }; + + cargoSha256 = "1h4wp9xs9nq90ml2km9gd0afrzri6fbgskz6d15jqykm2fw72l88"; + + postPatch = "patchShebangs moduletests/run"; + + meta = with lib; { + description = "The corrective bash syntax highlighter"; + longDescription = '' + Shellharden is a syntax highlighter and a tool to semi-automate the + rewriting of scripts to ShellCheck conformance, mainly focused on quoting. + ''; + homepage = "https://github.com/anordal/shellharden"; + license = licenses.mpl20; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 02f2e49a30..489ab85a24 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -35,17 +35,22 @@ buildGoModule rec { ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' + runHook preBuild patchShebangs . make bin/skopeo docs + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 bin/skopeo -t $out/bin installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} + '' + '' + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock index a57d1811b1..94587de9ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: https://rubygems.org/ specs: - pg_query (1.2.0) - sqlint (0.1.10) - pg_query (~> 1) + google-protobuf (3.15.6) + pg_query (2.0.2) + google-protobuf (~> 3.15.5) + sqlint (0.2.0) + pg_query (~> 2) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/sqlint/default.nix index f9c535cc2b..960792d648 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/default.nix @@ -1,35 +1,18 @@ -{ lib, bundlerApp, fetchurl, bundlerUpdateScript }: +{ lib, bundlerApp, bundlerUpdateScript }: -let - LIB_PG_QUERY_TAG = "10-1.0.1"; - libpgQuerySrc = fetchurl { - name = "libpg_query.tar.gz"; - url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/${LIB_PG_QUERY_TAG}"; - sha256 = "0m5jv134hgw2vcfkqlnw80fr3wmrdvgrvk1ndcx9s44bzi5nsp47"; - }; -in bundlerApp { +bundlerApp { pname = "sqlint"; gemdir = ./.; exes = [ "sqlint" ]; - gemConfig = { - pg_query = attrs: { - dontBuild = false; - postPatch = '' - substituteInPlace ext/pg_query/extconf.rb \ - --replace "#{workdir}/libpg_query.tar.gz" "${libpgQuerySrc}" - ''; - }; - }; - passthru.updateScript = bundlerUpdateScript "sqlint"; meta = with lib; { description = "Simple SQL linter"; homepage = "https://github.com/purcell/sqlint"; license = licenses.mit; - maintainers = with maintainers; [ ariutta nicknovitski ]; - platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ ariutta nicknovitski purcell ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix index aeffdccffa..674fe75dc1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix @@ -1,13 +1,24 @@ { - pg_query = { + google-protobuf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p9s6znavm6v5dwk1hxg9a8h2lrrwh9l0rlk0sy8cx4sq2mq82m1"; + sha256 = "1ak5yqqhr04b4x0axzvpw1xzwmxmfcw0gf4r1ijixv15kidhsj3z"; type = "gem"; }; - version = "1.2.0"; + version = "3.15.6"; + }; + pg_query = { + dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bvn0swyzzhl9x8hlgaz7m7s1jqmpdi2c4klarix0hiyapy2il9y"; + type = "gem"; + }; + version = "2.0.2"; }; sqlint = { dependencies = ["pg_query"]; @@ -15,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ds7qsaqi745fda8nliy15is36l1bkfbfkr43q6smpy103xbk44c"; + sha256 = "1ylicsc9x4vpj6ff3hmrm6iz1xswrwwgn1m7ri8nx86ij30w9hkk"; type = "gem"; }; - version = "0.1.10"; + version = "0.2.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix index 4f0fad54c1..b7a324ca29 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-Fk/Kuc7DwmdoyLx/YjdEHQ7S0M+ksAXl9QqeSPH2vJ8="; + sha256 = "sha256-jp+Geqk39ZPoe2KzUJJ0w5hvCnyUlHGwVKn73lJJt94="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/third_party/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch new file mode 100644 index 0000000000..6109101b7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch @@ -0,0 +1,342 @@ +From dc7156d8951242231cfd9142b3d5628815dc6589 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Wed, 31 Mar 2021 14:30:01 +0200 +Subject: [PATCH] Revert "Merge pull request #12225 from + chrisroberts/resolution-isolation" + +This reverts commit 8a69d0c4dae035a4b1aa789bc4ec3db69c210df2, reversing +changes made to 5dd0a8c8acc36b654c13a5102e4327eedf1858f2. + +----- + +Rationale: NixOS-specific patch. The changes in here break our current +implementation of declarative plugins (only `vagrant-libvirt` atm). +--- + bin/vagrant | 28 +-------------- + lib/vagrant.rb | 2 +- + lib/vagrant/bundler.rb | 17 +++------ + lib/vagrant/errors.rb | 12 ------- + lib/vagrant/plugin/manager.rb | 22 ++---------- + templates/locales/en.yml | 23 ++---------- + test/unit/bin/vagrant_test.rb | 1 - + test/unit/vagrant/bundler_test.rb | 58 ++++++++++++++----------------- + 8 files changed, 39 insertions(+), 124 deletions(-) + +diff --git a/bin/vagrant b/bin/vagrant +index c019f30ff..ba7e40076 100755 +--- a/bin/vagrant ++++ b/bin/vagrant +@@ -23,9 +23,9 @@ if idx = argv.index("--") + argv = argv.slice(0, idx) + end + +-require_relative "../lib/vagrant/version" + # Fast path the version of Vagrant + if argv.include?("-v") || argv.include?("--version") ++ require_relative "../lib/vagrant/version" + puts "Vagrant #{Vagrant::VERSION}" + exit 0 + end +@@ -82,29 +82,6 @@ end + $stdout.sync = true + $stderr.sync = true + +-# Before we start activate all our dependencies +-# so we can provide correct resolutions later +-builtin_specs = [] +- +-vagrant_spec = Gem::Specification.find_all_by_name("vagrant").detect do |spec| +- spec.version == Gem::Version.new(Vagrant::VERSION) +-end +- +-dep_activator = proc do |spec| +- spec.runtime_dependencies.each do |dep| +- gem(dep.name, *dep.requirement.as_list) +- dep_spec = Gem::Specification.find_all_by_name(dep.name).detect(&:activated?) +- if dep_spec +- builtin_specs << dep_spec +- dep_activator.call(dep_spec) +- end +- end +-end +- +-if vagrant_spec +- dep_activator.call(vagrant_spec) +-end +- + env = nil + begin + require 'log4r' +@@ -114,9 +91,6 @@ begin + require 'vagrant/util/platform' + require 'vagrant/util/experimental' + +- # Set our list of builtin specs +- Vagrant::Bundler.instance.builtin_specs = builtin_specs +- + # Schedule the cleanup of things + at_exit(&Vagrant::Bundler.instance.method(:deinit)) + +diff --git a/lib/vagrant.rb b/lib/vagrant.rb +index f3dcba0bc..d696bdff8 100644 +--- a/lib/vagrant.rb ++++ b/lib/vagrant.rb +@@ -81,7 +81,7 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != "" + # See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858 + # for more information + class VagrantLogger < Log4r::Logger +- def << msg ++ def << (msg) + debug(msg.strip) + end + end +diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb +index eb2caabb0..d75f54362 100644 +--- a/lib/vagrant/bundler.rb ++++ b/lib/vagrant/bundler.rb +@@ -189,11 +189,8 @@ module Vagrant + attr_reader :env_plugin_gem_path + # @return [Pathname] Vagrant environment data path + attr_reader :environment_data_path +- # @return [Array, nil] List of builtin specs +- attr_accessor :builtin_specs + + def initialize +- @builtin_specs = [] + @plugin_gem_path = Vagrant.user_data_path.join("gems", RUBY_VERSION).freeze + @logger = Log4r::Logger.new("vagrant::bundler") + end +@@ -290,6 +287,7 @@ module Vagrant + # Never allow dependencies to be remotely satisfied during init + request_set.remote = false + ++ repair_result = nil + begin + @logger.debug("resolving solution from available specification set") + # Resolve the request set to ensure proper activation order +@@ -652,6 +650,7 @@ module Vagrant + self_spec.activate + @logger.info("Activated vagrant specification version - #{self_spec.version}") + end ++ self_spec.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list } + # discover all the gems we have available + list = {} + if Gem.respond_to?(:default_specifications_dir) +@@ -660,16 +659,10 @@ module Vagrant + spec_dir = Gem::Specification.default_specifications_dir + end + directories = [spec_dir] +- if Vagrant.in_bundler? +- Gem::Specification.find_all{true}.each do |spec| +- list[spec.full_name] = spec +- end +- else +- builtin_specs.each do |spec| +- list[spec.full_name] = spec +- end ++ Gem::Specification.find_all{true}.each do |spec| ++ list[spec.full_name] = spec + end +- if Vagrant.in_installer? ++ if(!Object.const_defined?(:Bundler)) + directories += Gem::Specification.dirs.find_all do |path| + !path.start_with?(Gem.user_dir) + end +diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb +index 5cb861c06..782615bc4 100644 +--- a/lib/vagrant/errors.rb ++++ b/lib/vagrant/errors.rb +@@ -636,18 +636,6 @@ module Vagrant + error_key(:provisioner_winrm_unsupported) + end + +- class PluginNeedsDeveloperTools < VagrantError +- error_key(:plugin_needs_developer_tools) +- end +- +- class PluginMissingLibrary < VagrantError +- error_key(:plugin_missing_library) +- end +- +- class PluginMissingRubyDev < VagrantError +- error_key(:plugin_missing_ruby_dev) +- end +- + class PluginGemNotFound < VagrantError + error_key(:plugin_gem_not_found) + end +diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb +index b73f07f9c..9058e68b3 100644 +--- a/lib/vagrant/plugin/manager.rb ++++ b/lib/vagrant/plugin/manager.rb +@@ -179,26 +179,8 @@ module Vagrant + result + rescue Gem::GemNotFoundException + raise Errors::PluginGemNotFound, name: name +- rescue Gem::Exception => err +- @logger.warn("Failed to install plugin: #{err}") +- @logger.debug("#{err.class}: #{err}\n#{err.backtrace.join("\n")}") +- # Try and determine a cause for the failure +- case err.message +- when /install development tools first/ +- raise Errors::PluginNeedsDeveloperTools +- when /library not found in default locations/ +- lib = err.message.match(/(\w+) library not found in default locations/) +- if lib.nil? +- raise Errors::BundlerError, message: err.message +- end +- raise Errors::PluginMissingLibrary, +- library: lib.captures.first, +- name: name +- when /find header files for ruby/ +- raise Errors::PluginMissingRubyDev +- else +- raise Errors::BundlerError, message: err.message +- end ++ rescue Gem::Exception => e ++ raise Errors::BundlerError, message: e.to_s + end + + # Uninstalls the plugin with the given name. +diff --git a/templates/locales/en.yml b/templates/locales/en.yml +index edae9b477..782904f49 100644 +--- a/templates/locales/en.yml ++++ b/templates/locales/en.yml +@@ -794,9 +794,9 @@ en: + matching this provider. For example, if you're using VirtualBox, + the clone environment must also be using VirtualBox. + cloud_init_not_found: |- +- cloud-init is not found. Please ensure that cloud-init is installed and ++ cloud-init is not found. Please ensure that cloud-init is installed and + available on path for guest '%{guest_name}'. +- cloud_init_command_failed: |- ++ cloud_init_command_failed: |- + cloud init command '%{cmd}' failed on guest '%{guest_name}'. + command_deprecated: |- + The command 'vagrant %{name}' has been deprecated and is no longer functional +@@ -1238,23 +1238,6 @@ en: + following command: + + vagrant plugin install --local +- plugin_needs_developer_tools: |- +- Vagrant failed to install the requested plugin because development tools +- are required for installation but are not currently installed on this +- machine. Please install development tools and then try this command +- again. +- plugin_missing_library: |- +- Vagrant failed to install the requested plugin because it depends +- on a library which is not currently installed on this system. The +- following library is required by the '%{name}' plugin: +- +- %{library} +- +- Please install the library and then run the command again. +- plugin_missing_ruby_dev: |- +- Vagrant failed to install the requested plugin because the Ruby header +- files could not be found. Install the ruby development package for your +- system and then run this command again. + powershell_not_found: |- + Failed to locate the powershell executable on the available PATH. Please + ensure powershell is installed and available on the local PATH, then +@@ -3015,7 +2998,7 @@ en: + pushes: + file: + no_destination: "File destination must be specified." +- ++ + autocomplete: + installed: |- + Autocomplete installed at paths: +diff --git a/test/unit/bin/vagrant_test.rb b/test/unit/bin/vagrant_test.rb +index dbbd52112..bc11309aa 100644 +--- a/test/unit/bin/vagrant_test.rb ++++ b/test/unit/bin/vagrant_test.rb +@@ -30,7 +30,6 @@ describe "vagrant bin" do + allow(Kernel).to receive(:exit) + allow(Vagrant::Environment).to receive(:new).and_return(env) + allow(Vagrant).to receive(:in_installer?).and_return(true) +- allow(self).to receive(:require_relative) + end + + after { expect(run_vagrant).to eq(exit_code) } +diff --git a/test/unit/vagrant/bundler_test.rb b/test/unit/vagrant/bundler_test.rb +index 69f425c66..00cedc021 100644 +--- a/test/unit/vagrant/bundler_test.rb ++++ b/test/unit/vagrant/bundler_test.rb +@@ -778,46 +778,42 @@ describe Vagrant::Bundler do + end + end + +- context "when bundler is not defined" do +- before { expect(Vagrant).to receive(:in_bundler?).and_return(false) } ++ context "when run time dependencies are defined" do ++ let(:vagrant_dep_specs) { [double("spec", name: "vagrant-dep", requirement: double("spec-req", as_list: []))] } + +- context "when running inside the installer" do +- before { expect(Vagrant).to receive(:in_installer?).and_return(true) } ++ it "should call #gem to activate the dependencies" do ++ expect(subject).to receive(:gem).with("vagrant-dep", any_args) ++ subject.send(:vagrant_internal_specs) ++ end ++ end + +- it "should load gem specification directories" do +- expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs) +- subject.send(:vagrant_internal_specs) +- end ++ context "when bundler is not defined" do ++ before { expect(Object).to receive(:const_defined?).with(:Bundler).and_return(false) } + +- context "when checking paths" do +- let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] } +- let(:in_user_dir) { true } +- let(:user_dir) { double("user-dir") } ++ it "should load gem specification directories" do ++ expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs) ++ subject.send(:vagrant_internal_specs) ++ end + +- before { allow(Gem).to receive(:user_dir).and_return(user_dir) } ++ context "when checking paths" do ++ let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] } ++ let(:in_user_dir) { true } ++ let(:user_dir) { double("user-dir") } + +- it "should check if path is within local user directory" do +- expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false) +- subject.send(:vagrant_internal_specs) +- end +- +- context "when path is not within user directory" do +- let(:in_user_dir) { false } ++ before { allow(Gem).to receive(:user_dir).and_return(user_dir) } + +- it "should use path when loading specs" do +- expect(Gem::Specification).to receive(:each_spec) { |arg| expect(arg).to include(spec_dirs.first) } +- subject.send(:vagrant_internal_specs) +- end +- end ++ it "should check if path is within local user directory" do ++ expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false) ++ subject.send(:vagrant_internal_specs) + end +- end + +- context "when running outside the installer" do +- before { expect(Vagrant).to receive(:in_installer?).and_return(false) } ++ context "when path is not within user directory" do ++ let(:in_user_dir) { false } + +- it "should not load gem specification directories" do +- expect(Gem::Specification).not_to receive(:dirs) +- subject.send(:vagrant_internal_specs) ++ it "should use path when loading specs" do ++ expect(Gem::Specification).to receive(:each_spec) { |arg| expect(arg).to include(spec_dirs.first) } ++ subject.send(:vagrant_internal_specs) ++ end + end + end + end +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix index 34662498f2..1ea172ae13 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.14"; + version = "2.2.15"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "sha256-vsb7RFjT9l4N6BzwIvVLcRtA4n/c8jk20B6RUMkyhJs="; + sha256 = "sha256-mMnHJtXLfkZ5O0UF89kHsqBnPg9uQ5l8IYoL5TMMyD8="; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -54,6 +54,7 @@ in buildRubyGem rec { ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch ./0004-Support-system-installed-plugins.patch + ./0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix index e617e1a587..8955549049 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; builder = { groups = ["default"]; @@ -34,10 +34,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; ed25519 = { groups = ["default"]; @@ -64,20 +64,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; + sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; type = "gem"; }; - version = "0.78.0"; + version = "0.79.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; gssapi = { dependencies = ["ffi"]; @@ -85,10 +85,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh"; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; gyoku = { dependencies = ["builder"]; @@ -127,10 +127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.10"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -138,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0028p1fss6pvw4mlpjqdmxfzsm8ww79irsadbibrr7f23qfn8ykr"; + sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; type = "gem"; }; - version = "3.3.1"; + version = "3.5.1"; }; little-plugger = { groups = ["default"]; @@ -190,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; type = "gem"; }; - version = "3.2020.1104"; + version = "3.2021.0225"; }; multi_json = { groups = ["default"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hlyp6z3ffwdcnzq9khrkz6waxggn4hnzsczbp3mz61lhx4qiri3"; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; type = "gem"; }; - version = "6.2.0.rc1"; + version = "6.1.0"; }; nori = { groups = ["default"]; @@ -279,25 +279,15 @@ }; version = "0.2.5"; }; - ruby_dep = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v0qznxz999lx4vs76mr590r90i0cm5m76wwvgis7sq4y21l308l"; - type = "gem"; - }; - version = "1.3.1"; - }; 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"]; @@ -315,10 +305,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b3b9ybd6mskfz2vffb6li2y6njdc9xqhik9c4mvzq9dchxpbxlj"; + sha256 = "1rwfw014fbvaxshf8abi87srfaiirb7cr93s61qm177jm8q86h57"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.4"; }; wdm = { groups = ["default"]; @@ -336,10 +326,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9i86v805gpya3pyqahjykljbdwpjsrk7hsdqrl05j2rpidvk4v"; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; type = "gem"; }; - version = "2.3.5"; + version = "2.3.6"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix index f50f4438f5..2d59b4c2cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; + sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; type = "gem"; }; - version = "0.78.0"; + version = "0.79.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0by97bx0szdz47kdy0fqvx6j2kzy5yhrwbvvsfbh27dm9c0vfwgr"; + sha256 = "1s62ihwxlwgp84xw32wg6hwcx4422v20c7g7azd0xslb91y1ln1r"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -99,20 +99,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"]; @@ -125,15 +125,25 @@ version = "1.15.0"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.2"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; }; ruby-libvirt = { groups = ["default"]; @@ -151,9 +161,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1m8fg1rin6ps15ykqhwz6qm7isadb83r22b733dkw2gvvj91jv"; + sha256 = "07j30w23syvzrhznad9dkh1ks4lzxzi7ak2966b7i7wr4kz8x1hp"; type = "gem"; }; - version = "0.2.1"; + version = "0.4.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix b/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix index 315a896929..2e9e8936dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vogl/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub , cmake, git, pkg-config, wget, zip , qtbase, qtx11extras -, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 +, libdwarf, libjpeg_turbo, libunwind, xz, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf , freeglut, libGLU , fetchpatch @@ -31,7 +31,7 @@ mkDerivation { buildInputs = [ git wget zip qtbase qtx11extras - libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 + libdwarf libjpeg_turbo libunwind xz tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf freeglut libGLU ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix index e435f0978c..e0abf90847 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix @@ -44,8 +44,8 @@ runCommand "Toolchains" {} ('' fi done - ln -s ${buildPackages.yacc}/bin/yacc $toolchain/bin/yacc - ln -s ${buildPackages.yacc}/bin/bison $toolchain/bin/bison + ln -s ${buildPackages.bison}/bin/yacc $toolchain/bin/yacc + ln -s ${buildPackages.bison}/bin/bison $toolchain/bin/bison ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++ ln -s $toolchain/bin/flex $toolchain/bin/lex diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 8e45b0b337..cdb34aab45 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU="; + sha256 = "sha256-QkVDIpJ4VW3DpcwhydDnt68zxVXwkitIiN8blGlqX1g="; }; - cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I="; + cargoSha256 = "sha256-pf/4/H3wNORNvAswz8+7B3x5T5MyQgW7HgtDLBhfE/o="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock index 47c40af8c7..f0808622bc 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock @@ -2,7 +2,7 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 0.13.3 + version: 0.14.2 future: git: https://github.com/crystal-community/future.cr.git diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix index 2741583b68..b4f100518b 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix @@ -2,8 +2,8 @@ ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.13.3"; - sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + rev = "v0.14.2"; + sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2"; }; future = { owner = "crystal-community"; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 08b8025f9b..fc9a170dd9 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.21.0"; - sha256 = "17cp3sv6smpig5xq0z3xgnqdii6k8lm4n5d1nl9vasgmwsn3fbq5"; + version = "12.22.0"; + sha256 = "08xsc1pw6352v5lz92ppfhrcmqnbm6m5wmjfs9frz26lp875yp6z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix index 194bb25cb0..953b534e85 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.12.0"; - sha256 = "0c8smzc7gbr7yg4y4z68976wk5741bspggag9h9laykq4i8bxfsy"; + version = "15.13.0"; + sha256 = "1wd859bxd8j97xl98k61g0vwcmy83wvjj04fgway38aapk9abp4h"; } diff --git a/third_party/nixpkgs/pkgs/games/asc/default.nix b/third_party/nixpkgs/pkgs/games/asc/default.nix index 9e9f188bf1..778f5224d2 100644 --- a/third_party/nixpkgs/pkgs/games/asc/default.nix +++ b/third_party/nixpkgs/pkgs/games/asc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-paragui" "--disable-paraguitest" ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; # I'm too lazy to catch all gcc47-related problems + NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing"; # I'm too lazy to catch all gcc47-related problems hardeningDisable = [ "format" ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/devilutionx/default.nix b/third_party/nixpkgs/pkgs/games/devilutionx/default.nix index 73968b5156..1e88907cc1 100644 --- a/third_party/nixpkgs/pkgs/games/devilutionx/default.nix +++ b/third_party/nixpkgs/pkgs/games/devilutionx/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.1"; - pname = "devilutionx"; + version = "2020-10-20"; + pname = "devilutionx-unstable"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; - rev = version; - sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i"; + rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01"; + sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9"; }; NIX_CFLAGS_COMPILE = [ @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { ''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"'' ]; + cmakeFlags = [ + "-DBINARY_RELEASE=ON" + ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; @@ -40,6 +46,6 @@ stdenv.mkDerivation rec { longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game."; license = licenses.unlicense; maintainers = [ maintainers.karolchmist ]; - platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; + platforms = platforms.linux ++ platforms.windows; }; } diff --git a/third_party/nixpkgs/pkgs/games/empty-epsilon/default.nix b/third_party/nixpkgs/pkgs/games/empty-epsilon/default.nix index dc761fb7d7..d444c50d97 100644 --- a/third_party/nixpkgs/pkgs/games/empty-epsilon/default.nix +++ b/third_party/nixpkgs/pkgs/games/empty-epsilon/default.nix @@ -2,21 +2,23 @@ let - major = "2020"; - minor = "11"; - patch = "23"; + major = "2021"; + minor = "03"; + patch.seriousproton = "30"; + patch.emptyepsilon = "31"; - version = "${major}.${minor}.${patch}"; + version.seriousproton = "${major}.${minor}.${patch.seriousproton}"; + version.emptyepsilon = "${major}.${minor}.${patch.emptyepsilon}"; serious-proton = stdenv.mkDerivation { pname = "serious-proton"; - inherit version; + version = version.seriousproton; src = fetchFromGitHub { owner = "daid"; repo = "SeriousProton"; - rev = "EE-${version}"; - sha256 = "sha256-/gwJPlvvOCv5XIsiVgZ8Eb/7vgwG/V+s/soGVCfYrwo="; + rev = "EE-${version.seriousproton}"; + sha256 = "sha256-wxb/CxJ/HKsVngeahjygZFPMMxitkHdVD0EQ3svxgIU="; }; nativeBuildInputs = [ cmake ]; @@ -36,13 +38,13 @@ in stdenv.mkDerivation { pname = "empty-epsilon"; - inherit version; + version = version.emptyepsilon; src = fetchFromGitHub { owner = "daid"; repo = "EmptyEpsilon"; - rev = "EE-${version}"; - sha256 = "sha256-HbF6xThR+ogNHbAcXF03DaBhwVhNEr5BJO7jeeVZH/o="; + rev = "EE-${version.emptyepsilon}"; + sha256 = "sha256-x0XJPMU0prubTb4ti/W/dH5P9abNwbjqkeUhKQpct9o="; }; nativeBuildInputs = [ cmake ]; @@ -50,10 +52,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DSERIOUS_PROTON_DIR=${serious-proton.src}" - "-DCPACK_PACKAGE_VERSION=${version}" + "-DCPACK_PACKAGE_VERSION=${version.emptyepsilon}" "-DCPACK_PACKAGE_VERSION_MAJOR=${major}" "-DCPACK_PACKAGE_VERSION_MINOR=${minor}" - "-DCPACK_PACKAGE_VERSION_PATCH=${patch}" + "-DCPACK_PACKAGE_VERSION_PATCH=${patch.emptyepsilon}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index dea159f53b..3ffb7e0c54 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 -, zlib, bzip2, curl, lzma, gettext, libiconv +, zlib, bzip2, curl, xz, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 , qtClient ? false, qt5 @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] ++ optional qtClient [ qt5.wrapQtAppsHook ]; - buildInputs = [ lua5_3 zlib bzip2 curl lzma gettext libiconv ] + buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] ++ optionals gtkClient [ gtk3 ] ++ optionals qtClient [ qt5.qtbase ] diff --git a/third_party/nixpkgs/pkgs/games/gemrb/default.nix b/third_party/nixpkgs/pkgs/games/gemrb/default.nix index fb49779eb5..9c5744f729 100644 --- a/third_party/nixpkgs/pkgs/games/gemrb/default.nix +++ b/third_party/nixpkgs/pkgs/games/gemrb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake -, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis +, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python2, libvorbis , libiconv }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl # reqs) optional - buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; + buildInputs = [ freetype python2 openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/games/gnubg/default.nix b/third_party/nixpkgs/pkgs/games/gnubg/default.nix index feff18e9bb..7402049a9d 100644 --- a/third_party/nixpkgs/pkgs/games/gnubg/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }: +{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }: let version = "1.06.002"; in stdenv.mkDerivation { @@ -9,8 +9,10 @@ stdenv.mkDerivation { sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python glib gtk2 readline ]; + nativeBuildInputs = [ pkg-config python3 glib ]; + buildInputs = [ gtk2 readline ]; + + strictDeps = true; configureFlags = [ "--with-gtk" "--with--board3d" ]; diff --git a/third_party/nixpkgs/pkgs/games/openttd/default.nix b/third_party/nixpkgs/pkgs/games/openttd/default.nix index b42c7d2216..87e8084399 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/default.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, pkg-config, which, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir +{ lib, stdenv, fetchurl, fetchzip, cmake, SDL2, libpng, zlib, xz, freetype, fontconfig, libxdg_basedir , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps , writeScriptBin, makeWrapper, runtimeShell @@ -6,18 +6,18 @@ let opengfx = fetchzip { - url = "https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip"; - sha256 = "1zg871j6kv7r0aqwca68d9kdf3smclgzan8hj76vj4fyfkykh173"; + url = "https://cdn.openttd.org/opengfx-releases/0.6.1/opengfx-0.6.1-all.zip"; + sha256 = "sha256-DeeIlLcmPeMZ0ju9DwXUInnQp2rWu60besDVto4+lDQ="; }; opensfx = fetchzip { - url = "https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip"; - sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3"; + url = "https://cdn.openttd.org/opensfx-releases/1.0.1/opensfx-1.0.1-all.zip"; + sha256 = "sha256-U1PIKbMZHRJ0Z9Cp2RqqCMhD1xRyudoNHAYIZyotxVk="; }; openmsx = fetchzip { - url = "https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip"; - sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4"; + url = "https://cdn.openttd.org/openmsx-releases/0.4.0/openmsx-0.4.0-all.zip"; + sha256 = "sha256-Ok6W+iqi4SP7cD4HUQERrAysvVibnN7Q4/tkugffDgQ="; }; playmidi = writeScriptBin "playmidi" '' @@ -29,14 +29,14 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.10.3"; + version = "1.11.0"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"; + sha256 = "sha256-XmUYTgc2i6Gvpi27PjWrrubE2mcw/0vJ60RH1TNjx6g="; }; - nativeBuildInputs = [ pkg-config which makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ] ++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; @@ -46,25 +46,21 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; - makeFlags = [ "INSTALL_PERSONAL_DIR=" ]; - postInstall = '' - mv $out/games/ $out/bin - ${lib.optionalString withOpenGFX '' - cp ${opengfx}/* $out/share/games/openttd/baseset + cp ${opengfx}/*.tar $out/share/games/openttd/baseset ''} mkdir -p $out/share/games/openttd/data ${lib.optionalString withOpenSFX '' - cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data + cp ${opensfx}/*.tar $out/share/games/openttd/data ''} mkdir $out/share/games/openttd/baseset/openmsx ${lib.optionalString withOpenMSX '' - cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx + cp ${openmsx}/*.tar $out/share/games/openttd/baseset/openmsx ''} ${lib.optionalString withFluidSynth '' diff --git a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix index 83a8f92769..7f756dd10b 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix @@ -2,12 +2,12 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.34.4"; + version = "0.40.5"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - sha256 = "125mgia5hgcsn8314xyiip3z8y23rc3kdv7jczbncqlzsc75624v"; + sha256 = "sha256-g1RmgVjefOrOVLTvFBiPEd19aLoFvB9yX/hMiKgGcGw="; }; }) diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index a700f2bc4f..26eef250c5 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.320.0"; + version = "2021.323.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "jFroWbNvJRD+r5w6BPj8QBnHJ9uXJZdx4kzmu5gmVSY="; + sha256 = "zoJGCsnjvXzPxGy85YsP+WbaN7p8EwcTqiCEX/czMR8="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 7b13fa4157..79ddcca655 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -431,13 +431,18 @@ }) (fetchNuGet { name = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.5.0"; + sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { name = "Microsoft.Data.Sqlite.Core"; - version = "5.0.4"; - sha256 = "0cpcw1mgxm47s6bn181iswrd41c7jyqxv1zwk0xw0hag0jy80xwm"; + version = "2.2.6"; + sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; }) (fetchNuGet { name = "Microsoft.Diagnostics.NETCore.Client"; @@ -451,64 +456,89 @@ }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; - version = "3.1.6"; - sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; + version = "2.1.0"; + sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; - version = "5.0.4"; - sha256 = "17r5knq984j6mgbv7w4lyl12ma15pii09zmvf7zw651k46a7lmdz"; + version = "2.2.6"; + sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "5.0.4"; - sha256 = "0ilj2625nmr8l9al7xk1q1kxcx5p52wlsh8x3qvs8kf2dgvvckn6"; + version = "2.2.6"; + sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "5.0.4"; - sha256 = "193c63kqgrdiy0wwsbd5hc9b7cjmngiy6rbam24cilafm68nhiif"; + version = "2.2.6"; + sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; - version = "5.0.4"; - sha256 = "1xb50lrdyrxa6yi2a8k71znqw2cpjr6qpwx7z5wa5fabdjlywdxh"; + version = "2.2.6"; + sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; - version = "5.0.4"; - sha256 = "0by7is7h3i3w4a1bsffls81dyklp2k4jlysjv1wh3l2wp76c42xa"; + version = "2.2.6"; + sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "5.0.4"; - sha256 = "0pf55yqjlrjmh8hdcd55awxykhqwzzi5cc447232sa0fdn8a2yh8"; + version = "2.2.6"; + sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "5.0.4"; - sha256 = "0ma6y292hgh7bgaancmvvyv0fl6hibjbcbfhn35h01dg6bnz00wr"; + version = "2.2.6"; + sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; - version = "5.0.0"; - sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; + version = "2.2.0"; + sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; - version = "5.0.0"; - sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; + version = "2.2.0"; + sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.2.0"; + sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.2.0"; + sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.2.0"; + sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.2.0"; + sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.1"; sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.2.0"; + sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; @@ -516,14 +546,24 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; - version = "5.0.0"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + version = "2.1.0"; + sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "2.2.0"; + sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.2.0"; + sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; + }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; @@ -534,11 +574,21 @@ version = "5.0.3"; sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.2.0"; + sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; + }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.2.0"; + sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; + }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; @@ -569,11 +619,21 @@ version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "3.1.0"; + sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; + }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; @@ -589,6 +649,11 @@ version = "0.9.6.1"; sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; + }) (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; @@ -609,6 +674,11 @@ version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) (fetchNuGet { name = "NuGet.Common"; version = "5.8.0"; @@ -671,8 +741,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.317.0"; - sha256 = "1nych95lrxs2hb3bcnw9h0f843k9lrn1f4hwdnaf5q3p8ny1pmph"; + version = "2021.323.0"; + sha256 = "1gxgvg8r7xsr94wy7rld5c1yd8ssv4iqsp2zdyp5r0qd5l1g09gc"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -699,6 +769,11 @@ version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) + (fetchNuGet { + name = "Remotion.Linq"; + version = "2.2.0"; + sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; + }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -714,21 +789,41 @@ version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; 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"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; @@ -810,40 +905,55 @@ sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; }) (fetchNuGet { - name = "SQLitePCLRaw.bundle_e_sqlite3"; - version = "2.0.4"; - sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; + name = "SQLitePCLRaw.bundle_green"; + version = "1.1.12"; + sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; }) (fetchNuGet { name = "SQLitePCLRaw.core"; - version = "2.0.4"; - sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; + version = "1.1.12"; + sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; }) (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3"; - version = "2.0.4"; - sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; + name = "SQLitePCLRaw.lib.e_sqlite3.linux"; + version = "1.1.12"; + sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5"; }) (fetchNuGet { - name = "SQLitePCLRaw.provider.dynamic_cdecl"; - version = "2.0.4"; - sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; + name = "SQLitePCLRaw.lib.e_sqlite3.osx"; + version = "1.1.12"; + sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1"; }) (fetchNuGet { - name = "SQLitePCLRaw.provider.e_sqlite3"; - version = "2.0.4"; - sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7"; + name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp"; + version = "1.1.12"; + sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11"; + version = "1.1.12"; + sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4"; }) (fetchNuGet { name = "StbiSharp"; version = "1.0.13"; sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q"; }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + }) (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; @@ -869,6 +979,11 @@ version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; @@ -889,6 +1004,11 @@ version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.5.0"; + sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; + }) (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "5.0.0"; @@ -924,6 +1044,11 @@ version = "1.0.31"; sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) + (fetchNuGet { + name = "System.Console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) (fetchNuGet { name = "System.Console"; version = "4.3.0"; @@ -939,31 +1064,51 @@ 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.5.0"; + sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; + }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "5.0.1"; - sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; @@ -974,16 +1119,31 @@ version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (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"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { + name = "System.Interactive.Async"; + version = "3.2.0"; + sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; + }) (fetchNuGet { name = "System.IO"; version = "4.1.0"; @@ -994,21 +1154,41 @@ version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; @@ -1034,11 +1214,26 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { + name = "System.Linq.Queryable"; + version = "4.0.1"; + sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.1"; + sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; + }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; @@ -1049,16 +1244,31 @@ version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) (fetchNuGet { name = "System.Net.Sockets"; version = "4.3.0"; @@ -1074,6 +1284,11 @@ version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; @@ -1089,6 +1304,11 @@ version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; @@ -1099,11 +1319,21 @@ version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; @@ -1114,6 +1344,11 @@ version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; @@ -1139,6 +1374,11 @@ version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; @@ -1164,6 +1404,11 @@ version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.1"; + sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; + }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; @@ -1214,26 +1459,51 @@ version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; 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"; @@ -1244,16 +1514,31 @@ version = "5.0.0-preview.3.20214.6"; sha256 = "050xx94ki5zmclplfns1v463wlf97ha2knwnxp08vqkgy0bdg1mv"; }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) (fetchNuGet { name = "System.Security.Cryptography.Encoding"; 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"; @@ -1264,6 +1549,11 @@ version = "5.0.0-preview.3.20214.6"; sha256 = "1q38rzpzhzpc8l75m06g6swq23qbl22ijzd9k76jfq08px3wq09k"; }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; @@ -1274,6 +1564,11 @@ version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; @@ -1304,6 +1599,11 @@ version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; @@ -1324,6 +1624,11 @@ version = "5.0.1"; sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; @@ -1354,6 +1659,11 @@ version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; @@ -1374,16 +1684,31 @@ version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; diff --git a/third_party/nixpkgs/pkgs/games/spring/default.nix b/third_party/nixpkgs/pkgs/games/spring/default.nix index fef1a0f092..21aca57306 100644 --- a/third_party/nixpkgs/pkgs/games/spring/default.nix +++ b/third_party/nixpkgs/pkgs/games/spring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip +{ lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; - buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 + buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2 xorg.libX11 xorg.libXcursor libGLU libGL glew curl systemd libunwind which minizip ] ++ lib.optional withAI jdk diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 3600b2f144..1a2ca5161e 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -106,6 +106,7 @@ in buildFHSUserEnv rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-base libdrm + libxkbcommon # paradox launcher mono xorg.xkeyboardconfig xorg.libpciaccess @@ -205,7 +206,6 @@ in buildFHSUserEnv rec { libidn tbb wayland - libxkbcommon # Other things from runtime flac diff --git a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix index 961842e870..35143028a2 100644 --- a/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix +++ b/third_party/nixpkgs/pkgs/games/super-tux-kart/default.nix @@ -128,5 +128,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ pyrolagus peterhoeg ]; platforms = with platforms; linux; + changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md"; }; } diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index 35397e262e..5e4b262c87 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.13.11"; + version = "3.13.11-patch2"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-U0kTkdcEC1cu+UFmQmgadNn1bIZ5Rq4+bBqjFU3c4+M="; + sha256 = "sha256-UN/M1G36nYy1mhKz0xA3/oZ8hWrkyeXWm9dMxL9PSDo="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix new file mode 100644 index 0000000000..d491436554 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix @@ -0,0 +1,53 @@ +{ lib +, fetchzip +, fetchpatch +, cups +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "rastertosag-gdi"; + version = "0.1"; + src = fetchzip { + url = "https://www.openprinting.org/download/printing/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1ldplpv497j8vhw24sksg3fiw8c5pqr0wajajh7p5xpvb6zlcmvw"; + }; + patches = [ + # port to python 3 + ( fetchpatch { + url = "https://sources.debian.org/data/main/r/${pname}/0.1-7/debian/patches/0001-${pname}-python3.patch"; + sha256 = "1l3xbrs67025595k9ba5794q3s74anizpbxwsshcfhmbrzd9h8hg"; + }) + ]; + format = "other"; + nativeBuildInputs = [ (lib.getBin cups) ]; + # The source image also brings pre-built ppd files, + # be we prefer to generate from source where possible, so + # the following line generates ppd files from the drv file. + postBuild = '' + ppdc -v -d . -I "${cups}/share/cups/ppdc" rastertosag-gdi.drv + ''; + installPhase = '' + runHook preInstall + install -vDm 0644 -t "${placeholder "out"}/share/cups/model/rastertosag-gdi/" *.ppd + install -vDm 0755 -t "${placeholder "out"}/bin/" rastertosag-gdi + install -vd "${placeholder "out"}/lib/cups/filter/" + ln -vst "${placeholder "out"}/lib/cups/filter/" "${placeholder "out"}/bin/rastertosag-gdi" + runHook postInstall + ''; + meta = { + description = "CUPS driver for Ricoh Aficio SP 1000S and SP 1100S printers"; + downloadPage = "https://www.openprinting.org/download/printing/rastertosag-gdi/"; + homepage = "https://www.openprinting.org/driver/rastertosag-gdi/"; + license = lib.licenses.free; # just "GPL", according to README + maintainers = [ lib.maintainers.yarny ]; + longDescription = '' + This package brings CUPS raster filter + for Ricoh Aficio SP 1000S and SP 1100S. + In contrast to other Ricoh laser printers, + they use the proprietary SAG-GDI raster format by + Sagem Communication and do not understand PCL or PostScript. + Therefore they do not work with Ricoh's PPD files. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch deleted file mode 100644 index 03eb329f4b..0000000000 --- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/src/proto_unix.c b/src/proto_unix.c -index 998f234..d38452c 100644 ---- a/src/proto_unix.c -+++ b/src/proto_unix.c -@@ -36,11 +36,14 @@ enum { - - static int lsock = -1; - -+static char *spath = NULL; -+ - int init_unix(void) - { - int s; - mode_t prev_umask; - struct sockaddr_un addr; -+ char *sock_path; - - if(lsock >= 0) return 0; - -@@ -49,16 +52,18 @@ int init_unix(void) - return -1; - } - -- unlink(SOCK_NAME); /* in case it already exists */ -+ sock_path = socket_path(); -+ -+ unlink(sock_path); /* in case it already exists */ - - memset(&addr, 0, sizeof addr); - addr.sun_family = AF_UNIX; -- strcpy(addr.sun_path, SOCK_NAME); -+ strcpy(addr.sun_path, sock_path); - - prev_umask = umask(0); - - if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) { -- logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno)); -+ logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno)); - close(s); - return -1; - } -@@ -68,7 +73,7 @@ int init_unix(void) - if(listen(s, 8) == -1) { - logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno)); - close(s); -- unlink(SOCK_NAME); -+ unlink(sock_path); - return -1; - } - -@@ -82,7 +87,7 @@ void close_unix(void) - close(lsock); - lsock = -1; - -- unlink(SOCK_NAME); -+ unlink(socket_path()); - } - } - -@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset) - - return 0; - } -+ -+char *socket_path(void) -+{ -+ char *xdg_runtime_dir; -+ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { -+ if ( spath == NULL ) { -+ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1); -+ if ( spath != NULL ) { -+ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir); -+ } -+ }; -+ return spath; -+ } else { -+ return DEFAULT_SOCK_NAME; -+ } -+} -diff --git a/src/proto_unix.h b/src/proto_unix.h -index 045b379..ec4509c 100644 ---- a/src/proto_unix.h -+++ b/src/proto_unix.h -@@ -23,6 +23,7 @@ along with this program. If not, see . - #include "event.h" - #include "client.h" - -+char *socket_path(void); - int init_unix(void); - void close_unix(void); - int get_unix_socket(void); -diff --git a/src/spnavd.c b/src/spnavd.c -index cbea191..03080da 100644 ---- a/src/spnavd.c -+++ b/src/spnavd.c -@@ -344,7 +344,7 @@ static int find_running_daemon(void) - } - memset(&addr, 0, sizeof addr); - addr.sun_family = AF_UNIX; -- strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path); -+ strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path); - - if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) { - close(s); -diff --git a/src/spnavd.h b/src/spnavd.h -index fa0a916..deea4e0 100644 ---- a/src/spnavd.h -+++ b/src/spnavd.h -@@ -26,7 +26,8 @@ along with this program. If not, see . - #define DEF_CFGFILE "/etc/spnavrc" - #define DEF_LOGFILE "/var/log/spnavd.log" - --#define SOCK_NAME "/var/run/spnav.sock" -+#define DEFAULT_SOCK_NAME "/run/spnav.sock" -+#define SOCK_NAME_ENV "SPNAVD_SOCK_LOCATION" - #define PIDFILE "/var/run/spnavd.pid" - #define SYSLOG_ID "spnavd" - diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix index 1051d469f6..734b2229c8 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix @@ -13,12 +13,6 @@ stdenv.mkDerivation rec { 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; { diff --git a/third_party/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix b/third_party/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix index 0b8090ce41..9813c906be 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,5 +1,5 @@ { callPackage, gobject-introspection, cmake, pkg-config -, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool +, glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: let pkg = import ./base.nix { @@ -8,7 +8,7 @@ let pkg = import ./base.nix { pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf"; }; in callPackage pkg { - buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; + buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ]; drvParams = { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix index 7ba4516a49..9573dd6d48 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix @@ -1,31 +1,29 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchzip }: -stdenv.mkDerivation { - name = "dlx-2012.07.08"; +stdenv.mkDerivation rec { + pname = "dlx"; + version = "2012-07-08"; - src = fetchurl { + src = fetchzip { url = "https://www.davidviner.com/zip/dlx/dlx.zip"; - sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn"; + sha256 = "0508linnar9ivy3xr99gzrb2l027ngx12dlxaxs7w67cnwqnb0dg"; }; - nativeBuildInputs = [ unzip ]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LINK=${stdenv.cc.targetPrefix}cc" "CFLAGS=-O2" ]; - hardeningDisable = [ "format" ]; installPhase = '' mkdir -p $out/include/dlx $out/share/dlx/{examples,doc} $out/bin - mv -v masm mon dasm $out/bin/ - mv -v *.i auto.a $out/include/dlx/ - mv -v *.a *.m $out/share/dlx/examples/ - mv -v README.txt MANUAL.TXT $out/share/dlx/doc/ + mv masm mon dasm $out/bin/ + mv *.i auto.a $out/include/dlx/ + mv *.a *.m $out/share/dlx/examples/ + mv README.txt MANUAL.TXT $out/share/dlx/doc/ ''; - meta = { - homepage = "http://www.davidviner.com/dlx.php"; - description = "DLX Simulator"; - license = lib.licenses.gpl2; - platforms = lib.platforms.all; + meta = with lib; { + homepage = "https://www.davidviner.com/dlx.html?name=DLX+Simulator"; + description = "An DLX simulator written in C"; + license = licenses.gpl2Only; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix index 0326901751..be097c3118 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; + sha256 = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs="; }; nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix index 7f46d9a003..52d1010b5a 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { PC, with many additional features and benefits. ''; homepage = "https://pcsx2.net"; - maintainers = with maintainers; [ hrdinka samuelgrf govanify ]; + maintainers = with maintainers; [ hrdinka govanify ]; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix index 9e1f986341..affbf0af15 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ruffle/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2021-01-12"; + version = "nightly-2021-04-02"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd"; + sha256 = "1diz94y53hvii28894zz65aya12v8yw1864lqpkrdbj67yc6ykdj"; }; nativeBuildInputs = [ @@ -42,10 +42,13 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' + # This name is too generic + mv $out/bin/exporter $out/bin/ruffle_exporter + wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5"; + cargoSha256 = "0pnp5kmij4dwwvmgdv81mqcawcjcgg5gd6cpyf0xalyfjgj8i732"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 3e7e0af429..8bad6b3cd9 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert -, SDL2, libX11, ffmpeg, openal, libsoundio +, SDL2, libX11, libgdiplus, ffmpeg, openal, libsoundio , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: @@ -9,19 +9,20 @@ let SDL2 gtk3 libX11 + libgdiplus ffmpeg openal libsoundio ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6574"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6807"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "80ed8596c165127fb52026c697a9b6b515dabbd4"; - sha256 = "0jhrl8g9fbz3w2hzmy9jm22cvjfa0x5vh3912rz1rvnd41qb9vs8"; + rev = "0ee314fb3b9d476d0d207a3595bde24af9c4b69b"; + sha256 = "1yyjy5qblsdg186hr81qpc07n0cqla67q3hjf2rrzq5pyb10bldy"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; @@ -36,7 +37,6 @@ in stdenv.mkDerivation rec { patches = [ ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. - ./disable-updater.patch # This disables the auto-updater, which does not work as it attempts to modify the nix store. ]; configurePhase = '' @@ -108,4 +108,5 @@ in stdenv.mkDerivation rec { maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; }; + passthru.updateScript = ./updater.sh; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index 737bd876e1..5e3f1a4944 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -49,16 +49,16 @@ version = "1.0.2"; sha256 = "0nb46jiscnsywwdfy7zhx1bw4jfmca3s6l8dhbi99gc4bvp8ar7p"; }) - (fetchNuGet { - name = "GtkSharp"; - version = "3.22.25.128"; - sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; - }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) + (fetchNuGet { + name = "GtkSharp"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; + }) (fetchNuGet { name = "LibHac"; version = "0.12.0"; @@ -94,6 +94,11 @@ version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; + }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.0"; @@ -154,11 +159,6 @@ version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.8.0"; - sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; - }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; @@ -204,6 +204,11 @@ version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) + (fetchNuGet { + name = "Microsoft.Win32.SystemEvents"; + version = "5.0.0"; + sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; + }) (fetchNuGet { name = "Mono.Posix.NETStandard"; version = "1.0.0"; @@ -274,26 +279,21 @@ version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; @@ -304,16 +304,16 @@ version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; @@ -325,15 +325,20 @@ sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; + name = "runtime.any.System.Runtime"; version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; @@ -359,16 +364,6 @@ version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; @@ -379,15 +374,25 @@ version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -514,6 +519,21 @@ version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) + (fetchNuGet { + name = "SixLabors.Fonts"; + version = "1.0.0-beta0013"; + sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; + }) + (fetchNuGet { + name = "SixLabors.ImageSharp.Drawing"; + version = "1.0.0-beta11"; + sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; + }) + (fetchNuGet { + name = "SixLabors.ImageSharp"; + version = "1.0.2"; + sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + }) (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; @@ -539,16 +559,6 @@ version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; @@ -565,9 +575,14 @@ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.ComponentModel"; + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; @@ -584,6 +599,11 @@ version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) (fetchNuGet { name = "System.Console"; version = "4.0.0"; @@ -629,21 +649,16 @@ version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) + (fetchNuGet { + name = "System.Drawing.Common"; + version = "5.0.1"; + sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; + }) (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; @@ -660,19 +675,14 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { - name = "System.IO"; + name = "System.Globalization"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { name = "System.IO.Compression.ZipFile"; @@ -680,14 +690,9 @@ sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { name = "System.IO.FileSystem.Primitives"; @@ -699,6 +704,31 @@ version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) (fetchNuGet { name = "System.Linq"; version = "4.1.0"; @@ -709,11 +739,6 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) (fetchNuGet { name = "System.Management"; version = "5.0.0"; @@ -744,6 +769,11 @@ version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.5.0"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }) (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; @@ -754,26 +784,6 @@ version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; @@ -794,6 +804,16 @@ version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; @@ -824,6 +844,16 @@ version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; @@ -835,14 +865,9 @@ sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.0"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; @@ -869,16 +894,6 @@ version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; @@ -889,6 +904,16 @@ version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; @@ -899,6 +924,16 @@ version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; @@ -954,11 +989,6 @@ version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; @@ -980,14 +1010,9 @@ sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "System.Security.Principal"; version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -999,6 +1024,16 @@ version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; @@ -1009,31 +1044,11 @@ version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; @@ -1044,6 +1059,16 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; @@ -1059,6 +1084,16 @@ version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; @@ -1079,14 +1114,14 @@ version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.3.0"; - sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; - }) (fetchNuGet { name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.3.0"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }) ] diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/disable-updater.patch b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/disable-updater.patch deleted file mode 100644 index e233aec7ca..0000000000 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/disable-updater.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs -index 29043bb8..d3973c7c 100644 ---- a/Ryujinx/Program.cs -+++ b/Ryujinx/Program.cs -@@ -54,9 +54,6 @@ namespace Ryujinx - } - } - -- // Delete backup files after updating. -- Task.Run(Updater.CleanupUpdate); -- - Toolkit.Init(new ToolkitOptions - { - Backend = PlatformBackend.PreferNative -@@ -146,11 +143,6 @@ namespace Ryujinx - mainWindow.LoadApplication(launchPathArg); - } - -- if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false)) -- { -- _ = Updater.BeginParse(mainWindow, false); -- } -- - Application.Run(); - } - -@@ -200,4 +192,4 @@ namespace Ryujinx - Logger.Shutdown(); - } - } --} -\ No newline at end of file -+} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh similarity index 55% rename from third_party/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh rename to third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh index 35de197b62..a2f47baa06 100755 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/fetch-deps.sh +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/updater.sh @@ -1,10 +1,36 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nix-prefetch-git jq dotnet-sdk_5 set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" deps_file="$(realpath "./deps.nix")" +nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info +new_hash="$(jq -r ".sha256" < repo_info)" +new_rev="$(jq -r ".rev" < repo_info)" +rm repo_info + +new_version="$( + curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \ + | grep -Po '"version":.*?[^\\]",' \ + | sed 's/"version":"\(.*\)",/\1/' + )" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date! Doing nothing" + exit 0 +fi + +cd ../../../.. +update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev" + +store_src="$(nix-build . -A ryujinx.src --no-out-link)" +src="$(mktemp -d /tmp/ryujinx-src.XXX)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" +pushd "$src" + # Setup empty nuget package folder to force reinstall. mkdir ./nuget_tmp.packages cat >./nuget_tmp.config <>"$deps_file" + +popd +rm -r "$src" diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix index a4bb3addf8..b0459d6167 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/base.nix @@ -1,7 +1,7 @@ { pname, version, src, branchName , stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook , cmake, pkg-config -, libpulseaudio, libjack2, alsaLib, sndio, ecasound +, libpulseaudio, libjack2, alsaLib, sndio , vulkan-loader, vulkan-headers , qtbase, qtwebengine, qttools , nlohmann_json, rapidjson @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - libpulseaudio libjack2 alsaLib sndio ecasound + libpulseaudio libjack2 alsaLib sndio vulkan-loader vulkan-headers qtbase qtwebengine qttools nlohmann_json rapidjson diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix index cce501aa94..d47c593738 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix @@ -4,25 +4,25 @@ let in { mainline = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-mainline"; - version = "546"; + version = "576"; branchName = branch; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "0d6cbhp877xyjac1flkyjf6g6igzmvjlk6gcph4m04i4zivb9kf2"; + sha256 = "121pn3kmghpcf4pzs0mc8z3viyp32rzm7rssva7cdd5016z2648k"; fetchSubmodules = true; }; }; early-access = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-ea"; - version = "1480"; + version = "1536"; branchName = branch; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "0flc5mckmnr9gj8f78nh9nys96inlkqk3rvpgbpl0mhcg6lmlb2g"; + sha256 = "0smrx05xxr4b96i8bw6n6pynkl9r21ydfvpjdzxkr9amin20r54y"; }; }; }.${branch} diff --git a/third_party/nixpkgs/pkgs/misc/gnuk/generic.nix b/third_party/nixpkgs/pkgs/misc/gnuk/generic.nix index 8ed186e1ed..b614dd52a3 100644 --- a/third_party/nixpkgs/pkgs/misc/gnuk/generic.nix +++ b/third_party/nixpkgs/pkgs/misc/gnuk/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper -, python, pythonPackages +, python2Packages # Extra options , device ? "fsij", vid ? "234b", pid ? "0000" @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit src; nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ]; - buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]); + buildInputs = with python2Packages; [ python pyusb colorama ]; configurePhase = '' cd src diff --git a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix b/third_party/nixpkgs/pkgs/misc/lightspark/default.nix index c45240982a..7c9a4815e0 100644 --- a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lightspark/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre -, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, xz, nasm , llvm, glibmm }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg - pango lzma nasm llvm glibmm + pango xz nasm llvm glibmm ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 6529ac4bfb..d8ab3dcc5c 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -24,10 +24,11 @@ let preInstall ? "", postInstall ? "", path ? lib.getName pluginName, - dependencies ? [], ... }: - addRtp "${rtpPath}/${path}" rtpFilePath a (stdenv.mkDerivation (a // { + if lib.hasAttr "dependencies" a then + throw "dependencies attribute is obselete. see NixOS/nixpkgs#118034" # added 2021-04-01 + else addRtp "${rtpPath}/${path}" rtpFilePath a (stdenv.mkDerivation (a // { pname = namePrefix + pluginName; inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; @@ -44,8 +45,6 @@ let runHook postInstall ''; - - dependencies = [ pkgs.bash ] ++ dependencies; })); in rec { @@ -73,7 +72,6 @@ in rec { rev = "26eb5ffce0b559d682b9f98c8d4b6c370ecb639b"; sha256 = "1glwa89bv2r92qz579a49prk3jf612cpd5hw46j4wfb35xhnj3ab"; }; - dependencies = [ resurrect ]; meta = { homepage = "https://github.com/tmux-plugins/tmux-continuum"; description = "continous saving of tmux environment"; @@ -145,6 +143,34 @@ in rec { }; }; + extrakto = mkTmuxPlugin { + pluginName = "extrakto"; + version = "unstable-2021-04-04"; + src = fetchFromGitHub { + owner = "laktak"; + repo = "extrakto"; + rev = "de8ac3e8a9fa887382649784ed8cae81f5757f77"; + sha256 = "0mkp9r6mipdm7408w7ls1vfn6i3hj19nmir2bvfcp12b69zlzc47"; + }; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + for f in extrakto.sh open.sh tmux-extrakto.sh; do + wrapProgram $target/scripts/$f \ + --prefix PATH : ${with pkgs; lib.makeBinPath ( + [ pkgs.fzf pkgs.python3 pkgs.xclip ] + )} + done + + ''; + meta = { + homepage = "https://github.com/laktak/extrakto"; + description = "Fuzzy find your text with fzf instead of selecting it by hand "; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ kidd ]; + }; + }; + fingers = mkTmuxPlugin rec { pluginName = "fingers"; rtpFilePath = "tmux-fingers.tmux"; @@ -156,7 +182,15 @@ in rec { sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0"; fetchSubmodules = true; }; - dependencies = [ pkgs.gawk ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + for f in config.sh tmux-fingers.sh setup-fingers-mode-bindings.sh; do + wrapProgram $target/scripts/$f \ + --prefix PATH : ${with pkgs; lib.makeBinPath ( + [ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ] + )} + done + ''; }; fpp = mkTmuxPlugin { @@ -171,7 +205,6 @@ in rec { postInstall = '' sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux ''; - dependencies = [ pkgs.fpp ]; }; fzf-tmux-url = mkTmuxPlugin { @@ -211,8 +244,6 @@ in rec { postInstall = '' sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh ''; - dependencies = [ pkgs.ruby ]; - meta = with lib; { homepage = "https://github.com/schasse/tmux-jump"; description = "Vimium/Easymotion like navigation for tmux"; @@ -477,7 +508,7 @@ in rec { find $target -type f -print0 | xargs -0 sed -i -e 's|sed |${pkgs.gnused}/bin/sed |g' find $target -type f -print0 | xargs -0 sed -i -e 's|tput |${pkgs.ncurses}/bin/tput |g' ''; - meta = { + meta = { homepage = "https://github.com/sainnhe/tmux-fzf"; description = "Use fzf to manage your tmux work environment! "; longDescription = @@ -510,7 +541,6 @@ in rec { postInstall = '' sed -i -e '14,20{s|urlview|${pkgs.urlview}/bin/urlview|g}' $target/urlview.tmux ''; - dependencies = [ pkgs.urlview ]; }; vim-tmux-focus-events = mkTmuxPlugin { diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 6e070256a5..b67726cd58 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-03-18"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "eb24bdceff4f73b8081e2c801752105265f4b1b3"; - sha256 = "18rcikrlcdyg6gfbhaqnqf1p0pyfym9a0mxh430slhzzjhr2a7gh"; + rev = "f62ab294b9e4b3f5754c55d747d9ba513c7743e7"; + sha256 = "15lc6mrnzkc9bglgg8j9wn224raqbvd3k9wm6hjj5fb36ff6dlb5"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-03-27"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7efa17a4193a9835b4b29f9ae3accdc86174cdcf"; - sha256 = "0zya44l1svf7f97w2h4jql3zn86nhv8r8lk416xiy22g6kw37xsl"; + rev = "a66c3f191f64137e76b4df462177690faaf5faf9"; + sha256 = "1ijwfwi5a98zphwxkm1dx4kz1042a268fg02f21r7ssd0fh7fjv9"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -485,12 +485,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-03-18"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "123ef20cd2e5fa85df29912d545c2699844cd9b9"; - sha256 = "1bdqvmi1g8vziqkslwhbsjlnxk24vkc0c24hzn71zxlpnw1i3axz"; + rev = "f5bd5b3cdf43a281eb067ae7d25a30f1d32175ce"; + sha256 = "0w4j5p15swlq5qgij140fjjhk9by8bva9rkz8z6kc6262rhq0vl7"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -509,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-03-26"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "f996547651b775155bbc14f8031a4b674320a9ee"; - sha256 = "09h9ybb9lir9lq62496dh3d57i8x01a0iy2kfg273rp1fn7l8j03"; + rev = "d826e14db13980f7f1734117ff60f5e3573eb2ce"; + sha256 = "1b0yi6513n690y2sqlyzsckr15jim9izkjlfpphpw4a8d819hx7l"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-03-24"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "67fb4d138f34c12c6b44d87be66ede26d51b95c2"; - sha256 = "0nnh0gnc6g0a67na3zar6zvpc3i2qlna3l783hhy3832ih79v9s9"; + rev = "5e4dcf72bf47aabb8b579b16812dacdac5b2e77c"; + sha256 = "18129hfwd98xsfrqgv95m9kginr0y95i7h6dg91wa0pmlqfv61al"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -858,12 +858,12 @@ let dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-03-27"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "81b804d4009a9abacc259c542871c34852ec65a3"; - sha256 = "0cwarklmyj4wfvjmh7f1nlxnrx8vfvjbrlz3l3j6wc3amcd12kik"; + rev = "181ca6577101c04dd220b7a25096cbd4325979ec"; + sha256 = "03zazbnbcsg272zzx4q4n6vkvcwzm8lh1jw1fzbkn2blmffyjld6"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-03-27"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7cce9b9e9e1d2c44e07574572f730018d9c7ab9a"; - sha256 = "1cazz5ykfl6k0l3cxs3g60n9a5rrd78w0517861lbg9vwll7llw6"; + rev = "4bf092244dac9c8d21e22039979fa3afe240e5c5"; + sha256 = "1rybc152mv33xj460nk0g9gl4lkm342kp8b3w32mmb6s35iz9prl"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1027,12 +1027,12 @@ let deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2020-11-16"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-go"; - rev = "a6657ff9b91c7301ad1f6a01a7f0113691ef0667"; - sha256 = "02lv900k3vw33nknz58kl0hd4gr05jqq0xabi1zd4mvnk7vyqbd2"; + rev = "4eac2e6f127f2e2601dee415db2f826e2c9ef16c"; + sha256 = "0vwp1vnjf63i7wm3crpwjj9myjdw75ghq20i6nfrfv1szhqnq28m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; @@ -1643,12 +1643,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-03-27"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4ac3ea179d0f751ed1d9300fae63719f55085d7b"; - sha256 = "0a5czpf6808xrr327c9kcg68br6whfv41rp4w9073kvf1ir32kp3"; + rev = "21e86b0a5e6870c227f1f922104816f861dc4066"; + sha256 = "0q6inyqkwxpiqq48744bcr2inkvlvnp3dycanbnkyb5828dd0gxz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1811,12 +1811,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-03-25"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "a0e9e229bbd0e493511fb9d27d917f55c5e4191a"; - sha256 = "090waig8fqq1s9z66ykr64ns3g9yb6qy32jf5fwamx43m9xcws2s"; + rev = "a89898aefbb18d2c804c049c63c009203f810f08"; + sha256 = "0gncq9blz0rqvybljfpg3qndmdyv8hh3w7yqx7l6h2czhm7ympvi"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2292,12 +2292,12 @@ let lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-03-13"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "0aaf6a68e8668c1baa724c0d31679ad12f27cd47"; - sha256 = "08dlfm3f9qa4p77zznmgjrmx09yngpcfzmxmyc5z3gp51b6bbixb"; + rev = "8c955dbe4a8e0a9fc0ab8a237ebd7ff25c63d482"; + sha256 = "137h4sbhdjrf383kl3sskx90m40j8xsjhq37p2m7b0mjpdzq3mzz"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -2328,24 +2328,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-03-26"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "9a377c6e727cff15b4c4c3657e36f3a36e559d50"; - sha256 = "0cpyiwckn1dpgf6cyrlh1yffib3dckg18ac84c1bvpmvc37zvghy"; + rev = "27c7a4796869e155ecec48eb3f8e66694c1708e2"; + sha256 = "1kdj6b7ph4111spwr55d6a0jjyrr18fbxyl3yi2nb5h75vm2hisj"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-03-26"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "a3037fbf0b101daa0ab2564ee3948d52e470ce03"; - sha256 = "1r8aryyl8zajj1vpvkwf4lqikgjxpagdiahcvgbclfdmc3dn82c7"; + rev = "a2721e5adabaa9535768bde7155c6f1dfac59418"; + sha256 = "0rz4gl0jwl8r8alcwpl7q5836gfhwr4kpgl19xdf6grpa88fp7zw"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2880,12 +2880,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-12-05"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "5fa0e3e1487b17f8a23fc2674ebde5f55ce6a816"; - sha256 = "0nwb3jla0rsg9vb52n24gjis9k4fwn38iqk13ixxd6w5pnn8ax9j"; + rev = "bce6e0a6f0000388f0864f909648a45b97cb8333"; + sha256 = "198ijzy9y0g8lypyvvc4xfz9pdikyfc8ycsds7j4y0s2gla2lsa8"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -2976,12 +2976,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-03-26"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "3aaeb3d070538a7208363cc775258d52a6da5b3f"; - sha256 = "1gsg1m27rdcbg2qszxwnvjigwxgy5n9rdc6nl9r902rg5kzhb054"; + rev = "3164eaafe82249f97352bd11b123117306703507"; + sha256 = "0d1adly3h4hd4hdj11i1w2xl1cn2vgp6vmyqwd8jl906ziydbqhr"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3060,12 +3060,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-03-25"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "a39284243014c1414134b99ee2f7ae1fdd070273"; - sha256 = "0648gz8rc6l79hg3xqkr0049fn762v7rcyvq50ya81ljrs2jl004"; + rev = "e594493d79757523727034d0a1401cb9dbf88933"; + sha256 = "042gg8x07irf66lhnvrj1i6p496f2jks165599x7f58d0hmbg8r3"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3120,12 +3120,12 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-03-08"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "5f189ece5e071f4133ce756bec0ab7da1f6eece6"; - sha256 = "1s59fr7ppw37c98skrlbbcw583dhrqwjwd2nwjhmhhc884r88d5x"; + rev = "1f04af27eace7dd790ce620b36ba23aac4c8086e"; + sha256 = "0hri0rxmzy7kgfj9w729h67qmg373c2rz31racsn1vq7anm33im7"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3156,12 +3156,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-03-27"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "7a4049b3d05b0a91e12a9a2c874d7d96475af501"; - sha256 = "1gp9flk6myq1y67hhavk7689rfib5na6y012dc78rnwmf2v6gc0z"; + rev = "4ebad2d52b7c648a7f6ceb5e62dde49167d07796"; + sha256 = "0cnh6x49yy6z3f3h7q0q8l90cl7dchxfdgz7c143nv5qd3qkgnmc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3180,12 +3180,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-03-27"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "97bdebef2c46404cb1441ea62658cdd797265f24"; - sha256 = "1j7051cj4lim97kfpzhwgp95y63lk336yshbjsr89al9dxhvsaa3"; + rev = "a59ec2ec448772eae3fbf3854b9787c991bb38c6"; + sha256 = "1c6dd38sy2apkjx5jrkm09pk9yrczbzf29lhc7clgi89196hvirh"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3288,12 +3288,12 @@ let nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-03-11"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "91869ed307084836e45abcf63a4fc0aee66a2d6e"; - sha256 = "0z8fxqhnmwldhjdx7z6yzlngisc8zjfsr9n76iz9c20brrazsp9k"; + rev = "8ab639bcf22f902e7d55ee34698ef07b178ac0a3"; + sha256 = "0wfiij0dsxl8l7v6hvjh73qm51hbipqzy8cmssshssr4f8q2dnzg"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3324,24 +3324,24 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-03-25"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "8714eade54870231b1df247453a5535a40b0a7b4"; - sha256 = "192376c6nbx5kgj96wvpmds7ird8hfk4v8ayg1gay18vljyszxj9"; + rev = "34e859ab43998bc107eae7fa022c52e3a7e43e13"; + sha256 = "1p76saf4br51sja0ba5nlkggs8nwn949311sk4a7whl3qiiy7h3r"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-03-23"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "6e32d113d848c76ddbcc824038244657f170a97a"; - sha256 = "02m8bsq7172sm9vkq3shh87xv4c3jxkgvhwhd3vv0na86kl9sqd6"; + rev = "664830d2b0de29d91f127f70ef877d3509554bc8"; + sha256 = "0fs9nkfzwnbaj0l2l7l7gwf4kr8ciq8yzvwa5k816ra12vcvx00x"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3468,12 +3468,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-03-24"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "df33faeef884d55ca8f97479ea55b8d9bd2ffb3f"; - sha256 = "1pizzzmb551c2pr0srw27ya8a4awfgq14k2dswmk8i8vra54vsj6"; + rev = "56c193d70a333a6bbf3d14bf8c150c071dea757a"; + sha256 = "0x2swp6qs47q1y555n2l052in3bd3xf2q3064n5avwnksmqcnwvg"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3564,12 +3564,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-03-15"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "2768ba75b32389a460273fab6f45575237b97bc2"; - sha256 = "14l47j8j5idm170vk92j72ndmkkn0gqjp709yb1b731nsnz9wcjh"; + rev = "626e2b150a1353b36d4994a613d35d397618c379"; + sha256 = "10vws9nxqi0sjf0c9yg9401c9vfkgidracpcjk5n9qf0lgrnf22a"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3781,12 +3781,12 @@ let registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-03-27"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "69f49a0185fb9c08454d74f441dfe216d18e6a82"; - sha256 = "12mgbfysm7cn2qahpmr08451avanvzjzngylf95ss0r2s65whlk4"; + rev = "037f6f46d6b88eca58952d65c14309967a7e7455"; + sha256 = "14f4zpk7sfm6kx0wsqr5snfmpyadv819lraymy07wfb41kr2cgya"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4322,12 +4322,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2021-02-03"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "2de3885686e7011f7efe0e31c2b6e0c002f9dd1a"; - sha256 = "009x5bgj6grmwl35s0silkbnylpa5sjr4h0wyp6rl9xlj381vvn5"; + rev = "7a9c1ea50b27a03c68d7b10267bef2c5aa5d46fb"; + sha256 = "0vq6r9giqpz2ai2rawrrm2b70k5yl72jzifkcsrlqc5z575s4nla"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -4371,12 +4371,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-03-21"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "a7fa60411efbfddc0674d65346a5311e33f6deb1"; - sha256 = "0g8rp6qx3n43ipycav5jrhzbd5p3kp9cmcn277yn81y3f76sarij"; + rev = "2e03f67de9eab023098bd05916bf26556520a467"; + sha256 = "1j3875fhs49bkpl39xfynhzm1mwlr6kdlnh3rpgyd60y7334fv8r"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4395,12 +4395,12 @@ let termwrapper-nvim = buildVimPluginFrom2Nix { pname = "termwrapper-nvim"; - version = "2020-12-23"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "termwrapper.nvim"; - rev = "beb5d2d8a4b6c8fee10cfe5e0dfda158bb0cb33a"; - sha256 = "05vr38w4qx42hy9injnji7qjkzm7pkysbkr8mlzalwb0i2giy51a"; + rev = "e00da3cc137f795470818204fc2e712473481c78"; + sha256 = "0a61n9dpf94rrkq79pjwn73axa1d2zfpsr2ci7wivg3inq7zsqyc"; }; meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/"; }; @@ -4996,12 +4996,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-03-21"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "e9104aeece94652b064a15ae220bd4926a715dbd"; - sha256 = "1kvnmzs1wbqaiswsjra13f06m8dpdn62h8zqrnr9vv13rm8a2326"; + rev = "ba9dfa038b67d8df969366dbf8fde6644587662d"; + sha256 = "1zd0fq6jy2p2qbch52d3838zmf5v5j8v3x4qa2r39fjidy93i099"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -5212,12 +5212,12 @@ let vim-closer = buildVimPluginFrom2Nix { pname = "vim-closer"; - version = "2021-02-24"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "rstacruz"; repo = "vim-closer"; - rev = "c34636e104e8731d4a414d6500303442ff7ed94e"; - sha256 = "07ap62n10dfvw9q71q8zkms8z3jl279a99shr7scyf8q4ngsj024"; + rev = "26bba80f4d987f12141da522d69aa1fa4aff4436"; + sha256 = "1pyi5akzvvkdngm577m1c1210r0yypdwsvp1y7ag6gdfnls75xws"; }; meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; @@ -5236,12 +5236,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-12-18"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "0bf16eb74e8243ee477ad97330e451026311fbae"; - sha256 = "06060173jyz1n977a2jaq706x850bayg2n2jwmidbrsbiyx2krzy"; + rev = "048baf8361d7ea24bfbaa4427ab4de08c39b0d57"; + sha256 = "17xnxka4q7fqpl52x5fh2kpqzs7h1ql2lvv6sv7a0apf2qafs0qy"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -5800,12 +5800,12 @@ let vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2020-04-05"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "0c7cf6dc038223b44e3c0a702fe2acf997768e8a"; - sha256 = "14k1b7gjj1sh40qsf4wxbn0dymmc4jvsrd9pacsr6li273aiy6gq"; + rev = "719cc31e2d07021906cc6471b7d7b1863d2b6acf"; + sha256 = "0514gm0r36zclhzjckxnb3v9y8hl85iddjldh0irlagfwa7by773"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -5884,12 +5884,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-03-26"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "eaee845abaf75827cc3c6a3f96d7ff77a3a8beff"; - sha256 = "1m5yns33a92mhhjbpba76hnkai0d45k7iwqwdlm524c90cmkff55"; + rev = "a1cb01da5b2c84ebfbe86a02bfb2e7ef9d830d50"; + sha256 = "0bgccfzwjq3jj5iygi1dp8zmqa8c44zdm0qzblp710qrm3lrvzsk"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6004,12 +6004,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-03-26"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "80d0e38fbdc3b5e88133e730fc563414a0403485"; - sha256 = "070by6ki5zw112ia4gvm3zasr1qliysb7lag6s0x7vh1ywdzg9ii"; + rev = "bd89f4734555c60f53acaf21731bd43617e6e526"; + sha256 = "0j5xkf8rk77q11h0cn96gymsa726p1dsvjs718plh8p94p0w42c3"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6522,12 +6522,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2021-03-20"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "af91003c4852e94abc508a3c67bb92958c56fcbe"; - sha256 = "0bjzdli80pmcxp0rfhxkdmwnlq5s61ih7a3h2fybgqrphz87sazm"; + rev = "8f6c4454eb462776b6ebdc48e3e29a68ddeb726d"; + sha256 = "04x6y9yp5xlds37bswmrc3xlhhjfln9nzrkippvvhl48b0kfnpj8"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -6666,12 +6666,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-03-21"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "b8e75ef927b48848f3f21b7033aa68c9c88e9392"; - sha256 = "0c3b7r7vkxcfgznwylj5psbkvrph5qqsifawrxjdjgx2imc7arva"; + rev = "4d4a90822461894caa8f39129dd5c16597e005c5"; + sha256 = "0yixk6m7bn53g7q998g2z460yvf08d93yqq5xj0fc75z58fgmdhn"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6751,12 +6751,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-03-17"; + version = "2021-03-30"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "e477123fcc47cc419d04beee6695d8558272ca8c"; - sha256 = "0j37dx8ka7qb9wpdx5kqnf6rwmrhpcla1838v97f0dfhljxd4w27"; + rev = "b3bd7fc61a35ef45b83a3577792f75922fced77b"; + sha256 = "0x9iq1d76ivdw1jfj6d04gkbxqqcagyhhq89ld2wgwcgc68ipixw"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7399,12 +7399,12 @@ let vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2021-02-01"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "0da85ff4270c2be10e24729dd42fb749ad1b69b7"; - sha256 = "0f8qnxy18qskbr3m8hn4vqv7bcvr2b0xqi64bxx078an5x8lbgx2"; + rev = "127257057c4befb8c1026a7ba7e07713af1fb5c8"; + sha256 = "1ai915kfxq4m8ba304qpcc2qb5rcj2vsrfcdh3blb1slw3a90hiq"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -7471,12 +7471,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-03-11"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "ee53e8303be8a28234ea97109b4e1ce716f0f2ad"; - sha256 = "0bjdhkw6ii3z310kjm06g7m03as001cgkzw082mb63kix7hh06x8"; + rev = "9c3c831a089c7b4dcc4ebd8b8c73f366f754c976"; + sha256 = "15m7hhqadvpf3ryig5vifp8m0md2mg9apx71z8xrpc7hgwsvy1bi"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -8312,12 +8312,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-03-24"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "4eb5f669c11c497fa075912eb03294b11fca2c07"; - sha256 = "1imrkir6ir2fl63wh91yh5jp64kxd3zh1m7p05dcfbyd7rc2l9c1"; + rev = "ac78ab499918fbdb9d5121d9832bddbd1c258123"; + sha256 = "155jj7nrh9a4bwhambdvggz46kddqhj92bl4xhdv2iyyrbfz5ygy"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -8601,12 +8601,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-03-26"; + version = "2021-03-29"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "41667e58248595aa50109f856f47cb38ab93225a"; - sha256 = "1zwsflvxljmx7mndpq5ph19n5kk5cild4grg7dvan9jd2qlf6cvi"; + rev = "9e9d58afe147e457c360bdb2fb21b0bcd3d83230"; + sha256 = "05djvd5xphfz9xg24kfm8clkgvslb0cmj5iljm4bv20v4bvnkg43"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8831,12 +8831,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-03-27"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "d0ece1ef669d5799ab4184b05deca74943270232"; - sha256 = "0p959ih2xkcskk83fn92w9g0xdqs93s5lq5sq7hw6frc6plk3fh1"; + rev = "f17239ec33d62ed379bb78912070f3cfe3e29062"; + sha256 = "0ai18xsnaiq26yls60wq6lmkdzscihkdcg9naakclrp0af992kxs"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index cacbbde1d2..e433ac8e2f 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -340,6 +340,10 @@ self: super: { dependencies = [ self.fzfWrapper ]; }); + onehalf = super.onehalf.overrideAttrs (old: { + configurePhase = "cd vim"; + }); + skim-vim = super.skim-vim.overrideAttrs (old: { dependencies = [ self.skim ]; }); diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 3f77906bce..6d6ca873d2 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -465,8 +465,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.208"; - sha256 = "1yjz7i3f2f9a3i797vwa9vnxsh9lyxqr4k0ixx8v55h628kvafr9"; + version = "0.0.209"; + sha256 = "1i0wq8zwax4kmy69hh0hclx9a47ycm3qp3gspjq8xpmcq3nmbfaq"; }; meta = with lib; { license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index 836b9cc2a2..a307ed5701 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.3968"; - sha256 = "1nmhkxrlg9blxcqh7a3hl0wc5mkk2p77mn228lvmcirpbk3acsx5"; + version = "1.0.4070"; + sha256 = "18dddaz5g0kbrmj9l9k0fivdj6p6y5a6iw24ikvzmypz8zql7gd5"; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 2d51c11f04..b86891352f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex +{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex , writeText, buildPackages, splicePackages, symlinkJoin }: let @@ -563,7 +563,7 @@ let sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ makeMinimal install mandoc groff flex - yacc genassym gencat lorder tsort stat ]; + bison genassym gencat lorder tsort stat ]; extraPaths = [ sys.src ld_elf_so.src ]; }; @@ -587,7 +587,7 @@ let librpcsvc.src libutil.src librt.src libcrypt.src ]; buildInputs = [ buildPackages.netbsd.headers csu ]; nativeBuildInputs = [ makeMinimal install mandoc groff flex - yacc genassym gencat lorder tsort stat ]; + bison genassym gencat lorder tsort stat ]; NIX_CFLAGS_COMPILE = "-B${csu}/lib"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 4855c532ac..b4c28e23c1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc +{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, bison }: # this derivation sucks @@ -16,7 +16,7 @@ let recentAdvCmds = fetchzip { }; in appleDerivation { - nativeBuildInputs = [ bsdmake perl yacc flex ]; + nativeBuildInputs = [ bsdmake perl bison flex ]; buildInputs = [ flex ]; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 5ac971d02f..800da92dae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, appleDerivation, yacc, flex }: +{ lib, stdenv, appleDerivation, bison, flex }: appleDerivation { - nativeBuildInputs = [ yacc flex ]; + nativeBuildInputs = [ bison flex ]; buildPhase = '' cd migcom.tproj diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 258d9785e7..53f98e2b45 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,8 +1,8 @@ -{ lib, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }: +{ lib, appleDerivation, xcbuildHook, zlib, bzip2, xz, ncurses, libutil }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ zlib bzip2 lzma ncurses libutil ]; + buildInputs = [ zlib bzip2 xz ncurses libutil ]; # some commands not working: # mtree: _simple.h not found diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 3f0c91db91..9e3d6e4920 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,14 +1,14 @@ -{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ lib, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, xz }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ ncurses bzip2 zlib lzma ]; + buildInputs = [ ncurses bzip2 zlib xz ]; # patches to use ncursees # disables md5 patchPhase = '' substituteInPlace text_cmds.xcodeproj/project.pbxproj \ - --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = ""; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; };' \ + --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = ""; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; };' \ --replace 'FC7A7EB5149875E00086576A /* PBXTargetDependency */,' "" ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/mas/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/mas/default.nix new file mode 100644 index 0000000000..495d47df89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/mas/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchurl +, libarchive +, p7zip +}: + +stdenv.mkDerivation rec { + pname = "mas"; + version = "1.8.1"; + + src = fetchurl { + url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas.pkg"; + sha256 = "W/wgg+ETeJPoZ7MoVGH2uJzQiZMLIy3n1JYKUloc3ZU="; + }; + + nativeBuildInputs = [ libarchive p7zip ]; + + unpackPhase = '' + 7z x $src + bsdtar -xf Payload~ + ''; + + doBuild = false; + + installPhase = '' + mkdir -p $out + cp -r ./bin $out + cp -r ./Frameworks $out + ''; + + postFixup = '' + install_name_tool -change @rpath/MasKit.framework/Versions/A/MasKit $out/Frameworks/MasKit.framework/Versions/A/MasKit $out/bin/mas + install_name_tool -change @rpath/Commandant.framework/Commandant $out/Frameworks/MasKit.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Commandant $out/bin/mas + ''; + + meta = with lib; { + description = "Mac App Store command line interface"; + homepage = "https://github.com/mas-cli/mas"; + license = licenses.mit; + maintainers = with maintainers; [ zachcoyle ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix index f7ca3f71d4..3055a91161 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: +, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let version = "5.1.6"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation { #make install SUBDIRS="samples" # impure! ''; - buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd + buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd openssl cyrus_sasl rpcsvc-proto ]; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index 8edd9257fe..701fed06bb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; - rev = "refs/tags/v${version}"; - sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"; + rev = "v${version}"; + sha256 = "0njbixkrpdl9gjnkzg0ybmqsva0ydfda5vms66v8ij7xida2qy07"; }; buildInputs = with llvmPackages; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix index c4ed4d4fc0..38f958fe9d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config -, kerberos, keyutils, pam, talloc, python3 }: +, libkrb5, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { pname = "cifs-utils"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - buildInputs = [ kerberos keyutils pam talloc python3 ]; + buildInputs = [ libkrb5 keyutils pam talloc python3 ]; configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix index d0e685cd0f..ad700c0977 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.3.4"; + version = "2.3.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz"; - sha256 = "0wrpz2fzbsszmsgxxbssxjgylpyiindh24z8g13m2fxmjsxyw5lx"; + sha256 = "sha256-ztmUb0RNEyU22vkvyKykJ3Y4o8LZbiBUCyuuTTb9cME="; }; # Disable 4 test cases that fail in a sandbox diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix index 76abeff42d..9f0afd6c2b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix @@ -37,5 +37,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; + changelog = "https://github.com/dstat-real/dstat/blob/v${version}/ChangeLog"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index f7f0203780..80730fdbef 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; version = "0.1.2"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; + buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 041694e2ec..e6a03ef7df 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2020-12-01"; + version = "2021-01-28"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc"; - sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27"; + rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d"; + sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b"; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "b66ab26cebff689d0d3257f56912b9bb03c20567"; - sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f"; + rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5"; + sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp"; }) ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h"; + outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby"; meta = with lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 3561916fd6..8a19e6b858 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20201201"; + version = "1.20210201"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n"; + sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix deleted file mode 100644 index 673ef686e4..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, linuxPackages }: - -with lib; - -stdenv.mkDerivation rec { - name = "rtlwifi_new-firmware-${linuxPackages.rtlwifi_new.version}"; - inherit (linuxPackages.rtlwifi_new) src; - - dontBuild = true; - - installPhase = '' - mkdir -p "$out/lib/firmware" - cp -rf firmware/rtlwifi/ "$out/lib/firmware" - ''; - - meta = { - description = "Firmware for the newest Realtek rtlwifi codes"; - inherit (src.meta) homepage; - license = licenses.unfreeRedistributableFirmware; - platforms = with platforms; linux; - maintainers = with maintainers; [ tvorog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix new file mode 100644 index 0000000000..b4e07624b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix @@ -0,0 +1,25 @@ +{ stdenvNoCC, lib, linuxPackages }: + +stdenvNoCC.mkDerivation { + pname = "rtw88-firmware"; + inherit (linuxPackages.rtw88) version src; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/firmware/rtw88 + cp *.bin $out/lib/firmware/rtw88 + + runHook postInstall + ''; + + meta = with lib; { + description = "Firmware for the newest Realtek rtlwifi codes"; + homepage = "https://github.com/lwfinger/rtw88"; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ tvorog ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 138fea042f..9d47d50b43 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: +{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, efibootmgr, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ lzma openssl dbus ]; + buildInputs = [ xz openssl dbus ]; cargoBuildFlags = [ "--workspace" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index b60a10c73e..7528fae6bd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "020hhdarbn3bwlc2j2g89868v8nfx8562z1a778ihpvvsa4ykr31"; + sha256 = "1zdadi9f7wj6kgmmk9zlkpdm1lb3gfiscg9gkqqdql2si7y6g2nq"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix index b5eb1ce1a5..83ac93fbf7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}: +{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/template/linux.sh" \ --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/route" "${nettools}/bin/route" \ - --replace "/sbin/ip" "${iproute}/sbin/ip" \ + --replace "/sbin/ip" "${iproute2}/sbin/ip" \ --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix index 06b23bdf1f..2b018c0267 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { CONFIG_HS20=y CONFIG_ACS=y CONFIG_GETRANDOM=y + CONFIG_SAE=y '' + lib.optionalString (sqlite != null) '' CONFIG_SQLITE=y ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix index 2d7644e6bd..2b6bf6fc63 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, python, kernel, makeWrapper, writeText -, gawk, iproute }: +, gawk, iproute2 }: let libexec = "libexec/hypervkvpd"; @@ -42,7 +42,7 @@ let postFixup = '' wrapProgram $out/bin/hv_kvp_daemon \ - --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]} ''; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix index 7285e27ff3..1272321390 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,6 +1,6 @@ -{ lib, iproute, fetchFromGitHub }: +{ lib, iproute2, fetchFromGitHub }: -iproute.overrideAttrs (oa: rec { +iproute2.overrideAttrs (oa: rec { pname = "iproute_mptcp"; version = "0.95"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix index 4e0ae7955b..33152cc51c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: +{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }: # TODO: These tools are supposed to work under NetBSD and FreeBSD as # well, so I guess it's not appropriate to place this expression in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; }; - buildInputs = [ readline openssl flex kerberos pam ]; + buildInputs = [ readline openssl flex libkrb5 pam ]; patches = [ ./dont-create-localstatedir-during-install.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix new file mode 100644 index 0000000000..1806916b14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, kernel, kernelAtLeast }: + +stdenv.mkDerivation rec { + name = "isgx-${version}-${kernel.version}"; + version = "2.11"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "linux-sgx-driver"; + rev = "sgx_driver_${version}"; + hash = "sha256-zZ0FgCx63LCNmvQ909O27v/o4+93gefhgEE/oDr/bHw="; + }; + + patches = [ + # Fixes build with kernel >= 5.8 + (fetchpatch { + url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch"; + sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24="; + }) + ]; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + runHook preInstall + install -D isgx.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/intel/sgx + runHook postInstall + ''; + + meta = with lib; { + description = "Intel SGX Linux Driver"; + longDescription = '' + The linux-sgx-driver project (isgx) hosts an out-of-tree driver + for the Linux* Intel(R) SGX software stack, which would be used + until the driver upstreaming process is complete (before 5.11.0). + + It is used to support Enhanced Privacy Identification (EPID) + based attestation on the platforms without Flexible Launch Control. + ''; + homepage = "https://github.com/intel/linux-sgx-driver"; + license = with licenses; [ bsd3 /* OR */ gpl2Only ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.linux; + # The driver is already in kernel >= 5.11.0. + broken = kernelAtLeast "5.11.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 7ba05d1329..777a91241b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -533,7 +533,7 @@ let KVM_VFIO = yes; KSM = yes; VIRT_DRIVERS = yes; - # We nneed 64 GB (PAE) support for Xen guest support + # We need 64 GB (PAE) support for Xen guest support HIGHMEM64G = { optional = true; tristate = mkIf (!stdenv.is64bit) "y";}; VFIO_PCI_VGA = mkIf stdenv.is64bit yes; @@ -680,7 +680,14 @@ let DEBUG_MEMORY_INIT = option yes; }); - misc = { + misc = let + # Use zstd for kernel compression if 64-bit and newer than 5.9, otherwise xz. + # i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375 + useZstd = stdenv.buildPlatform.is64bit && versionAtLeast version "5.9"; + in { + KERNEL_XZ = mkIf (!useZstd) yes; + KERNEL_ZSTD = mkIf useZstd yes; + HID_BATTERY_STRENGTH = yes; # enabled by default in x86_64 but not arm64, so we do that here HIDRAW = yes; @@ -696,10 +703,6 @@ let MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; - # use zstd for kernel compression if newer than 5.9, else xz. - KERNEL_XZ = whenOlder "5.9" yes; - KERNEL_ZSTD = whenAtLeast "5.9" yes; - SYSVIPC = yes; # System-V IPC AIO = yes; # POSIX asynchronous I/O diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index a8cdaafcdf..002799aa6a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.227-hardened1.patch", - "sha256": "0g8s91cvcxin95is7hhap5i8vkn4k3570s28vnz8mf0jrcgwdgfd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.227-hardened1/linux-hardened-4.14.227-hardened1.patch" + "name": "linux-hardened-4.14.228-hardened1.patch", + "sha256": "0pf3c98m2zlgxv9p10p7xw44f6mqnh8ac47jl1abz3yy3hiag0cd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.228-hardened1/linux-hardened-4.14.228-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.183-hardened1.patch", - "sha256": "1xi4fkvdvf1rjhrihi7im415x26hwmvhf3zrklm8hw2rmajdfrca", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.183-hardened1/linux-hardened-4.19.183-hardened1.patch" + "name": "linux-hardened-4.19.184-hardened1.patch", + "sha256": "1828kkq05808mahkfb0387b1k5qp6pysy4mny1xgpwqdphpp1pq9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.184-hardened1/linux-hardened-4.19.184-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.25-hardened1.patch", - "sha256": "0d5fid229769frifr7g20ly553gxdqqvajfwyzqwjpr82jjzxlis", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.25-hardened1/linux-hardened-5.10.25-hardened1.patch" + "name": "linux-hardened-5.10.27-hardened1.patch", + "sha256": "12pzv36p0pdaqqklwv6rpk15c1z1nz2syw1si24514p63v46wmhn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.27-hardened1/linux-hardened-5.10.27-hardened1.patch" }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.9-hardened1.patch", - "sha256": "169jcalr81ckad08vx489h8j6k42s0rzxbpkr6knyrd7rv06ddk0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.9-hardened1/linux-hardened-5.11.9-hardened1.patch" + "name": "linux-hardened-5.11.11-hardened1.patch", + "sha256": "0isq152z4h2kl3rviia9xlpsmdx331kx8p1x00jbf4gcw30amc78", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.11-hardened1/linux-hardened-5.11.11-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.108-hardened1.patch", - "sha256": "1m208j0svysyn3m0acn10pd4wqjm203ampkhf1wimzpzs8wfasgj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.108-hardened1/linux-hardened-5.4.108-hardened1.patch" + "name": "linux-hardened-5.4.109-hardened1.patch", + "sha256": "19likbds74lzym969p6hbchlfii4qnsp8y4ryfkba1vv6hv51zzj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.109-hardened1/linux-hardened-5.4.109-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 1dd2521dfb..729cf3a601 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.227"; + version = "4.14.228"; # 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 = "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7"; + sha256 = "0nw1jf6x5a990n69aw2da4s4lc1c7mnwiwcda40bl2rkmd24s1qm"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 3530d02236..dbd0f9e7f5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.183"; + version = "4.19.184"; # 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 = "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs"; + sha256 = "0z5pgal8775rf7pvpxq47dnghr42al2k9py0s9jl3js2wamgdyix"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index b2b5c43722..d90489922a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/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.263"; + version = "4.4.264"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2"; + sha256 = "1b0d735qnk0bcqn9gdsjqxhk8pkb3597ya9f34lv1vjfaqkkxk7l"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index c07e1c98d4..e0caeb138d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/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.263"; + version = "4.9.264"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz"; + sha256 = "1df2dv26c9z6zsdlqzbcc60f2pszh0hx1n94v65jswlb72a2mipc"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 623a3a14f1..911cb326dd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.26"; + version = "5.10.27"; # 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 = "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw"; + sha256 = "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix index cf9302757f..16d0e5c1d4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.9"; + version = "5.11.11"; # 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 = "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal"; + sha256 = "1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index fdb32a2476..ac867e7876 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.108"; + version = "5.4.109"; # 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 = "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj"; + sha256 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix index 176c2180f3..373984298c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.4.79"; - tag = "1.20201201"; + modDirVersion = "5.10.11"; + tag = "1.20210201"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9"; + sha256 = "0n4zq47k9bmkgmarrhwvivp10v5ga8y2bphsx0il3kmcpf0c1m3q"; }; defconfig = { @@ -23,15 +23,18 @@ lib.overrideDerivation (buildLinux (args // { "4" = "bcm2711_defconfig"; }.${toString rpiVersion}; - extraConfig = '' - # ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources' - PCIE_ALTERA n - ''; - features = { efiBootStub = false; } // (args.features or {}); + extraConfig = '' + # ../drivers/gpu/drm/ast/ast_mode.c:851:18: error: initialization of 'void (*)(struct drm_crtc *, struct drm_atomic_state *)' from incompatible pointer type 'void (*)(struct drm_crtc *, struct drm_crtc_state *)' [-Werror=incompatible-pointer-types] + # 851 | .atomic_flush = ast_crtc_helper_atomic_flush, + # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush') + DRM_AST n + ''; + extraMeta = if (rpiVersion < 3) then { platforms = with lib.platforms; [ arm ]; hydraPlatforms = []; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 0f017bb4b2..cd6273d21e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.21-rt34"; # updated by ./update-rt.sh + version = "5.10.25-rt35"; # 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 = "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy"; + sha256 = "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "12c2qpifcgij7hilhd7xrnqaz04gqf41m93pmlm8cv4nxz58cy36"; + sha256 = "0kvawcyxg0xzhx73xs9g9s0hr7bs44sy4zvfzvcg2m9hdyafry0k"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 24e9011875..54fab6a774 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.47"; + version = "2.48"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "0jx0vjlfg1nzdjdrkrnbdkrqjx4l80vi9isf2qav7s4zbzs5s5mg"; + sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI="; }; patches = lib.optional isStatic ./no-shared-lib.patch; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix index b43d70f21b..e40a59ce82 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }: stdenv.mkDerivation rec { pname = "libcgroup"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4"; }; - buildInputs = [ pam yacc flex ]; + buildInputs = [ pam bison flex ]; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix index b1ed0a7240..0bc1ed123d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.11.2"; + version = "1.12.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xy7A1hjz4O13bMZ0RbOuxEzVkVW5+WKC+MOH5rcGzH0="; + sha256 = "sha256-OFp6nEW5D8vjglqLRbEgKryb2/KFuJD8Zn6rkpcuPh0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix index b7d08344e4..b40b3c46e7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix @@ -1,5 +1,5 @@ { stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config -, pythonSupport ? false, swig ? null, python}: +, pythonSupport ? false, swig ? null, python ? null}: stdenv.mkDerivation rec { pname = "libnl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postBuild = lib.optionalString (pythonSupport) '' cd python - ${python}/bin/python setup.py install --prefix=../pythonlib + ${python.interpreter} setup.py install --prefix=../pythonlib cd - ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix index 915609e886..34ad80a6c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix @@ -20,16 +20,20 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "ETCDIR=${placeholder "out"}/etc" "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] ++ lib.optional sensord "PROG_EXTRA=sensord"; + installFlags = [ + "ETCDIR=${placeholder "out"}/etc" + ]; + meta = with lib; { homepage = "https://hwmon.wiki.kernel.org/lm_sensors"; changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES"; description = "Tools for reading hardware sensors"; license = with licenses; [ lgpl21Plus gpl2Plus ]; + maintainers = with maintainers; [ pengmeiyu ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix index 5c3646f7b3..1c51670704 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/macchanger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo }: stdenv.mkDerivation rec { pname = "macchanger"; @@ -11,15 +11,38 @@ stdenv.mkDerivation rec { sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/02-fix_usage_message.patch"; + sha256 = "0pxljmq0l0znylbhms09i19qwil74gm8gx3xx2ffx00dajaizj18"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/06-update_OUI_list.patch"; + sha256 = "04kbd784z9nwkjva5ckkvb0yb3pim9valb1viywn1yyh577d0y7w"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/08-fix_random_MAC_choice.patch"; + sha256 = "1vz3appxxsdf1imzrn57amazfwlbrvx6g78b6n88aqgwzy5dm34d"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/check-random-device-read-errors.patch"; + sha256 = "0pra6qnk39crjlidspg3l6hpaqiw43cypahx793l59mqn956cngc"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/verify-changed-MAC.patch"; + sha256 = "0vjhf2fnj1hlghjl821p6idrfc8hmd4lgps5lf1l68ylqvwjw0zj"; + }) + ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; outputs = [ "out" "info" ]; meta = with lib; { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainers = with maintainers; [ joachifm ma27 ]; + maintainers = with maintainers; [ joachifm ma27 dotlambda ]; license = licenses.gpl2Plus; - homepage = "https://www.gnu.org/software/macchanger"; + homepage = "https://github.com/alobbs/macchanger"; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix index c2d2996c54..7b5f6e7200 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent -, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers +, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 - libuuid keyutils kerberos tcp_wrappers + libuuid keyutils libkrb5 tcp_wrappers ] ++ lib.optional enablePython python3; enableParallelBuilding = true; @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure \ - --replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \ - --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config + --replace '$dir/include/gssapi' ${lib.getDev libkrb5}/include/gssapi \ + --replace '$dir/bin/krb5-config' ${lib.getDev libkrb5}/bin/krb5-config ''; configureFlags = [ "--enable-gss" "--enable-svcgss" "--with-statedir=/var/lib/nfs" - "--with-krb5=${lib.getLib kerberos}" + "--with-krb5=${lib.getLib libkrb5}" "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { # https://bugzilla.kernel.org/show_bug.cgi?id=203793 doCheck = false; - disallowedReferences = [ (lib.getDev kerberos) ]; + disallowedReferences = [ (lib.getDev libkrb5) ]; passthru.tests = { nfs3-simple = nixosTests.nfs3.simple; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix index f379633e19..4a6cf887c3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which -, procps, libcap_ng, openssl, python2, iproute , perl +, procps, libcap_ng, openssl, python2, perl , automake, autoconf, libtool, kernel ? null }: with lib; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix index 8abfe5fee9..cb04fa5b42 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, pam, kerberos }: +{ lib, stdenv, fetchurl, pam, libkrb5 }: stdenv.mkDerivation rec { - name = "pam-krb5-4.9"; + name = "pam-krb5-4.10"; src = fetchurl { url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; - sha256 = "0kzz6mjkzw571pkv684vyczhl874f6p7lih3dj7s764gxdxnv4y5"; + sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; }; - buildInputs = [ pam kerberos ]; + buildInputs = [ pam libkrb5 ]; meta = with lib; { homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix index ff3100cbb2..a4da6be691 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl -, yacc, flex +, bison, flex , sysfsutils, kmod, udev , firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards. , configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq) @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; - buildInputs = [udev yacc sysfsutils kmod flex]; + buildInputs = [udev bison sysfsutils kmod flex]; patchPhase = '' sed -i " diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix index e58b97654a..3319239288 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp +, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ - ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; + ${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]}; ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix index 2844badc73..e62716e479 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ply/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }: +{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }: assert kernel != null -> lib.versionAtLeast kernel.version "4.0"; @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { pname = "ply"; inherit version; - nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ]; + nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ]; src = fetchFromGitHub { owner = "iovisor"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix index c477e6f367..03267b8e9a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -15,11 +15,12 @@ , libxslt , upower , systemd +, python3 }: stdenv.mkDerivation rec { pname = "power-profiles-daemon"; - version = "0.1"; + version = "0.8.1"; outputs = [ "out" "devdoc" ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "hadess"; repo = "power-profiles-daemon"; rev = version; - sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w"; + sha256 = "sha256-OnCUr7KWVPpYGDseBUcJD/PdOobvFnyNA97NhnKbTKY="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { systemd upower glib + (python3.withPackages (ps: with ps; [ ps.pygobject3 ])) # for cli tool ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix index 9f12ab6953..1d19d91511 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config +{ lib +, stdenv +, fetchurl +, fetchpatch +, ncurses +, pkg-config -# `ps` with systemd support is able to properly report different -# attributes like unit name, so we want to have it on linux. + # `ps` with systemd support is able to properly report different + # attributes like unit name, so we want to have it on linux. , withSystemd ? stdenv.isLinux -, systemd ? null +, systemd -# procps is mostly Linux-only. Most commands require a running Linux -# system (or very similar like that found in Cygwin). The one -# exception is ‘watch’ which is portable enough to run on pretty much -# any UNIX-compatible system. + # procps is mostly Linux-only. Most commands require a running Linux + # system (or very similar like that found in Cygwin). The one + # exception is ‘watch’ which is portable enough to run on pretty much + # any UNIX-compatible system. , watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }: @@ -35,28 +40,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; makeFlags = [ "usrbin_execdir=$(out)/bin" ] - ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="]; + ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS=" ]; enableParallelBuilding = true; # Too red configureFlags = [ "--disable-modern-top" ] ++ lib.optional withSystemd "--with-systemd" - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" ]; + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; - installPhase = if watchOnly then '' + installPhase = lib.optionalString watchOnly '' install -m 0755 -D watch $out/bin/watch install -m 0644 -D watch.1 $out/share/man/man1/watch.1 - '' else null; + ''; - meta = { + meta = with lib; { homepage = "https://gitlab.com/procps-ng/procps"; description = "Utilities that give information about processes using the /proc filesystem"; priority = 11; # less than coreutils, which also provides "kill" and "uptime" - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.typetetris ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.typetetris ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index ee5ead73bc..b0fd6b354b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation { pname = "raspberrypi-eeprom"; - version = "2020-12-11"; + version = "2021-01-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "54a9796abbee59067bff9da6b90c1014178f2c21"; - sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk"; + rev = "54cadc816ba739afd08ead6d679e647de028a65c"; + sha256 = "0zlacr4z6h40h0g47195xsbss29gaa7kf8r31h372sxsn8srlnjf"; }; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index b76b13c8c0..c37514eaf4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils -, pandoc, ethtool, iproute, libnl, udev, python3, perl +, pandoc, ethtool, iproute2, libnl, udev, python3, perl , makeWrapper } : let - version = "33.1"; + version = "34.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,11 +14,11 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1p97r8ngfx1d9aq8p3f027323m7kgmk30kfrikf3jlkpr30rksbv"; + sha256 = "sha256-2HFtj595sDmWqAewIMwKMaiSDVVWKdQA9l0QsPcw8qA="; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; - buildInputs = [ libnl ethtool iproute udev python3 perl ]; + buildInputs = [ libnl ethtool iproute2 udev python3 perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix index e5b34fa665..cb8a02bcf3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ hhm samuelgrf ]; + maintainers = with maintainers; [ hhm ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix deleted file mode 100644 index 12f87f4095..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: - -with lib; - -let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi"; - -in stdenv.mkDerivation rec { - pname = "rtlwifi_new"; - version = "2019-08-21"; - # When updating see https://github.com/lwfinger/rtl8723be/issues/17#issuecomment-657326751 - - src = fetchFromGitHub { - owner = "rtlwifi-linux"; - repo = "rtlwifi_new"; - # commit does not exist on any branch on the target repository - rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348"; - sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k"; - }; - - hardeningDisable = [ "pic" "format" ]; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; - - enableParallelBuilding = true; - - installPhase = '' - mkdir -p ${modDestDir} - find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; - find ${modDestDir} -name '*.ko' -exec xz -f {} \; - ''; - - meta = { - description = "The newest Realtek rtlwifi codes"; - inherit (src.meta) homepage; - license = lib.licenses.gpl2; - platforms = with platforms; linux; - maintainers = with maintainers; [ tvorog ]; - priority = -1; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix new file mode 100644 index 0000000000..6b5e3211a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +let + modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtw88"; +in +stdenv.mkDerivation { + pname = "rtw88"; + version = "unstable-2021-04-01"; + + src = fetchFromGitHub { + owner = "lwfinger"; + repo = "rtw88"; + rev = "689ce370b0c2da207bb092065697f6cb455a00dc"; + hash = "sha256-gdfQxpzYJ9bEObc2iEapA0TPMZuXndBvEu6qwKqdhyo="; + }; + + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f {} \; + + runHook postInstall + ''; + + meta = with lib; { + description = "The newest Realtek rtlwifi codes"; + homepage = "https://github.com/lwfinger/rtw88"; + license = with licenses; [ bsd3 gpl2Only ]; + maintainers = with maintainers; [ tvorog ]; + platforms = platforms.linux; + broken = kernel.kernelOlder "4.14"; + priority = -1; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index 2973b87210..d768546b12 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, - pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, + pcre, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, ncurses, Po4a, http-parser, jansson, docbook_xsl, docbook_xml_dtd_44, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba nfs-utils doxygen python python3 popt - talloc tdb tevent pkg-config ldb pam openldap pcre kerberos + talloc tdb tevent pkg-config ldb pam openldap pcre libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix index 2d54223edb..2eff999ac7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.3.2"; + name = "sysstat-12.4.3"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "0gaas16q2f7qmrv4sbqk2l2mrc7yr64s33bzw4094p59fkylm7k4"; + sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; }; buildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 7e3c6d1fe5..4f75786289 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -415,6 +415,7 @@ stdenv.mkDerivation { src/shared/generator.c \ src/shutdown/shutdown.c \ units/emergency.service.in \ + units/modprobe@.service \ units/rescue.service.in \ units/systemd-logind.service.in \ units/systemd-nspawn@.service.in; \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index d9767cbdd9..f9198cc8ff 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { CONFIG_P2P=y CONFIG_TDLS=y CONFIG_BGSCAN_SIMPLE=y + CONFIG_BGSCAN_LEARN=y '' + optionalString (pcsclite != null) '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y diff --git a/third_party/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix b/third_party/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix index c51cafa9ac..91dad81f1f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config -, zlib, bzip2, lzma, libgcrypt +, zlib, bzip2, xz, libgcrypt }: with lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = map mkStatic (o.buildInputs or []); propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); }); - in map mkStatic [ zlib bzip2 lzma libgcrypt ]; + in map mkStatic [ zlib bzip2 xz libgcrypt ]; configureFlags = [ "--disable-shared" ]; diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/db-migrations.patch b/third_party/nixpkgs/pkgs/servers/calibre-web/db-migrations.patch new file mode 100644 index 0000000000..87e63f7d95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/db-migrations.patch @@ -0,0 +1,14 @@ +diff --git a/cps/__init__.py b/cps/__init__.py +index 627cca0b..233bb2dd 100644 +--- a/cps/__init__.py ++++ b/cps/__init__.py +@@ -87,6 +87,9 @@ db.CalibreDB.setup_db(config, cli.settingspath) + + calibre_db = db.CalibreDB() + ++if os.environ.get('__RUN_MIGRATIONS_AND_EXIT'): ++ sys.exit(0) ++ + def create_app(): + app.wsgi_app = ReverseProxied(app.wsgi_app) + # For python2 convert path to unicode diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default-logger.patch b/third_party/nixpkgs/pkgs/servers/calibre-web/default-logger.patch new file mode 100644 index 0000000000..c5aecbd3d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default-logger.patch @@ -0,0 +1,17 @@ +diff --git a/cps/logger.py b/cps/logger.py +index b204de31..3206e2bf 100644 +--- a/cps/logger.py ++++ b/cps/logger.py +@@ -32,10 +32,10 @@ ACCESS_FORMATTER_TORNADO = Formatter("[%(asctime)s] %(message)s") + + FORMATTER = Formatter("[%(asctime)s] %(levelname)5s {%(name)s:%(lineno)d} %(message)s") + DEFAULT_LOG_LEVEL = logging.INFO +-DEFAULT_LOG_FILE = os.path.join(_CONFIG_DIR, "calibre-web.log") +-DEFAULT_ACCESS_LOG = os.path.join(_CONFIG_DIR, "access.log") + LOG_TO_STDERR = '/dev/stderr' + LOG_TO_STDOUT = '/dev/stdout' ++DEFAULT_LOG_FILE = LOG_TO_STDOUT ++DEFAULT_ACCESS_LOG = LOG_TO_STDOUT + + logging.addLevelName(logging.WARNING, "WARN") + logging.addLevelName(logging.CRITICAL, "CRIT") diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix new file mode 100644 index 0000000000..f24a1f32f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -0,0 +1,72 @@ +{ lib +, fetchFromGitHub +, nixosTests +, python3 +, python3Packages +}: + +python3.pkgs.buildPythonApplication rec { + pname = "calibre-web"; + version = "0.6.11"; + + src = fetchFromGitHub { + owner = "janeczku"; + repo = "calibre-web"; + rev = version; + sha256 = "10sjllhhcamswpa1wlim4mbm2zl4g804bwly5p4nmklg7n1v226g"; + }; + + prePatch = '' + substituteInPlace setup.cfg \ + --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ + --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" + ''; + + patches = [ + # default-logger.patch switches default logger to /dev/stdout. Otherwise calibre-web tries to open a file relative + # to its location, which can't be done as the store is read-only. Log file location can later be configured using UI + # if needed. + ./default-logger.patch + # DB migrations adds an env var __RUN_MIGRATIONS_ANDEXIT that, when set, instructs calibre-web to run DB migrations + # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters + # are stored in the DB. + ./db-migrations.patch + ]; + + # calibre-web doesn't follow setuptools directory structure. The following is taken from the script + # that calibre-web's maintainer is using to package it: + # https://github.com/OzzieIsaacs/calibre-web-test/blob/master/build/make_release.py + postPatch = '' + mkdir -p src/calibreweb + mv cps.py src/calibreweb/__init__.py + mv cps src/calibreweb + ''; + + # Upstream repo doesn't provide any tests. + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + backports_abc + flask-babel + flask_login + flask_principal + iso-639 + pypdf2 + requests + singledispatch + sqlalchemy + tornado + unidecode + Wand + ]; + + passthru.tests.calibre-web = nixosTests.calibre-web; + + meta = with lib; { + description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database"; + maintainers = with maintainers; [ pborzenkov ]; + homepage = "https://github.com/janeczku/calibre-web"; + license = licenses.gpl3Plus; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index c28a6acf2b..25181590ed 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.4.1"; + version = "20.11.5.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-rJCIV+dQaC6kCenp4fyPUYBztOlleZtNzCaaKkDHafg="; + sha256 = "1anzjv9sdl1a3j6sxsy2q8dy4dax1a4yqc9rnprlzymjkgb8hy75"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 73a8325066..5077ff98ec 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.12"; + version = "9.16.13"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-mRSvkxH9NJyrRBCXiY2U+yjQv9m/btBP4fl/BCZE2n8="; + sha256 = "sha256-pUzHk/pbabNfYQ8glXYPgjjf9c/VJBn37hycIn2kzAg="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index a945198af6..8d89352b90 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "fb6cb2c03f4fffbdd8a0098127383d03b14cf7d6abf3a0cd229fb13ff68ee33e"; + sha256 = "9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix b/third_party/nixpkgs/pkgs/servers/documize-community/default.nix index 5c6b6b1070..036ea5fbee 100644 --- a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix +++ b/third_party/nixpkgs/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "documize-community"; - version = "3.8.2"; + version = "3.9.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "sha256-6DOvInfD32/mEILGXdXUeflmHoyn0eiYyQN/aI23FJ0="; + sha256 = "sha256-Kv4BsFB08rkGRkePFIkjjuhK1TnLPS4m+PUlgKG5cTQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix index 48f0b8b75b..f272990795 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2gtiULRnur8OPjX1/Xp1LTiL8owXt/sQgSGjoS7F9NU="; + sha256 = "sha256-ODD5XwLYVUJOHQCETVUqMUojL4Y8eWJ/xhmfzV9Cp3k="; }; - cargoSha256 = "sha256-MrUmqawXl3kQKFgJ9bWRHIgvit/fQCLMqoL6kXEF9+k="; + cargoSha256 = "sha256-PJOlXFx+MYfq7daaOEZ5wPuWD7gAr8gc/5AJG2SYTq4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix new file mode 100644 index 0000000000..4a8e187561 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mime-types, scdoc }: + +stdenv.mkDerivation rec { + pname = "gmnisrv"; + version = "unstable-2021-03-26"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "gmnisrv"; + rev = "f23ec10a6d66c574bbf718c4b10f2cf91ea8daef"; + sha256 = "1d9rjx0s092yfzjxd2yvzixhqgg883nlnmsysgp21w75n2as354n"; + }; + + MIMEDB = "${mime-types}/etc/mime.types"; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl mime-types scdoc ]; + + meta = with lib; { + description = "A simple Gemini protocol server"; + homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ bsima jb55 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index f41c5556d7..492e7e76f9 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -277,7 +277,7 @@ "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: freebox-api + "freebox" = ps: with ps; [ aiohttp-cors freebox-api netdisco zeroconf ]; "freedns" = ps: with ps; [ ]; "fritz" = ps: with ps; [ fritzconnection ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; @@ -353,7 +353,7 @@ "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG + "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 6260906e0c..7816436e2b 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -176,10 +176,13 @@ in with py.pkgs; buildPythonApplication rec { # services. Before adding new components to this list make sure we have all # its dependencies packaged and listed in ./component-packages.nix. componentTests = [ + "accuweather" + "airly" "alert" "api" "auth" "automation" + "axis" "bayesian" "binary_sensor" "caldav" @@ -200,6 +203,7 @@ in with py.pkgs; buildPythonApplication rec { "device_automation" "device_sun_light_trigger" "device_tracker" + "devolo_home_control" "dhcp" "discovery" "emulated_hue" @@ -213,6 +217,7 @@ in with py.pkgs; buildPythonApplication rec { "flux" "folder" "folder_watcher" + "freebox" "fritzbox" "fritzbox_callmonitor" "frontend" @@ -224,8 +229,10 @@ in with py.pkgs; buildPythonApplication rec { "hddtemp" "history" "history_stats" + "homekit" "homekit_controller" "homeassistant" + "homematic" "html5" "http" "hue" @@ -257,6 +264,7 @@ in with py.pkgs; buildPythonApplication rec { "media_player" "media_source" "met" + "minecraft_server" "mobile_app" "modbus" "moon" @@ -298,7 +306,10 @@ in with py.pkgs; buildPythonApplication rec { "sensor" "smarttub" "smtp" + "smappee" "solaredge" + "sonos" + "spotify" "sql" "ssdp" "stream" @@ -321,6 +332,7 @@ in with py.pkgs; buildPythonApplication rec { "upnp" "uptime" "vacuum" + "verisure" "weather" "webhook" "websocket_api" @@ -384,5 +396,6 @@ in with py.pkgs; buildPythonApplication rec { description = "Open source home automation that puts local control and privacy first"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index 4ed03450af..c79a9fe3fd 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -5,7 +5,7 @@ , fetchurl , fuse , libevent -, lzma +, xz , openssl , pkg-config , systemd @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake doxygen pkg-config ]; - buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib ]; meta = with lib; { description = "A caching proxy specialized for linux distribution files"; diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix index 3a45352815..e6ecbb8686 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix @@ -6,6 +6,7 @@ , go , ninja , python3 +, nixosTests }: let @@ -110,6 +111,11 @@ buildBazelPackage rec { "--cxxopt=-Wno-uninitialized" ]; + passthru.tests = { + # No tests for Envoy itself (yet), but it's tested as a core component of Pomerium. + inherit (nixosTests) pomerium; + }; + meta = with lib; { homepage = "https://envoyproxy.io"; description = "Cloud-native edge and service proxy"; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 0c33ab431d..0409f6a26e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.8"; - sha256 = "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h"; + version = "1.19.9"; + sha256 = "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f"; } diff --git a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix b/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix index a174d4dcb1..6532332396 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,6 +1,6 @@ {lib, stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl -, lighttpd, iproute }: +, lighttpd, iproute2 }: stdenv.mkDerivation rec { version = "2014-06-29-1"; pname = "nix-binary-cache"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ - --replace @iproute@ "${iproute}/sbin" \ + --replace @iproute@ "${iproute2}/sbin" \ --replace "xXxXx" "xXxXx" chmod a+x "$out/bin/nix-binary-cache.cgi" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ - --replace @iproute@ "${iproute}/sbin" \ + --replace @iproute@ "${iproute2}/sbin" \ --replace "xXxXx" "xXxXx" chmod a+x "$out/bin/nix-binary-cache-start" diff --git a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix new file mode 100644 index 0000000000..0605a12eca --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix @@ -0,0 +1,80 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, envoy +, zip +, nixosTests +}: + +let + inherit (lib) concatStringsSep mapAttrsToList; +in +buildGoModule rec { + pname = "pomerium"; + version = "0.13.3"; + src = fetchFromGitHub { + owner = "pomerium"; + repo = "pomerium"; + rev = "v${version}"; + hash = "sha256-g0w1aIHvf2rJANvGWHeUxdnyCDsvy/PQ9Kp8nDdT/0w="; + }; + + vendorSha256 = "sha256-grihU85OcGyf9/KKrv87xZonX5r+Z1oHQTf84Ya61fg="; + subPackages = [ + "cmd/pomerium" + "cmd/pomerium-cli" + ]; + + buildFlagsArray = let + # Set a variety of useful meta variables for stamping the build with. + setVars = { + Version = "v${version}"; + BuildMeta = "nixpkgs"; + ProjectName = "pomerium"; + ProjectURL = "github.com/pomerium/pomerium"; + }; + varFlags = concatStringsSep " " (mapAttrsToList (name: value: "-X github.com/pomerium/pomerium/internal/version.${name}=${value}") setVars); + in [ + "-ldflags=${varFlags}" + ]; + + nativeBuildInputs = [ + zip + ]; + + # Pomerium expects to have envoy append to it in a zip. + # We use a store-only (-0) zip, so that the Nix scanner can find any store references we had in the envoy binary. + postBuild = '' + # Append Envoy + pushd $NIX_BUILD_TOP + mkdir -p envoy + cd envoy + cp ${envoy}/bin/envoy envoy + zip -0 envoy.zip envoy + popd + + mv $GOPATH/bin/pomerium $GOPATH/bin/pomerium.old + cat $GOPATH/bin/pomerium.old $NIX_BUILD_TOP/envoy/envoy.zip >$GOPATH/bin/pomerium + zip --adjust-sfx $GOPATH/bin/pomerium + ''; + + # We also need to set dontStrip to avoid having the envoy ZIP stripped off the end. + dontStrip = true; + + installPhase = '' + install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium + install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli + ''; + + passthru.tests = { + inherit (nixosTests) pomerium; + }; + + meta = with lib; { + homepage = "https://pomerium.io"; + description = "Authenticating reverse proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = [ "x86_64-linux" ]; # Envoy derivation is x86_64-linux only. + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix index d7bd2eca92..01e5c0950d 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "2.3.2"; + version = "2.3.3"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - sha256 = "04xfnbc0qlk8vi6bb8sl38nxnx9naxh550xsgrb4hql6jdi0wv7l"; + sha256 = "0p43qsldwhx4zfwp585x8kps0akrf7b0gxdgf0sh0yqcp7l28gmx"; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/servers/irker/default.nix b/third_party/nixpkgs/pkgs/servers/irker/default.nix index 7bb0900d7d..0aac945ad0 100644 --- a/third_party/nixpkgs/pkgs/servers/irker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, python, pkg-config +{ lib, stdenv, fetchFromGitLab, python3, pkg-config , xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }: stdenv.mkDerivation { @@ -15,12 +15,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ - python + python3 # Needed for proxy support I believe, which I haven't tested. # Probably needs to be propagated and some wrapPython magic # python.pkgs.pysocks ]; + strictDeps = true; + postPatch = '' substituteInPlace Makefile \ --replace '-o 0 -g 0' "" diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index a89d4f2162..12760613a7 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.699"; + version = "0.17.764"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-dftllucRemUdZjYDLKPJ4XJ031OZpsW4bpJDuWPyses="; + sha256 = "sha256-x6yjSshTK/dnEPZ/XACDuVpZi0tI1J8tQHBFFvFhCmg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/kippo/default.nix b/third_party/nixpkgs/pkgs/servers/kippo/default.nix deleted file mode 100644 index a3c6d683a1..0000000000 --- a/third_party/nixpkgs/pkgs/servers/kippo/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -# This is the installation portion of kippo. -# This is somewhat jumbled together. There is no "easy_install" for kippo, -# and there isn't a way to regenerate the twistd plugin cache. -# -# Use the services.kippo options to properly configure if on NixOS. -# On other platforms there is a problem with hardcoded paths. -# Your best bet is to change kippo source to customise -# or manually copy the proper filesystems. -# At a minimum the following are required in /var/lib/kippo: -# honeyfs/ -# fs.pickle -# data/ -# txtcmds/ -# -# There is also benefit in preparing /var/log/kippo -# tty/ -# dl/ -# -# Most of these files need read/write permissions. -# -# Read only files: kippo.tac and kippo.cfg -# -# Execution may look like this: -# twistd -y kippo.tac --syslog --pidfile=kippo.pid -# -# Use this package at your own risk. - -{lib, stdenv, fetchurl, pythonPackages }: - -let - - twisted_13 = pythonPackages.buildPythonPackage rec { - # NOTE: When updating please check if new versions still cause issues - # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) - disabled = pythonPackages.isPy3k; - - name = "Twisted-13.2.0"; - src = fetchurl { - url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; - }; - - propagatedBuildInputs = with pythonPackages; [ zope_interface ]; - - # Generate Twisted's plug-in cache. Twited users must do it as well. See - # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. - postInstall = "$out/bin/twistd --help > /dev/null"; - - meta = with lib; { - homepage = "https://twistedmatrix.com/"; - description = "Twisted, an event-driven networking engine written in Python"; - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; - license = licenses.mit; - }; - }; - -in stdenv.mkDerivation rec { - pname = "kippo"; - version = "0.8"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz"; - sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d"; - }; - buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; - installPhase = '' - substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg" - substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \ - --replace "download_path = dl" "download_path = /var/log/kippo/dl" \ - --replace "contents_path = honeyfs" "filesystem_file = /var/lib/kippo/honeyfs" \ - --replace "filesystem_file = fs.pickle" "filesystem_file = /var/lib/kippo/fs.pickle" \ - --replace "data_path = data" "data_path = /var/lib/kippo/data" \ - --replace "txtcmds_path = txtcmds" "txtcmds_path = /var/lib/kippo/txtcmds" \ - --replace "public_key = public.key" "public_key = /var/lib/kippo/keys/public.key" \ - --replace "private_key = private.key" "private_key = /var/lib/kippo/keys/private.key" - mkdir -p $out/bin - mkdir -p $out/src - mv ./* $out/src - mv $out/src/utils/* $out/bin - ''; - - passthru.twisted = twisted_13; - - meta = with lib; { - homepage = "https://github.com/desaster/kippo"; - description = "SSH Honeypot"; - longDescription = '' - Default port is 2222. Recommend using something like this for port redirection to default SSH port: - networking.firewall.extraCommands = ''' - iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222''' ''; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ tomberek ]; - broken = true; # 2018-09-12, failed on hydra since 2017-12-11 - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix index 90510d5025..db9041574f 100644 --- a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python3 +, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net-snmp kerberos pcre libevent openssl python3 + net-snmp libkrb5 pcre libevent openssl python3 ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix index 9d69b0d73c..8d4692dd0e 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -100,10 +100,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://exim.org/"; + homepage = "https://exim.org/"; description = "A mail transfer agent (MTA)"; license = with licenses; [ gpl2Plus bsd3 ]; platforms = platforms.linux; maintainers = with maintainers; [ tv ajs124 das_j ]; + changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix index 9a86cc31fd..7f1e02fd76 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mailman"; - version = "3.3.1"; + version = "3.3.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0idfiv48jjgc0jq4731094ddhraqq8bxnwmjk6sg5ask0jss9kxq"; + sha256 = "01rx322b8mzcdj9xh4bjwnl0zis6n2wxd31rrij4cw3a2j03xpas"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 00cf2c1e83..054d9dcf91 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -7,6 +7,8 @@ buildPythonPackage rec { pname = "HyperKitty"; + # Note: Mailman core must be on the latest version before upgrading HyperKitty. + # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 version = "1.3.3"; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index fc9f6217d9..189e152fce 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -4,6 +4,8 @@ buildPythonPackage rec { pname = "postorius"; + # Note: Mailman core must be on the latest version before upgrading Postorious. + # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 version = "1.3.4"; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix new file mode 100644 index 0000000000..808e81370b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -0,0 +1,28 @@ +{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, ... }: + +let + + packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); + + ourNodePackages = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +ourNodePackages."${packageName}".override { + nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; + + postInstall = '' + makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \ + --add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js" + ''; + + passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc; + + meta = with lib; { + description = "Node.js IRC bridge for Matrix"; + maintainers = with maintainers; [ piegames ]; + homepage = "https://github.com/matrix-org/matrix-appservice-irc"; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh new file mode 100755 index 0000000000..fc89486cfb --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" + +$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ + --nodejs-12 \ + --node-env ../../../development/node-packages/node-env.nix \ + --development \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix new file mode 100644 index 0000000000..e0d21f7d44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix new file mode 100644 index 0000000000..a20f0593ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix @@ -0,0 +1,5165 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.12.11" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.12.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + }; + }; + "@babel/code-frame-7.12.13" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + }; + }; + "@babel/generator-7.13.9" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz"; + sha512 = "mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw=="; + }; + }; + "@babel/helper-function-name-7.12.13" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; + }; + }; + "@babel/helper-get-function-arity-7.12.13" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; + }; + }; + "@babel/helper-split-export-declaration-7.12.13" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; + }; + }; + "@babel/helper-validator-identifier-7.12.11" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.12.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; + }; + }; + "@babel/highlight-7.13.10" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.13.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz"; + sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; + }; + }; + "@babel/parser-7.13.11" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.13.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz"; + sha512 = "PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q=="; + }; + }; + "@babel/runtime-7.13.10" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.13.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"; + sha512 = "4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw=="; + }; + }; + "@babel/template-7.12.13" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; + }; + }; + "@babel/traverse-7.13.0" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz"; + sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ=="; + }; + }; + "@babel/types-7.13.0" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz"; + sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA=="; + }; + }; + "@dabh/diagnostics-2.0.2" = { + name = "_at_dabh_slash_diagnostics"; + packageName = "@dabh/diagnostics"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + }; + }; + "@eslint/eslintrc-0.4.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + }; + }; + "@nodelib/fs.scandir-2.1.4" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + }; + }; + "@nodelib/fs.stat-2.0.4" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + }; + }; + "@nodelib/fs.walk-1.2.6" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + }; + }; + "@sentry/core-5.30.0" = { + name = "_at_sentry_slash_core"; + packageName = "@sentry/core"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz"; + sha512 = "TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg=="; + }; + }; + "@sentry/hub-5.30.0" = { + name = "_at_sentry_slash_hub"; + packageName = "@sentry/hub"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz"; + sha512 = "2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ=="; + }; + }; + "@sentry/minimal-5.30.0" = { + name = "_at_sentry_slash_minimal"; + packageName = "@sentry/minimal"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz"; + sha512 = "BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw=="; + }; + }; + "@sentry/node-5.30.0" = { + name = "_at_sentry_slash_node"; + packageName = "@sentry/node"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz"; + sha512 = "Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg=="; + }; + }; + "@sentry/tracing-5.30.0" = { + name = "_at_sentry_slash_tracing"; + packageName = "@sentry/tracing"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz"; + sha512 = "dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw=="; + }; + }; + "@sentry/types-5.30.0" = { + name = "_at_sentry_slash_types"; + packageName = "@sentry/types"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz"; + sha512 = "R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw=="; + }; + }; + "@sentry/utils-5.30.0" = { + name = "_at_sentry_slash_utils"; + packageName = "@sentry/utils"; + version = "5.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz"; + sha512 = "zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww=="; + }; + }; + "@types/bluebird-3.5.33" = { + name = "_at_types_slash_bluebird"; + packageName = "@types/bluebird"; + version = "3.5.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.33.tgz"; + sha512 = "ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ=="; + }; + }; + "@types/body-parser-1.19.0" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; + }; + }; + "@types/connect-3.4.34" = { + name = "_at_types_slash_connect"; + packageName = "@types/connect"; + version = "3.4.34"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; + sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; + }; + }; + "@types/express-4.17.11" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + }; + }; + "@types/express-serve-static-core-4.17.19" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; + sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; + }; + }; + "@types/extend-3.0.1" = { + name = "_at_types_slash_extend"; + packageName = "@types/extend"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz"; + sha512 = "R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw=="; + }; + }; + "@types/he-1.1.1" = { + name = "_at_types_slash_he"; + packageName = "@types/he"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/he/-/he-1.1.1.tgz"; + sha512 = "jpzrsR1ns0n3kyWt92QfOUQhIuJGQ9+QGa7M62rO6toe98woQjnsnzjdMtsQXCdvjjmqjS2ZBCC7xKw0cdzU+Q=="; + }; + }; + "@types/json-schema-7.0.7" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + }; + }; + "@types/mime-1.3.2" = { + name = "_at_types_slash_mime"; + packageName = "@types/mime"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; + }; + }; + "@types/nedb-1.8.11" = { + name = "_at_types_slash_nedb"; + packageName = "@types/nedb"; + version = "1.8.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz"; + sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; + }; + }; + "@types/node-14.14.35" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz"; + sha512 = "Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag=="; + }; + }; + "@types/nopt-3.0.29" = { + name = "_at_types_slash_nopt"; + packageName = "@types/nopt"; + version = "3.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/nopt/-/nopt-3.0.29.tgz"; + sha1 = "f19df3db4c97ee1459a2740028320a71d70964ce"; + }; + }; + "@types/pg-7.14.11" = { + name = "_at_types_slash_pg"; + packageName = "@types/pg"; + version = "7.14.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.11.tgz"; + sha512 = "EnZkZ1OMw9DvNfQkn2MTJrwKmhJYDEs5ujWrPfvseWNoI95N8B4HzU/Ltrq5ZfYxDX/Zg8mTzwr6UAyTjjFvXA=="; + }; + }; + "@types/qs-6.9.6" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz"; + sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; + }; + }; + "@types/range-parser-1.2.3" = { + name = "_at_types_slash_range-parser"; + packageName = "@types/range-parser"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + }; + }; + "@types/sanitize-html-1.27.1" = { + name = "_at_types_slash_sanitize-html"; + packageName = "@types/sanitize-html"; + version = "1.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-1.27.1.tgz"; + sha512 = "TW5gfZYplKQYO8003WrxaDgwyJsEG74920S+Ei7zB9mbUFgm7l2NvFAumXzxL+1fOwM2I9A+G/1rgiEebQOxcQ=="; + }; + }; + "@types/serve-static-1.13.9" = { + name = "_at_types_slash_serve-static"; + packageName = "@types/serve-static"; + version = "1.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; + }; + }; + "@typescript-eslint/eslint-plugin-4.18.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz"; + sha512 = "Lzkc/2+7EoH7+NjIWLS2lVuKKqbEmJhtXe3rmfA8cyiKnZm3IfLf51irnBcmow8Q/AptVV0XBZmBJKuUJTe6cQ=="; + }; + }; + "@typescript-eslint/experimental-utils-4.18.0" = { + name = "_at_typescript-eslint_slash_experimental-utils"; + packageName = "@typescript-eslint/experimental-utils"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz"; + sha512 = "92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A=="; + }; + }; + "@typescript-eslint/parser-4.18.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.18.0.tgz"; + sha512 = "W3z5S0ZbecwX3PhJEAnq4mnjK5JJXvXUDBYIYGoweCyWyuvAKfGHvzmpUzgB5L4cRBb+cTu9U/ro66dx7dIimA=="; + }; + }; + "@typescript-eslint/scope-manager-4.18.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz"; + sha512 = "olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ=="; + }; + }; + "@typescript-eslint/types-4.18.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.18.0.tgz"; + sha512 = "/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A=="; + }; + }; + "@typescript-eslint/typescript-estree-4.18.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz"; + sha512 = "wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg=="; + }; + }; + "@typescript-eslint/visitor-keys-4.18.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "4.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz"; + sha512 = "Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-jsx-5.3.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + }; + }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ajv-7.2.1" = { + name = "ajv"; + packageName = "ajv"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz"; + sha512 = "+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ=="; + }; + }; + "another-json-0.2.0" = { + name = "another-json"; + packageName = "another-json"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz"; + sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; + }; + }; + "ansi-colors-4.1.1" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "append-transform-1.0.0" = { + name = "append-transform"; + packageName = "append-transform"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz"; + sha512 = "P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw=="; + }; + }; + "archy-1.0.0" = { + name = "archy"; + packageName = "archy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "astral-regex-2.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "async-3.2.0" = { + name = "async"; + packageName = "async"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.11.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base-x-3.0.8" = { + name = "base-x"; + packageName = "base-x"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz"; + sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; + }; + }; + "basic-auth-2.0.1" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "binary-search-tree-0.2.5" = { + name = "binary-search-tree"; + packageName = "binary-search-tree"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz"; + sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; + }; + }; + "bintrees-1.0.1" = { + name = "bintrees"; + packageName = "bintrees"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"; + sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; + }; + }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "browser-request-0.3.3" = { + name = "browser-request"; + packageName = "browser-request"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + }; + "bs58-4.0.1" = { + name = "bs58"; + packageName = "bs58"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz"; + sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; + }; + }; + "buffer-writer-2.0.0" = { + name = "buffer-writer"; + packageName = "buffer-writer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "caching-transform-3.0.2" = { + name = "caching-transform"; + packageName = "caching-transform"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz"; + sha512 = "Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w=="; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "color-3.0.0" = { + name = "color"; + packageName = "color"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; + sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "color-string-1.5.5" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz"; + sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; + }; + }; + "colors-1.4.0" = { + name = "colors"; + packageName = "colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + }; + "colorspace-1.1.2" = { + name = "colorspace"; + packageName = "colorspace"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; + sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "convert-source-map-1.7.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-0.4.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cp-file-6.2.0" = { + name = "cp-file"; + packageName = "cp-file"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; + sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "default-require-extensions-2.0.0" = { + name = "default-require-extensions"; + packageName = "default-require-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz"; + sha1 = "f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "dom-serializer-1.2.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; + sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; + }; + }; + "domelementtype-2.1.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; + sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; + }; + }; + "domhandler-3.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; + sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; + }; + }; + "domhandler-4.0.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz"; + sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA=="; + }; + }; + "domutils-2.5.0" = { + name = "domutils"; + packageName = "domutils"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-2.5.0.tgz"; + sha512 = "Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "enabled-2.0.0" = { + name = "enabled"; + packageName = "enabled"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es6-error-4.1.1" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "escape-string-regexp-2.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; + }; + }; + "eslint-7.22.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz"; + sha512 = "3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-utils-2.1.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; + "espree-7.3.1" = { + name = "espree"; + packageName = "espree"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.4.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "eventemitter3-4.0.7" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; + }; + }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "extend-2.0.2" = { + name = "extend"; + packageName = "extend"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-2.0.2.tgz"; + sha512 = "AgFD4VU+lVLP6vjnlNfF7OeInLTyeyckCNPEsuxz1vi786UuK/nk6ynPuhn/h+Ju9++TQyr5EpLRI14fc1QtTQ=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-glob-3.2.5" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "fast-safe-stringify-2.0.7" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; + }; + }; + "fastq-1.11.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; + sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + }; + }; + "fecha-4.2.0" = { + name = "fecha"; + packageName = "fecha"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; + }; + }; + "file-entry-cache-6.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; + }; + }; + "file-stream-rotator-0.5.7" = { + name = "file-stream-rotator"; + packageName = "file-stream-rotator"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz"; + sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ=="; + }; + }; + "fill-keys-1.0.2" = { + name = "fill-keys"; + packageName = "fill-keys"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz"; + sha1 = "9a8fa36f4e8ad634e3bf6b4f3c8882551452eb20"; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "find-cache-dir-2.1.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "flat-cache-3.0.4" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + }; + "flatted-3.1.1" = { + name = "flatted"; + packageName = "flatted"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + }; + }; + "fn.name-1.1.0" = { + name = "fn.name"; + packageName = "fn.name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; + }; + }; + "foreground-child-1.5.6" = { + name = "foreground-child"; + packageName = "foreground-child"; + version = "1.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz"; + sha1 = "4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "generate-function-2.3.1" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; + }; + }; + "generate-object-property-1.2.0" = { + name = "generate-object-property"; + packageName = "generate-object-property"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-parent-5.1.2" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + }; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "globals-13.6.0" = { + name = "globals"; + packageName = "globals"; + version = "13.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.6.0.tgz"; + sha512 = "YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ=="; + }; + }; + "globby-11.0.2" = { + name = "globby"; + packageName = "globby"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; + sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + }; + }; + "graceful-fs-4.2.6" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.5" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; + "hasha-3.0.0" = { + name = "hasha"; + packageName = "hasha"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz"; + sha1 = "52a32fab8569d41ca69a61ff1a214f8eb7c8bd39"; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "hosted-git-info-2.8.8" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + }; + }; + "html-escaper-2.0.2" = { + name = "html-escaper"; + packageName = "html-escaper"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"; + sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; + }; + }; + "htmlencode-0.0.4" = { + name = "htmlencode"; + packageName = "htmlencode"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz"; + sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f"; + }; + }; + "htmlparser2-4.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; + }; + }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "https-proxy-agent-5.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + }; + "iconv-2.3.5" = { + name = "iconv"; + packageName = "iconv"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv/-/iconv-2.3.5.tgz"; + sha512 = "U5ajDbtDfadp7pvUMC0F2XbkP5vQn9Xrwa6UptePl+cK8EILxapAt3sXers9B3Gxagk+zVjL2ELKuzQvyqOwug=="; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; + "immediate-3.0.6" = { + name = "immediate"; + packageName = "immediate"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + }; + "import-fresh-3.3.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; + "irc-colors-1.5.0" = { + name = "irc-colors"; + packageName = "irc-colors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irc-colors/-/irc-colors-1.5.0.tgz"; + sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw=="; + }; + }; + "irc-git://github.com/matrix-org/node-irc#9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7" = { + name = "irc"; + packageName = "irc"; + version = "0.3.12"; + src = fetchgit { + url = "git://github.com/matrix-org/node-irc"; + rev = "9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7"; + sha256 = "0785d44389d34d7e7c614437c8c8e108f32b5d5022e6f29c47a6a40090d277a7"; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-arrayish-0.3.2" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; + }; + }; + "is-core-module-2.2.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-my-ip-valid-1.0.0" = { + name = "is-my-ip-valid"; + packageName = "is-my-ip-valid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; + sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; + }; + }; + "is-my-json-valid-2.20.5" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.20.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; + sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-object-1.0.2" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; + sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; + }; + }; + "is-promise-2.2.2" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "istanbul-lib-coverage-2.0.5" = { + name = "istanbul-lib-coverage"; + packageName = "istanbul-lib-coverage"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; + sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="; + }; + }; + "istanbul-lib-hook-2.0.7" = { + name = "istanbul-lib-hook"; + packageName = "istanbul-lib-hook"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz"; + sha512 = "vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA=="; + }; + }; + "istanbul-lib-instrument-3.3.0" = { + name = "istanbul-lib-instrument"; + packageName = "istanbul-lib-instrument"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"; + sha512 = "5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA=="; + }; + }; + "istanbul-lib-report-2.0.8" = { + name = "istanbul-lib-report"; + packageName = "istanbul-lib-report"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz"; + sha512 = "fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ=="; + }; + }; + "istanbul-lib-source-maps-3.0.6" = { + name = "istanbul-lib-source-maps"; + packageName = "istanbul-lib-source-maps"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; + sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw=="; + }; + }; + "istanbul-reports-2.2.7" = { + name = "istanbul-reports"; + packageName = "istanbul-reports"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha512 = "uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg=="; + }; + }; + "jasmine-3.6.4" = { + name = "jasmine"; + packageName = "jasmine"; + version = "3.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jasmine/-/jasmine-3.6.4.tgz"; + sha512 = "hIeOou6y0BgCOKYgXYveQvlY+PTHgDPajFf+vLCYbMTQ+VjAP9+EQv0nuC9+gyCAAWISRFauB1XUb9kFuOKtcQ=="; + }; + }; + "jasmine-core-3.6.0" = { + name = "jasmine-core"; + packageName = "jasmine-core"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz"; + sha512 = "8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.14.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; + }; + }; + "js-yaml-4.0.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonpointer-4.1.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz"; + sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "kuler-2.0.0" = { + name = "kuler"; + packageName = "kuler"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; + }; + }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + }; + "load-json-file-4.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + }; + "localforage-1.9.0" = { + name = "localforage"; + packageName = "localforage"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz"; + sha512 = "rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g=="; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; + "logform-2.2.0" = { + name = "logform"; + packageName = "logform"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; + }; + }; + "loglevel-1.7.1" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; + sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; + }; + }; + "lowdb-1.0.0" = { + name = "lowdb"; + packageName = "lowdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz"; + sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "lru_map-0.3.3" = { + name = "lru_map"; + packageName = "lru_map"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz"; + sha1 = "b5c8351b9464cbd750335a79650a0ec0e56118dd"; + }; + }; + "make-dir-2.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; + }; + }; + "matrix-appservice-0.8.0" = { + name = "matrix-appservice"; + packageName = "matrix-appservice"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.8.0.tgz"; + sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; + }; + }; + "matrix-appservice-bridge-2.6.0" = { + name = "matrix-appservice-bridge"; + packageName = "matrix-appservice-bridge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.0.tgz"; + sha512 = "o1KHQHG1GdfUhTFBXVLztwbTowuCFO9/h8n2zdkRK/bZsdcXSFQVfUwDtRULcyinD4N7r0Lrwlg1LyR0pg2WSw=="; + }; + }; + "matrix-bot-sdk-0.4.0" = { + name = "matrix-bot-sdk"; + packageName = "matrix-bot-sdk"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.4.0.tgz"; + sha512 = "ZIICFEYDsSX3emPnVRTV1FIV22zkt7KiJbTYN4rHQ3Z/rk66RB7Y+TMHxrkJCqPs3xVdaGmGkh5m+hNi4fibRg=="; + }; + }; + "matrix-js-sdk-9.9.0" = { + name = "matrix-js-sdk"; + packageName = "matrix-js-sdk"; + version = "9.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.9.0.tgz"; + sha512 = "rgy9b8D+GzjK3wfdmxDr42fxNV13fK12cvQD1qnsFzqPyJGeg++cazH/+7HxL/uuW/WQR6HAmfc7wo9VQegWtg=="; + }; + }; + "matrix-lastactive-0.1.5" = { + name = "matrix-lastactive"; + packageName = "matrix-lastactive"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-lastactive/-/matrix-lastactive-0.1.5.tgz"; + sha512 = "JFIMJPNGGqi0myzIlN94SQReUbCrWi1TW5PZih1OGXzUj2wXYz3puktV/f64HZYn6D1ZKcwxZdLuNCG8cRuCyw=="; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-db-1.46.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.46.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz"; + sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="; + }; + }; + "mime-types-2.1.29" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.29"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz"; + sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "module-not-found-error-1.0.1" = { + name = "module-not-found-error"; + packageName = "module-not-found-error"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz"; + sha1 = "cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"; + }; + }; + "moment-2.29.1" = { + name = "moment"; + packageName = "moment"; + version = "2.29.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + }; + }; + "morgan-1.10.0" = { + name = "morgan"; + packageName = "morgan"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "nan-2.14.2" = { + name = "nan"; + packageName = "nan"; + version = "2.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; + sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "nedb-1.8.0" = { + name = "nedb"; + packageName = "nedb"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz"; + sha1 = "0e3502cd82c004d5355a43c9e55577bd7bd91d88"; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "nested-error-stacks-2.1.0" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz"; + sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; + }; + }; + "node-gyp-build-4.2.3" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; + sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "nopt-5.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "nyc-14.1.1" = { + name = "nyc"; + packageName = "nyc"; + version = "14.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nyc/-/nyc-14.1.1.tgz"; + sha512 = "OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw=="; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-hash-2.1.1" = { + name = "object-hash"; + packageName = "object-hash"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz"; + sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "one-time-1.0.0" = { + name = "one-time"; + packageName = "one-time"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; + }; + }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-queue-6.6.2" = { + name = "p-queue"; + packageName = "p-queue"; + version = "6.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"; + sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; + }; + }; + "p-timeout-3.2.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "package-hash-3.0.0" = { + name = "package-hash"; + packageName = "package-hash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz"; + sha512 = "lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA=="; + }; + }; + "packet-reader-1.0.0" = { + name = "packet-reader"; + packageName = "packet-reader"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-srcset-1.0.2" = { + name = "parse-srcset"; + packageName = "parse-srcset"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "pg-8.5.1" = { + name = "pg"; + packageName = "pg"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz"; + sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; + }; + }; + "pg-connection-string-2.4.0" = { + name = "pg-connection-string"; + packageName = "pg-connection-string"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; + sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; + }; + }; + "pg-int8-1.0.1" = { + name = "pg-int8"; + packageName = "pg-int8"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; + }; + }; + "pg-pool-3.2.2" = { + name = "pg-pool"; + packageName = "pg-pool"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; + sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; + }; + }; + "pg-protocol-1.4.0" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; + sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; + }; + }; + "pg-types-2.2.0" = { + name = "pg-types"; + packageName = "pg-types"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; + }; + }; + "pgpass-1.0.4" = { + name = "pgpass"; + packageName = "pgpass"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz"; + sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; + }; + }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "postcss-7.0.35" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.35"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; + sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + }; + }; + "postgres-array-2.0.0" = { + name = "postgres-array"; + packageName = "postgres-array"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; + }; + }; + "postgres-bytea-1.0.0" = { + name = "postgres-bytea"; + packageName = "postgres-bytea"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + }; + "postgres-date-1.0.7" = { + name = "postgres-date"; + packageName = "postgres-date"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; + sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; + }; + }; + "postgres-interval-1.2.0" = { + name = "postgres-interval"; + packageName = "postgres-interval"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; + }; + }; + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "prom-client-13.1.0" = { + name = "prom-client"; + packageName = "prom-client"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz"; + sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; + }; + }; + "proxy-addr-2.0.6" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + }; + }; + "proxyquire-1.8.0" = { + name = "proxyquire"; + packageName = "proxyquire"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz"; + sha1 = "02d514a5bed986f04cbb2093af16741535f79edc"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.8.0" = { + name = "psl"; + packageName = "psl"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "qs-6.9.6" = { + name = "qs"; + packageName = "qs"; + version = "6.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + }; + }; + "queue-microtask-1.2.2" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz"; + sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg=="; + }; + }; + "quick-lru-4.0.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; + "read-pkg-up-4.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; + sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "rebuild-0.1.2" = { + name = "rebuild"; + packageName = "rebuild"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rebuild/-/rebuild-0.1.2.tgz"; + sha1 = "03acdea5515130b479092746e093daf8cf883e93"; + }; + }; + "regenerator-runtime-0.13.7" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.7"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; + }; + }; + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; + "release-zalgo-1.0.0" = { + name = "release-zalgo"; + packageName = "release-zalgo"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz"; + sha1 = "09700b7e5074329739330e535c5a90fb67851730"; + }; + }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "request-promise-4.2.6" = { + name = "request-promise"; + packageName = "request-promise"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz"; + sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ=="; + }; + }; + "request-promise-core-1.1.4" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; + }; + }; + "request-promise-native-1.0.9" = { + name = "request-promise-native"; + packageName = "request-promise-native"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "resolve-1.20.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "run-parallel-1.2.0" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sanitize-html-1.27.5" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz"; + sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.3.4" = { + name = "semver"; + packageName = "semver"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "signal-exit-3.0.3" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; + "slice-ansi-4.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "spawn-wrap-1.4.3" = { + name = "spawn-wrap"; + packageName = "spawn-wrap"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz"; + sha512 = "IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw=="; + }; + }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.7" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + }; + }; + "split2-3.2.2" = { + name = "split2"; + packageName = "split2"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "stack-trace-0.0.10" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; + "steno-0.4.4" = { + name = "steno"; + packageName = "steno"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; + sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string-width-4.2.2" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "string_decoder-1.3.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-json-comments-3.1.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "table-6.0.7" = { + name = "table"; + packageName = "table"; + version = "6.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; + sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; + }; + }; + "tdigest-0.1.1" = { + name = "tdigest"; + packageName = "tdigest"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz"; + sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021"; + }; + }; + "test-exclude-5.2.3" = { + name = "test-exclude"; + packageName = "test-exclude"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz"; + sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g=="; + }; + }; + "text-hex-1.0.0" = { + name = "text-hex"; + packageName = "text-hex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "triple-beam-1.3.0" = { + name = "triple-beam"; + packageName = "triple-beam"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; + }; + }; + "tslib-1.14.1" = { + name = "tslib"; + packageName = "tslib"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + }; + "tsutils-3.21.0" = { + name = "tsutils"; + packageName = "tsutils"; + version = "3.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; + sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "typescript-4.2.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz"; + sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; + }; + }; + "underscore-1.4.4" = { + name = "underscore"; + packageName = "underscore"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + }; + "unhomoglyph-1.0.6" = { + name = "unhomoglyph"; + packageName = "unhomoglyph"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.6.tgz"; + sha512 = "7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "uri-js-4.4.1" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + }; + "utf-8-validate-5.0.4" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.4.tgz"; + sha512 = "MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "v8-compile-cache-2.3.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "winston-3.3.3" = { + name = "winston"; + packageName = "winston"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; + sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + }; + }; + "winston-daily-rotate-file-4.5.1" = { + name = "winston-daily-rotate-file"; + packageName = "winston-daily-rotate-file"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.1.tgz"; + sha512 = "Uv1KeBneTKFZ9R3J6SmI61vOoPEofxS+GZGEwYRPc7QFE1fpEz648eGWxLnOeo8CBrANwsd+GfK5DCd4Ab1xAQ=="; + }; + }; + "winston-transport-4.4.0" = { + name = "winston-transport"; + packageName = "winston-transport"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-file-atomic-2.4.3" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; + sha512 = "GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-4.0.1" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yargs-13.3.2" = { + name = "yargs"; + packageName = "yargs"; + version = "13.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; + }; + }; + "yargs-parser-13.1.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; + }; + }; + }; +in +{ + "matrix-appservice-irc-git+https://github.com/matrix-org/matrix-appservice-irc.git#0.25.0" = nodeEnv.buildNodePackage { + name = "matrix-appservice-irc"; + packageName = "matrix-appservice-irc"; + version = "0.25.0"; + src = fetchgit { + url = "https://github.com/matrix-org/matrix-appservice-irc.git"; + rev = "a23f71633f63fd42c6ecf74d8e6111e710ec9533"; + sha256 = "aac686d18b823c1bf0ff13343b5bc43866c8ce2b15efa9547a0d2ee4ecb4da42"; + }; + dependencies = [ + sources."@babel/code-frame-7.12.11" + (sources."@babel/generator-7.13.9" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" + sources."@babel/helper-validator-identifier-7.12.11" + (sources."@babel/highlight-7.13.10" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@babel/parser-7.13.11" + sources."@babel/runtime-7.13.10" + (sources."@babel/template-7.12.13" // { + dependencies = [ + sources."@babel/code-frame-7.12.13" + ]; + }) + (sources."@babel/traverse-7.13.0" // { + dependencies = [ + sources."@babel/code-frame-7.12.13" + sources."globals-11.12.0" + ]; + }) + sources."@babel/types-7.13.0" + sources."@dabh/diagnostics-2.0.2" + (sources."@eslint/eslintrc-0.4.0" // { + dependencies = [ + sources."globals-12.4.0" + sources."ignore-4.0.6" + ]; + }) + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + sources."@sentry/core-5.30.0" + sources."@sentry/hub-5.30.0" + sources."@sentry/minimal-5.30.0" + sources."@sentry/node-5.30.0" + sources."@sentry/tracing-5.30.0" + sources."@sentry/types-5.30.0" + sources."@sentry/utils-5.30.0" + sources."@types/bluebird-3.5.33" + sources."@types/body-parser-1.19.0" + sources."@types/connect-3.4.34" + sources."@types/express-4.17.11" + sources."@types/express-serve-static-core-4.17.19" + sources."@types/extend-3.0.1" + sources."@types/he-1.1.1" + sources."@types/json-schema-7.0.7" + sources."@types/mime-1.3.2" + sources."@types/nedb-1.8.11" + sources."@types/node-14.14.35" + sources."@types/nopt-3.0.29" + sources."@types/pg-7.14.11" + sources."@types/qs-6.9.6" + sources."@types/range-parser-1.2.3" + sources."@types/sanitize-html-1.27.1" + sources."@types/serve-static-1.13.9" + sources."@typescript-eslint/eslint-plugin-4.18.0" + sources."@typescript-eslint/experimental-utils-4.18.0" + sources."@typescript-eslint/parser-4.18.0" + sources."@typescript-eslint/scope-manager-4.18.0" + sources."@typescript-eslint/types-4.18.0" + sources."@typescript-eslint/typescript-estree-4.18.0" + sources."@typescript-eslint/visitor-keys-4.18.0" + sources."abbrev-1.1.1" + sources."accepts-1.3.7" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.1" + sources."agent-base-6.0.2" + sources."ajv-6.12.6" + sources."another-json-0.2.0" + sources."ansi-colors-4.1.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."append-transform-1.0.0" + sources."archy-1.0.0" + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."astral-regex-2.0.0" + sources."async-0.2.10" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."balanced-match-1.0.0" + sources."base-x-3.0.8" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."binary-search-tree-0.2.5" + sources."bintrees-1.0.1" + sources."bluebird-3.7.2" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browser-request-0.3.3" + sources."bs58-4.0.1" + sources."buffer-writer-2.0.0" + sources."bytes-3.1.0" + sources."caching-transform-3.0.2" + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."caseless-0.12.0" + sources."chalk-4.1.0" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + (sources."color-3.0.0" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."color-string-1.5.5" + sources."colors-1.4.0" + sources."colorspace-1.1.2" + sources."combined-stream-1.0.8" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.7.0" + sources."cookie-0.4.1" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + (sources."cp-file-6.2.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + sources."cross-spawn-7.0.3" + sources."dashdash-1.14.1" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."default-require-extensions-2.0.0" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dir-glob-3.0.1" + sources."doctrine-3.0.0" + (sources."dom-serializer-1.2.0" // { + dependencies = [ + sources."domhandler-4.0.0" + ]; + }) + sources."domelementtype-2.1.0" + sources."domhandler-3.3.0" + (sources."domutils-2.5.0" // { + dependencies = [ + sources."domhandler-4.0.0" + ]; + }) + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."enabled-2.0.0" + sources."encodeurl-1.0.2" + sources."enquirer-2.3.6" + sources."entities-2.2.0" + (sources."error-ex-1.3.2" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + sources."es6-error-4.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-2.0.0" + (sources."eslint-7.22.0" // { + dependencies = [ + sources."ignore-4.0.6" + ]; + }) + sources."eslint-scope-5.1.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."eventemitter3-4.0.7" + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."extend-2.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.5" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fast-safe-stringify-2.0.7" + sources."fastq-1.11.0" + sources."fecha-4.2.0" + sources."file-entry-cache-6.0.1" + sources."file-stream-rotator-0.5.7" + sources."fill-keys-1.0.2" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flat-cache-3.0.4" + sources."flatted-3.1.1" + sources."fn.name-1.1.0" + (sources."foreground-child-1.5.6" // { + dependencies = [ + sources."cross-spawn-4.0.2" + sources."lru-cache-4.1.5" + sources."which-1.3.1" + sources."yallist-2.1.2" + ]; + }) + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."get-caller-file-2.0.5" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.2" + sources."glob-to-regexp-0.4.1" + (sources."globals-13.6.0" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.0.2" + sources."graceful-fs-4.2.6" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."hash.js-1.1.7" + (sources."hasha-3.0.0" // { + dependencies = [ + sources."is-stream-1.1.0" + ]; + }) + sources."he-1.2.0" + sources."hosted-git-info-2.8.8" + sources."html-escaper-2.0.2" + sources."htmlencode-0.0.4" + sources."htmlparser2-4.1.0" + sources."http-errors-1.7.2" + sources."http-signature-1.2.0" + sources."https-proxy-agent-5.0.0" + sources."iconv-2.3.5" + sources."iconv-lite-0.4.24" + sources."ignore-5.1.8" + sources."immediate-3.0.6" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.1" + sources."irc-git://github.com/matrix-org/node-irc#9028c2197c216dd8e6fc2cb3cc07ce2d6bf741a7" + sources."irc-colors-1.5.0" + sources."is-arrayish-0.3.2" + sources."is-core-module-2.2.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.20.5" + sources."is-number-7.0.0" + sources."is-object-1.0.2" + sources."is-promise-2.2.2" + sources."is-property-1.0.2" + sources."is-stream-2.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."istanbul-lib-coverage-2.0.5" + sources."istanbul-lib-hook-2.0.7" + (sources."istanbul-lib-instrument-3.3.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."istanbul-lib-report-2.0.8" // { + dependencies = [ + sources."has-flag-3.0.0" + sources."supports-color-6.1.0" + ]; + }) + (sources."istanbul-lib-source-maps-3.0.6" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."istanbul-reports-2.2.7" + sources."jasmine-3.6.4" + sources."jasmine-core-3.6.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonpointer-4.1.0" + sources."jsprim-1.4.1" + sources."kuler-2.0.0" + sources."levn-0.4.1" + sources."lie-3.1.1" + sources."load-json-file-4.0.0" + sources."localforage-1.9.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + sources."lodash.flattendeep-4.4.0" + sources."logform-2.2.0" + sources."loglevel-1.7.1" + sources."lowdb-1.0.0" + sources."lru-cache-5.1.1" + sources."lru_map-0.3.3" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."pify-4.0.1" + sources."semver-5.7.1" + ]; + }) + sources."matrix-appservice-0.8.0" + (sources."matrix-appservice-bridge-2.6.0" // { + dependencies = [ + sources."argparse-2.0.1" + sources."extend-3.0.2" + sources."js-yaml-4.0.0" + sources."nopt-5.0.0" + ]; + }) + (sources."matrix-bot-sdk-0.4.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + (sources."matrix-js-sdk-9.9.0" // { + dependencies = [ + sources."qs-6.9.6" + ]; + }) + sources."matrix-lastactive-0.1.5" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merge-source-map-1.1.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + sources."mime-1.6.0" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" + sources."minimalistic-assert-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."module-not-found-error-1.0.1" + sources."moment-2.29.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."depd-2.0.0" + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.2" + sources."nan-2.14.2" + sources."natural-compare-1.4.0" + sources."nedb-1.8.0" + sources."negotiator-0.6.2" + sources."nested-error-stacks-2.1.0" + sources."node-gyp-build-4.2.3" + sources."nopt-3.0.6" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."nyc-14.1.1" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."oauth-sign-0.9.0" + sources."object-hash-2.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."one-time-1.0.0" + sources."optimist-0.3.7" + sources."optionator-0.9.1" + sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-queue-6.6.2" + sources."p-timeout-3.2.0" + sources."p-try-2.2.0" + sources."package-hash-3.0.0" + sources."packet-reader-1.0.0" + sources."parent-module-1.0.1" + sources."parse-json-4.0.0" + sources."parse-srcset-1.0.2" + sources."parseurl-1.3.3" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.6" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."performance-now-2.1.0" + sources."pg-8.5.1" + sources."pg-connection-string-2.4.0" + sources."pg-int8-1.0.1" + sources."pg-pool-3.2.2" + sources."pg-protocol-1.4.0" + sources."pg-types-2.2.0" + sources."pgpass-1.0.4" + sources."picomatch-2.2.2" + sources."pify-3.0.0" + sources."pkg-dir-3.0.0" + (sources."postcss-7.0.35" // { + dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-6.1.0" + ]; + }) + sources."postgres-array-2.0.0" + sources."postgres-bytea-1.0.0" + sources."postgres-date-1.0.7" + sources."postgres-interval-1.2.0" + sources."prelude-ls-1.2.1" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."prom-client-13.1.0" + sources."proxy-addr-2.0.6" + (sources."proxyquire-1.8.0" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."queue-microtask-1.2.2" + sources."quick-lru-4.0.1" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + (sources."read-pkg-3.0.0" // { + dependencies = [ + sources."path-type-3.0.0" + ]; + }) + sources."read-pkg-up-4.0.0" + sources."readable-stream-3.6.0" + sources."rebuild-0.1.2" + sources."regenerator-runtime-0.13.7" + sources."regexpp-3.1.0" + sources."release-zalgo-1.0.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."extend-3.0.2" + sources."qs-6.5.2" + ]; + }) + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" + sources."request-promise-native-1.0.9" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-2.0.0" + sources."resolve-1.20.0" + sources."resolve-from-4.0.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sanitize-html-1.27.5" + (sources."semver-7.3.4" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + sources."simple-swizzle-0.2.2" + sources."slash-3.0.0" + sources."slice-ansi-4.0.0" + sources."source-map-0.6.1" + (sources."spawn-wrap-1.4.3" // { + dependencies = [ + sources."rimraf-2.7.1" + sources."which-1.3.1" + ]; + }) + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.7" + sources."split2-3.2.2" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" + sources."statuses-1.5.0" + sources."stealthy-require-1.1.1" + sources."steno-0.4.4" + sources."string-width-4.2.2" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-bom-3.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.2.1" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."tdigest-0.1.1" + sources."test-exclude-5.2.3" + sources."text-hex-1.0.0" + sources."text-table-0.2.0" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + sources."triple-beam-1.3.0" + sources."tslib-1.14.1" + sources."tsutils-3.21.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.8.1" + sources."type-is-1.6.18" + sources."typescript-4.2.3" + sources."underscore-1.4.4" + sources."unhomoglyph-1.0.6" + sources."unpipe-1.0.0" + sources."uri-js-4.4.1" + sources."utf-8-validate-5.0.4" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."which-2.0.2" + sources."which-module-2.0.0" + (sources."winston-3.3.3" // { + dependencies = [ + sources."async-3.2.0" + ]; + }) + sources."winston-daily-rotate-file-4.5.1" + (sources."winston-transport-4.4.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."word-wrap-1.2.3" + sources."wordwrap-0.0.3" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" + sources."xtend-4.0.2" + sources."y18n-4.0.1" + sources."yallist-3.1.1" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An IRC Bridge for Matrix"; + license = "Apache-2.0"; + }; + production = false; + bypassCache = true; + reconstructLock = true; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json new file mode 100644 index 0000000000..19d29cd044 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json @@ -0,0 +1,3 @@ +[ + {"matrix-appservice-irc": "git+https://github.com/matrix-org/matrix-appservice-irc.git#0.25.0" } +] diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 9d3b484a57..62a7324615 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -1,11 +1,10 @@ { pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }: - let src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-slack"; - rev = "1.4.0"; - sha256 = "1xm75rgg7yrz40y2w1njiwfwz17a8wwlvr7a6zyxvkl8cqrgzp6d"; + rev = "1.7.0"; + sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg="; }; nodePackages = import ./node-composition.nix { @@ -25,7 +24,7 @@ nodePackages.package.override { meta = with lib; { description = "A Matrix <--> Slack bridge"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ beardhatcode ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index a6a359876a..6e622bdd75 100755 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -# Download package.json and package-lock.json from the v1.4.0 release -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package.json -o package.json -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package-lock.json -o package-lock.json +# Download package.json and package-lock.json from the v1.7.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json node2nix \ --nodejs-12 \ diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index 0b989d159c..90e9d67f9d 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -4,67 +4,121 @@ let sources = { - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/helper-validator-identifier-7.9.0" = { + "@babel/helper-validator-identifier-7.12.11" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.0"; + version = "7.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; - sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.10.4" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; + sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@slack/logger-1.1.0" = { + "@babel/runtime-7.12.13" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; + sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; + }; + }; + "@dabh/diagnostics-2.0.2" = { + name = "_at_dabh_slash_diagnostics"; + packageName = "@dabh/diagnostics"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + }; + }; + "@eslint/eslintrc-0.2.2" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz"; + sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ=="; + }; + }; + "@nodelib/fs.scandir-2.1.4" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + }; + }; + "@nodelib/fs.stat-2.0.4" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + }; + }; + "@nodelib/fs.walk-1.2.6" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + }; + }; + "@slack/logger-2.0.0" = { name = "_at_slack_slash_logger"; packageName = "@slack/logger"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/logger/-/logger-1.1.0.tgz"; - sha512 = "D3tabyLoUrsFy0w3koxaCVv+5ZJfIy+j0QW3PUq0XO3UiVuF5rtpAbqngAYVpeKnxPpqBjeth4XJ3tllKoW3aA=="; + url = "https://registry.npmjs.org/@slack/logger/-/logger-2.0.0.tgz"; + sha512 = "OkIJpiU2fz6HOJujhlhfIGrc8hB4ibqtf7nnbJQDerG0BqwZCfmgtK5sWzZ0TkXVRBKD5MpLrTmCYyMxoMCgPw=="; }; }; - "@slack/rtm-api-5.0.3" = { + "@slack/rtm-api-5.0.5" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz"; - sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.5.tgz"; + sha512 = "x2B4hyoxjg62cxf4M5QRomx+xYp2XoajPKdd24SM2Sl4m+IrzwKzmcrysQuYmF6BMsm3IoTKymW5BBGckHGTIw=="; }; }; - "@slack/types-1.5.0" = { + "@slack/types-1.10.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.5.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; - sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.10.0.tgz"; + sha512 = "tA7GG7Tj479vojfV3AoxbckalA48aK6giGjNtgH6ihpLwTyHE3fIgRrvt8TWfLwW8X8dyu7vgmAsGLRG7hWWOg=="; }; }; - "@slack/web-api-5.8.0" = { + "@slack/web-api-5.15.0" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz"; - sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ=="; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.15.0.tgz"; + sha512 = "tjQ8Zqv/Fmj9SOL9yIEd7IpTiKfKHi9DKAkfRVeotoX0clMr3SqQtBqO+KZMX27gm7dmgJsQaDKlILyzdCO+IA=="; }; }; "@types/body-parser-1.19.0" = { @@ -76,58 +130,40 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/caseless-0.12.2" = { - name = "_at_types_slash_caseless"; - packageName = "@types/caseless"; - version = "0.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; - sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; - }; - }; - "@types/chai-4.2.11" = { + "@types/chai-4.2.14" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.2.11"; + version = "4.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz"; - sha512 = "t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz"; + sha512 = "G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ=="; }; }; - "@types/connect-3.4.33" = { + "@types/connect-3.4.34" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.33"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; - sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; + sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@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.3" = { + "@types/express-4.17.10" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.10.tgz"; + sha512 = "GRwKdE+iV6mA8glCvQ7W5iaoIhd6u1HDsNTF76UPRi7T89SLjOfeCLShVmQSgpXzcpf3zgcz2SbMiCcjnYRRxQ=="; }; }; - "@types/express-serve-static-core-4.17.3" = { + "@types/express-serve-static-core-4.17.18" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.3"; + version = "4.17.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.3.tgz"; - sha512 = "sHEsvEzjqN+zLbqP+8OXTipc10yH1QLR+hnr5uw29gi9AhCAAAdri8ClNV7iMdrJrIzXIQtlkPvq8tJGhj3QJQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; + sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; }; }; "@types/is-stream-1.1.0" = { @@ -139,40 +175,49 @@ let sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/mime-2.0.1" = { + "@types/json-schema-7.0.6" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + }; + }; + "@types/mime-2.0.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; - sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; + sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; }; }; - "@types/mocha-7.0.2" = { + "@types/mocha-8.2.0" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "7.0.2"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; - sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz"; + sha512 = "/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ=="; }; }; - "@types/nedb-1.8.9" = { + "@types/nedb-1.8.11" = { name = "_at_types_slash_nedb"; packageName = "@types/nedb"; - version = "1.8.9"; + version = "1.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.9.tgz"; - sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; + url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz"; + sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-13.9.3" = { + "@types/node-14.14.20" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.9.3"; + version = "14.14.20"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; - sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; + sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; }; }; "@types/node-emoji-1.8.1" = { @@ -202,6 +247,15 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; + "@types/qs-6.9.5" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; + sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + }; + }; "@types/randomstring-1.1.6" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; @@ -220,24 +274,6 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/request-2.48.4" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.48.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz"; - sha512 = "W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw=="; - }; - }; - "@types/request-promise-native-1.0.17" = { - name = "_at_types_slash_request-promise-native"; - packageName = "@types/request-promise-native"; - version = "1.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.17.tgz"; - sha512 = "05/d0WbmuwjtGMYEdHIBZ0tqMJJQ2AD9LG2F6rKNBGX1SSFR27XveajH//2N/XYtual8T9Axwl+4v7oBtPUZqg=="; - }; - }; "@types/retry-0.12.0" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; @@ -247,58 +283,130 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/serve-static-1.13.3" = { + "@types/serve-static-1.13.8" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.3"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; + sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; }; }; - "@types/tough-cookie-2.3.6" = { - name = "_at_types_slash_tough-cookie"; - packageName = "@types/tough-cookie"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; - sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="; - }; - }; - "@types/uuid-7.0.2" = { + "@types/uuid-8.3.0" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "7.0.2"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.2.tgz"; - sha512 = "8Ly3zIPTnT0/8RCU6Kg/G3uTICf9sRwYOpUzSIM3503tLIKcnJPRuinHhXngJUy2MntrEf6dlpOHXJju90Qh5w=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz"; + sha512 = "eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ=="; }; }; - "@types/ws-5.1.2" = { + "@types/ws-7.2.6" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "5.1.2"; + version = "7.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz"; - sha512 = "NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz"; + sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/yargs-13.0.0" = { + "@types/yargs-15.0.12" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "13.0.0"; + version = "15.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.0.tgz"; - sha512 = "hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz"; + sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw=="; }; }; - "@types/yargs-parser-13.0.0" = { + "@types/yargs-parser-15.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "13.0.0"; + version = "15.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz"; - sha512 = "wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; + }; + }; + "@typescript-eslint/eslint-plugin-4.13.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz"; + sha512 = "ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w=="; + }; + }; + "@typescript-eslint/eslint-plugin-tslint-4.13.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin-tslint"; + packageName = "@typescript-eslint/eslint-plugin-tslint"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.13.0.tgz"; + sha512 = "r6n4irL74bOx4z2f0WxnwG6MY67EESvjvK/VMoIlDelW3Q6cwunCH8ug3l8hkPtgJ7iObmUjpAWKxyF4ZdvEcw=="; + }; + }; + "@typescript-eslint/experimental-utils-4.13.0" = { + name = "_at_typescript-eslint_slash_experimental-utils"; + packageName = "@typescript-eslint/experimental-utils"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz"; + sha512 = "/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw=="; + }; + }; + "@typescript-eslint/parser-4.13.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.13.0.tgz"; + sha512 = "KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg=="; + }; + }; + "@typescript-eslint/scope-manager-4.13.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz"; + sha512 = "UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ=="; + }; + }; + "@typescript-eslint/types-4.13.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.13.0.tgz"; + sha512 = "/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ=="; + }; + }; + "@typescript-eslint/typescript-estree-4.13.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz"; + sha512 = "9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg=="; + }; + }; + "@typescript-eslint/visitor-keys-4.13.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "4.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz"; + sha512 = "6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g=="; + }; + }; + "@ungap/promise-all-settled-1.1.2" = { + name = "_at_ungap_slash_promise-all-settled"; + packageName = "@ungap/promise-all-settled"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; "Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { @@ -338,13 +446,40 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.10.2" = { + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "acorn-jsx-5.3.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + }; + }; + "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; - version = "6.10.2"; + version = "6.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; - sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ajv-7.0.3" = { + name = "ajv"; + packageName = "ajv"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz"; + sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ=="; }; }; "another-json-0.2.0" = { @@ -356,13 +491,13 @@ let sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; }; }; - "ansi-colors-3.2.3" = { + "ansi-colors-4.1.1" = { name = "ansi-colors"; packageName = "ansi-colors"; - version = "3.2.3"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; "ansi-regex-3.0.0" = { @@ -383,6 +518,15 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; "ansi-styles-3.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -392,6 +536,15 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; "anymatch-3.1.1" = { name = "anymatch"; packageName = "anymatch"; @@ -419,6 +572,15 @@ let sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -428,6 +590,15 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; "array-uniq-1.0.2" = { name = "array-uniq"; packageName = "array-uniq"; @@ -455,13 +626,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-options-0.6.2" = { + "assert-options-0.7.0" = { name = "assert-options"; packageName = "assert-options"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; - sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz"; + sha512 = "7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ=="; }; }; "assert-plus-1.0.0" = { @@ -482,6 +653,15 @@ let sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; }; }; + "astral-regex-2.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + }; "async-0.2.10" = { name = "async"; packageName = "async"; @@ -491,13 +671,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "async-2.6.2" = { + "async-3.2.0" = { name = "async"; packageName = "async"; - version = "2.6.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; - sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; "async-limiter-1.0.1" = { @@ -527,31 +707,22 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.0" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; - sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.19.2" = { + "axios-0.21.1" = { name = "axios"; packageName = "axios"; - version = "0.19.2"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; - }; - }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; + sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; }; "balanced-match-1.0.0" = { @@ -590,13 +761,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "binary-extensions-2.0.0" = { + "binary-extensions-2.1.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; }; }; "binary-search-tree-0.2.5" = { @@ -617,24 +788,6 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; - }; - }; - "bluebird-3.5.5" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; - sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; - }; - }; "body-parser-1.19.0" = { name = "body-parser"; packageName = "body-parser"; @@ -707,15 +860,6 @@ let sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; "bytes-3.1.0" = { name = "bytes"; packageName = "bytes"; @@ -725,6 +869,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; "camelcase-5.3.1" = { name = "camelcase"; packageName = "camelcase"; @@ -734,6 +887,15 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; + "camelcase-6.2.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -761,6 +923,15 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -770,13 +941,22 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "chokidar-3.3.0" = { + "chokidar-3.4.1" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz"; + sha512 = "TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g=="; + }; + }; + "chokidar-3.4.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; }; }; "cliui-5.0.0" = { @@ -788,6 +968,15 @@ let sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; + "cliui-7.0.4" = { + name = "cliui"; + packageName = "cliui"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + }; "color-3.0.0" = { name = "color"; packageName = "color"; @@ -806,6 +995,15 @@ let sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; "color-name-1.1.3" = { name = "color-name"; packageName = "color-name"; @@ -815,6 +1013,15 @@ let sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; "color-string-1.5.3" = { name = "color-string"; packageName = "color-string"; @@ -824,15 +1031,6 @@ let sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; - "colornames-1.1.1" = { - name = "colornames"; - packageName = "colornames"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; - }; - }; "colors-1.3.3" = { name = "colors"; packageName = "colors"; @@ -860,22 +1058,22 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "commander-2.20.3" = { + "commander-5.1.0" = { name = "commander"; packageName = "commander"; - version = "2.20.3"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-3.0.2" = { - name = "commander"; - packageName = "commander"; - version = "3.0.2"; + "comment-parser-0.7.6" = { + name = "comment-parser"; + packageName = "comment-parser"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; + url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz"; + sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg=="; }; }; "concat-map-0.0.1" = { @@ -923,15 +1121,6 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-2.6.11" = { - name = "core-js"; - packageName = "core-js"; - version = "2.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -941,22 +1130,22 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cross-spawn-6.0.5" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.5"; + "create-require-1.1.1" = { + name = "create-require"; + packageName = "create-require"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; + sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; "dashdash-1.14.1" = { @@ -977,22 +1166,22 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.1.0" = { + "debug-4.2.0" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; - "debug-3.2.6" = { + "debug-4.3.1" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; "decamelize-1.2.0" = { @@ -1004,6 +1193,15 @@ let sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; + "decamelize-4.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"; + sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -1013,13 +1211,13 @@ let sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; - "define-properties-1.1.3" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.3"; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; "delayed-stream-1.0.0" = { @@ -1040,6 +1238,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1049,24 +1256,6 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; - }; - }; - "diff-3.5.0" = { - name = "diff"; - packageName = "diff"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; - }; - }; "diff-4.0.2" = { name = "diff"; packageName = "diff"; @@ -1076,6 +1265,24 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -1103,13 +1310,22 @@ let sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; - "enabled-1.0.2" = { + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; "encodeurl-1.0.2" = { @@ -1121,40 +1337,22 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "end-of-stream-1.4.1" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.1"; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; }; - "env-variable-0.0.5" = { - name = "env-variable"; - packageName = "env-variable"; - version = "0.0.5"; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz"; - sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA=="; - }; - }; - "es-abstract-1.17.5" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.17.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; "escape-html-1.0.3" = { @@ -1175,13 +1373,85 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escape-string-regexp-2.0.0" = { + "escape-string-regexp-4.0.0" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; + "eslint-7.17.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; + sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + }; + }; + "eslint-plugin-jsdoc-30.7.13" = { + name = "eslint-plugin-jsdoc"; + packageName = "eslint-plugin-jsdoc"; + version = "30.7.13"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz"; + sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; + }; + }; + "eslint-plugin-prefer-arrow-1.2.2" = { + name = "eslint-plugin-prefer-arrow"; + packageName = "eslint-plugin-prefer-arrow"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz"; + sha512 = "C8YMhL+r8RMeMdYAw/rQtE6xNdMulj+zGWud/qIGnlmomiPRaLDGLMeskZ3alN6uMBojmooRimtdrXebLN4svQ=="; + }; + }; + "eslint-scope-5.1.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + }; + "eslint-utils-2.1.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; + "espree-7.3.1" = { + name = "espree"; + packageName = "espree"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; "esprima-4.0.1" = { @@ -1193,6 +1463,51 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; + "esquery-1.3.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; + sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + }; + }; + "esrecurse-4.3.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -1211,22 +1526,13 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.0" = { + "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.0"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="; - }; - }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; "express-4.17.1" = { @@ -1256,22 +1562,40 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-2.0.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "2.0.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-json-stable-stringify-2.0.0" = { + "fast-glob-3.2.4" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; + sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; "fast-safe-stringify-2.0.6" = { @@ -1283,22 +1607,40 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; - "fecha-2.3.3" = { - name = "fecha"; - packageName = "fecha"; - version = "2.3.3"; + "fastq-1.10.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; - sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz"; + sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA=="; }; }; - "file-stream-rotator-0.4.1" = { + "fecha-4.2.0" = { + name = "fecha"; + packageName = "fecha"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; + }; + }; + "file-entry-cache-6.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; + sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; + }; + }; + "file-stream-rotator-0.5.7" = { name = "file-stream-rotator"; packageName = "file-stream-rotator"; - version = "0.4.1"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.4.1.tgz"; - sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; + url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz"; + sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ=="; }; }; "fill-range-7.0.1" = { @@ -1328,6 +1670,15 @@ let sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; + "find-up-5.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; + }; + }; "finity-0.5.4" = { name = "finity"; packageName = "finity"; @@ -1337,22 +1688,49 @@ let sha512 = "3l+5/1tuw616Lgb0QBimxfdd2TqaDGpfCBpfX6EqtFmqUV3FtQnVEX4Aa62DagYEqnsTIjZcTfbq9msDbXYgyA=="; }; }; - "flat-4.1.0" = { + "flat-5.0.2" = { name = "flat"; packageName = "flat"; - version = "4.1.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; - "follow-redirects-1.5.10" = { + "flat-cache-3.0.4" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + }; + "flatted-3.1.0" = { + name = "flatted"; + packageName = "flatted"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; + sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + }; + }; + "fn.name-1.1.0" = { + name = "fn.name"; + packageName = "fn.name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; + }; + }; + "follow-redirects-1.13.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.10"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"; + sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="; }; }; "forever-agent-0.6.1" = { @@ -1409,22 +1787,22 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.1.2" = { + "fsevents-2.1.3" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; "generate-function-2.3.1" = { @@ -1463,15 +1841,6 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-stream-4.1.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1481,13 +1850,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.3" = { + "glob-7.1.6" = { name = "glob"; packageName = "glob"; - version = "7.1.3"; + version = "7.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "glob-parent-5.1.1" = { @@ -1499,6 +1868,24 @@ let sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "globby-11.0.2" = { + name = "globby"; + packageName = "globby"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; + sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + }; + }; "growl-1.10.5" = { name = "growl"; packageName = "growl"; @@ -1517,22 +1904,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; - }; - }; - "has-1.0.3" = { - name = "has"; - packageName = "has"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "has-flag-3.0.0" = { @@ -1544,13 +1922,13 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; - "has-symbols-1.0.1" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.1"; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; 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-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; "he-1.2.0" = { @@ -1589,6 +1967,24 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; "immediate-3.0.6" = { name = "immediate"; packageName = "immediate"; @@ -1598,6 +1994,24 @@ let sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; }; }; + "import-fresh-3.3.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1616,22 +2030,13 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; - "invert-kv-2.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; - sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; - }; - }; - "ipaddr.js-1.9.0" = { + "ipaddr.js-1.9.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "is-arrayish-0.3.2" = { @@ -1652,33 +2057,6 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-buffer-2.0.4" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; - }; - }; - "is-callable-1.1.5" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; - }; - }; - "is-date-object-1.0.2" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; - }; - }; "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; @@ -1697,6 +2075,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; "is-glob-4.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -1715,13 +2102,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.20.0" = { + "is-my-json-valid-2.20.5" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.20.0"; + version = "2.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; - sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; + sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; }; }; "is-number-7.0.0" = { @@ -1733,6 +2120,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-plain-obj-2.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -1742,15 +2138,6 @@ let sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; - "is-regex-1.0.5" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; - }; - }; "is-stream-1.1.0" = { name = "is-stream"; packageName = "is-stream"; @@ -1760,13 +2147,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-symbol-1.0.3" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.3"; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; "is-typedarray-1.0.0" = { @@ -1814,13 +2201,22 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { + "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + }; + }; + "js-yaml-4.0.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; }; }; "jsbn-0.1.1" = { @@ -1832,6 +2228,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsdoctypeparser-9.0.0" = { + name = "jsdoctypeparser"; + packageName = "jsdoctypeparser"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; + sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw=="; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -1850,6 +2255,24 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "json-schema-traverse-1.0.0" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -1859,13 +2282,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "jsonpointer-4.0.1" = { + "jsonpointer-4.1.0" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz"; + sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; }; "jsprim-1.4.1" = { @@ -1877,22 +2300,22 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "kuler-1.0.1" = { + "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; - sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; - }; - }; - "lcid-2.0.0" = { - name = "lcid"; - packageName = "lcid"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; - sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; "lie-3.1.1" = { @@ -1922,13 +2345,22 @@ let sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; - "lodash-4.17.15" = { + "locate-path-6.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + }; + "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; - version = "4.17.15"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; "lodash.toarray-4.4.0" = { @@ -1940,40 +2372,40 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "log-symbols-3.0.0" = { + "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; + sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; }; }; - "logform-1.10.0" = { + "logform-2.2.0" = { name = "logform"; packageName = "logform"; - version = "1.10.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz"; - sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "logform-2.1.2" = { - name = "logform"; - packageName = "logform"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; - sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; - }; - }; - "loglevel-1.6.8" = { + "loglevel-1.7.1" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.8"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; - sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; + sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; "make-error-1.3.6" = { @@ -1985,40 +2417,31 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "map-age-cleaner-0.1.3" = { - name = "map-age-cleaner"; - packageName = "map-age-cleaner"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; - }; - }; - "matrix-appservice-0.4.1" = { + "matrix-appservice-0.7.1" = { name = "matrix-appservice"; packageName = "matrix-appservice"; - version = "0.4.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.1.tgz"; - sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; + url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.7.1.tgz"; + sha512 = "oUjEz+eKfBw66FnQ3/D7PWcq+/oq9gzJVlNOMQUSGXgK70o8JT3toeFMYsJChaIimU5fIsHbTVyHC+eVGb7MSQ=="; }; }; - "matrix-appservice-bridge-1.12.2" = { + "matrix-appservice-bridge-2.5.0" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "1.12.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; - sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.5.0.tgz"; + sha512 = "L5Ddb78pqqfO6xM4SYM+Hv6N5VjmLF3D24h4g5ze5+xRfEFmfvmLdVu6rvIExawvk9i+LA0fZ95Qi3hc7SkgAQ=="; }; }; - "matrix-js-sdk-2.4.6" = { + "matrix-js-sdk-9.6.0" = { name = "matrix-js-sdk"; packageName = "matrix-js-sdk"; - version = "2.4.6"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz"; - sha512 = "ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg=="; + url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.6.0.tgz"; + sha512 = "zoNqB7z0C0QDncN7yD1K50c4C88VPofWaCQ0gNXqO/Ac1dr/xLF/46iNF9Y+dBwq7siBO9wEh20WFHMaRpeLOg=="; }; }; "media-typer-0.3.0" = { @@ -2030,15 +2453,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mem-4.3.0" = { - name = "mem"; - packageName = "mem"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; - sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -2048,6 +2462,15 @@ let sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; "methods-1.1.2" = { name = "methods"; packageName = "methods"; @@ -2057,6 +2480,15 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -2084,15 +2516,6 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; - "mimic-fn-2.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -2111,15 +2534,6 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -2129,13 +2543,13 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-7.1.1" = { + "mocha-8.2.1" = { name = "mocha"; packageName = "mocha"; - version = "7.1.1"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; - sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; + sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; }; }; "moment-2.24.0" = { @@ -2147,13 +2561,13 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2183,6 +2597,24 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "nanoid-3.1.12" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; + sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; "nedb-1.8.0" = { name = "nedb"; packageName = "nedb"; @@ -2201,15 +2633,6 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - }; "node-emoji-1.10.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -2219,22 +2642,13 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; - "node-environment-flags-1.0.6" = { - name = "node-environment-flags"; - packageName = "node-environment-flags"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; - }; - }; - "nopt-3.0.6" = { + "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; - version = "3.0.6"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; - sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; "normalize-path-3.0.0" = { @@ -2246,22 +2660,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - }; - "nunjucks-3.2.1" = { + "nunjucks-3.2.2" = { name = "nunjucks"; packageName = "nunjucks"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.1.tgz"; - sha512 = "LYlVuC1ZNSalQQkLNNPvcgPt2M9FTY9bs39mTCuFXtqh7jWbYzhDlmz2M6onPiXEhdZo+b9anRhc+uBGuJZ2bQ=="; + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.2.tgz"; + sha512 = "KUi85OoF2NMygwODAy28Lh9qHmq5hO3rBlbkYoC8v377h4l8Pt5qFjILl0LWpMbOrZ18CzfVVUvIHUIrtED3sA=="; }; }; "oauth-sign-0.9.0" = { @@ -2273,49 +2678,13 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-hash-1.3.1" = { + "object-hash-2.0.3" = { name = "object-hash"; packageName = "object-hash"; - version = "1.3.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz"; - sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; - }; - }; - "object-inspect-1.7.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object.assign-4.1.0" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; - }; - }; - "object.getownpropertydescriptors-2.1.0" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz"; + sha512 = "JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg=="; }; }; "on-finished-2.3.0" = { @@ -2345,22 +2714,22 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "one-time-0.0.4" = { + "one-time-1.0.0" = { name = "one-time"; packageName = "one-time"; - version = "0.0.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; - "os-locale-3.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.1.0"; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; - sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; }; "p-cancelable-1.1.0" = { @@ -2372,15 +2741,6 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; - "p-defer-1.0.0" = { - name = "p-defer"; - packageName = "p-defer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -2390,22 +2750,22 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-is-promise-2.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; - }; - }; - "p-limit-2.2.0" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; - sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; "p-locate-3.0.0" = { @@ -2417,6 +2777,15 @@ let sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; + "p-locate-5.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + }; "p-queue-2.4.2" = { name = "p-queue"; packageName = "p-queue"; @@ -2426,13 +2795,13 @@ let sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.6.2" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"; + sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; }; }; "p-retry-4.2.0" = { @@ -2471,6 +2840,15 @@ let sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -2489,6 +2867,15 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -2498,22 +2885,13 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-key-2.0.1" = { + "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; - version = "2.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - }; - "path-parse-1.0.6" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; "path-to-regexp-0.1.7" = { @@ -2525,6 +2903,15 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; "pathval-1.1.0" = { name = "pathval"; packageName = "pathval"; @@ -2543,22 +2930,22 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.1.0" = { + "pg-8.5.1" = { name = "pg"; packageName = "pg"; - version = "8.1.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.1.0.tgz"; - sha512 = "Jp+XSNTGYDztc2FgIbmBXeeYMR7kKjfgnl3R+ioO6rkcxDmaea+YPp/gaxe13PBnJAFYyEGl0ixpwPm2gb6eUw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz"; + sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; }; }; - "pg-connection-string-2.2.2" = { + "pg-connection-string-2.4.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.2.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.2.tgz"; - sha512 = "+hel4DGuSZCjCZwglAuyi+XlodHnKmrbyTw0hVWlmGN2o4AfJDkDo5obAFzblS5M5PFBMx0uDt5Y1QjlNC+tqg=="; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; + sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; }; }; "pg-int8-1.0.1" = { @@ -2570,40 +2957,40 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.6.0" = { + "pg-minify-1.6.2" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.0.tgz"; - sha512 = "5Yxduh9Hul9Xev6uI3rSCypPk1kI7vI03ZPu5lgerrhiZ7QLj1Zd92SU2ZyalHVztlWnnPMnTZ+SeXJwh3eY9g=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz"; + sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.2.0" = { + "pg-pool-3.2.2" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.0.tgz"; - sha512 = "7BLwDNDEfPFjE9vmZLcJPLFwuDAVGZ5lIZo2MeQfwYG7EPGfdNVis/dz6obI/yKqvQIx2sf6QBKXMLB+y/ftgA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; + sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; }; }; - "pg-promise-10.5.5" = { + "pg-promise-10.8.7" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.5.5"; + version = "10.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.5.tgz"; - sha512 = "Ec2g5bN3uMD0wk65kNEgJbZOcyhQ0S37Gn9gAa78U9V7HcdTfMdpTRSRIFT0LHXpL1EcT00CW62+2Z4wAXs29A=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.7.tgz"; + sha512 = "gSbH+NYWD4pVOpacP9uS2xH84N7nb7K4ubKlcZchhDr8ixnIURPnNJmNLJcRgtOocpjzsKymYSm6rCFZVOngSA=="; }; }; - "pg-protocol-1.2.3" = { + "pg-protocol-1.4.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.2.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.3.tgz"; - sha512 = "erHFURS0mPmTbq18cn/zNL3Y4IzNCrU4sgCim0qy7zAPe3Vc0rvK5cImJR6lDvIaz3fJU2R1R9FNOlnUtyF10Q=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; + sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; }; }; "pg-types-2.2.0" = { @@ -2615,13 +3002,13 @@ let sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; }; }; - "pgpass-1.0.2" = { + "pgpass-1.0.4" = { name = "pgpass"; packageName = "pgpass"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz"; - sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz"; + sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; "picomatch-2.2.2" = { @@ -2651,13 +3038,13 @@ let sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; }; }; - "postgres-date-1.0.5" = { + "postgres-date-1.0.7" = { name = "postgres-date"; packageName = "postgres-date"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; - sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; + sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; }; }; "postgres-interval-1.2.0" = { @@ -2669,6 +3056,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; "process-nextick-args-2.0.1" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -2678,49 +3074,40 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "prom-client-11.5.3" = { + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "prom-client-13.1.0" = { name = "prom-client"; packageName = "prom-client"; - version = "11.5.3"; + version = "13.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz"; - sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; + url = "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz"; + sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; }; }; - "proxy-addr-2.0.5" = { + "proxy-addr-2.0.6" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; - "psl-1.1.33" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.1.33"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.33.tgz"; - sha512 = "LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2750,13 +3137,31 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-5.0.0" = { + "qs-6.9.6" = { + name = "qs"; + packageName = "qs"; + version = "6.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + }; + }; + "quick-lru-5.1.1" = { name = "quick-lru"; packageName = "quick-lru"; - version = "5.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.0.0.tgz"; - sha512 = "iNjBLSxM3byM7z8a1MB/Oa+AAeopX4NqKEj/ykgKRi1R4AFXNINR4DSjyjDzXzjqjN9+OBQGfK5w5CAnCtV7jg=="; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomstring-1.1.5" = { @@ -2795,58 +3200,76 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.4.0" = { + "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.4.0"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; - sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "readdirp-3.2.0" = { + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; - "regenerator-runtime-0.11.1" = { + "readdirp-3.5.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + }; + "regenerator-runtime-0.13.7" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.11.1"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; }; - "request-2.88.0" = { + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; + "regextras-0.7.1" = { + name = "regextras"; + packageName = "regextras"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz"; + sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w=="; + }; + }; + "request-2.88.2" = { name = "request"; packageName = "request"; - version = "2.88.0"; + version = "2.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; - }; - }; - "request-promise-core-1.1.3" = { - name = "request-promise-core"; - packageName = "request-promise-core"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; - }; - }; - "request-promise-native-1.0.8" = { - name = "request-promise-native"; - packageName = "request-promise-native"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "require-directory-2.1.1" = { @@ -2858,6 +3281,15 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; + "require-from-string-2.0.2" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + }; "require-main-filename-2.0.0" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -2867,13 +3299,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.15.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.15.1"; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; }; "retry-0.12.0" = { @@ -2885,6 +3317,33 @@ let sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "run-parallel-1.1.10" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -2894,6 +3353,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -2903,22 +3371,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "semver-4.3.2" = { + "semver-7.3.4" = { name = "semver"; packageName = "semver"; - version = "4.3.2"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; - sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; - }; - }; - "semver-5.7.0" = { - name = "semver"; - packageName = "semver"; - version = "5.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; - sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; }; }; "send-0.17.1" = { @@ -2930,6 +3389,15 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; "serve-static-1.14.1" = { name = "serve-static"; packageName = "serve-static"; @@ -2957,31 +3425,22 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "shebang-command-1.2.0" = { + "shebang-command-2.0.0" = { name = "shebang-command"; packageName = "shebang-command"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; - "shebang-regex-1.0.0" = { + "shebang-regex-3.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; - version = "1.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; "simple-swizzle-0.2.2" = { @@ -2993,6 +3452,24 @@ let sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; }; }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; + "slice-ansi-4.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + }; "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; @@ -3002,31 +3479,58 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "spex-3.0.1" = { - name = "spex"; - packageName = "spex"; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; - sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "split-1.0.1" = { - name = "split"; - packageName = "split"; - version = "1.0.1"; + "spdx-license-ids-3.0.7" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + }; + }; + "spex-3.2.0" = { + name = "spex"; + packageName = "spex"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz"; + sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; + }; + }; + "split2-3.2.2" = { + name = "split2"; + packageName = "split2"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; "sprintf-js-1.0.3" = { @@ -3065,15 +3569,6 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "stealthy-require-1.1.1" = { - name = "stealthy-require"; - packageName = "stealthy-require"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; - }; - }; "string-width-2.1.1" = { name = "string-width"; packageName = "string-width"; @@ -3092,22 +3587,13 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.1"; + "string-width-4.2.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; - }; - }; - "string.prototype.trimright-2.1.1" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; "string_decoder-1.1.1" = { @@ -3119,13 +3605,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.2.0" = { + "string_decoder-1.3.0" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; - sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; "strip-ansi-4.0.0" = { @@ -3146,22 +3632,22 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; - "strip-json-comments-2.0.1" = { + "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "2.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; "supports-color-5.5.0" = { @@ -3173,13 +3659,22 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.0.0" = { + "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "6.0.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; - sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "table-6.0.7" = { + name = "table"; + packageName = "table"; + version = "6.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; + sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; }; }; "tdigest-0.1.1" = { @@ -3200,13 +3695,13 @@ let sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; "to-regex-range-5.0.1" = { @@ -3227,13 +3722,13 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; - "tough-cookie-2.4.3" = { + "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "triple-beam-1.3.0" = { @@ -3245,40 +3740,31 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.8.1" = { + "ts-node-9.1.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.8.1"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz"; - sha512 = "10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz"; + sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; }; }; - "tslib-1.11.1" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslint-6.1.0" = { - name = "tslint"; - packageName = "tslint"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-6.1.0.tgz"; - sha512 = "fXjYd/61vU6da04E505OZQGb2VCN2Mq3doeWcOIryuG+eqdmFUXTYVwdhnbEu2k46LNLgUYt9bI5icQze/j0bQ=="; - }; - }; - "tsutils-2.29.0" = { + "tsutils-3.19.1" = { name = "tsutils"; packageName = "tsutils"; - version = "2.29.0"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz"; - sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.19.1.tgz"; + sha512 = "GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw=="; }; }; "tunnel-agent-0.6.0" = { @@ -3299,6 +3785,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; "type-detect-4.0.8" = { name = "type-detect"; packageName = "type-detect"; @@ -3308,6 +3803,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -3317,13 +3821,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-3.8.3" = { + "typescript-4.1.3" = { name = "typescript"; packageName = "typescript"; - version = "3.8.3"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; - sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; + sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; }; }; "underscore-1.4.4" = { @@ -3335,13 +3839,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "unhomoglyph-1.0.5" = { + "unhomoglyph-1.0.6" = { name = "unhomoglyph"; packageName = "unhomoglyph"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.5.tgz"; - sha512 = "rNAw2rGogjq4BVhsCX8K6qXrCcHmUaMCHETlUG0ujGZ3OHwnzJHwdMyzy3n/c9Y7lvlbckOd9nkW33grUVE3bg=="; + url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.6.tgz"; + sha512 = "7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg=="; }; }; "unpipe-1.0.0" = { @@ -3353,13 +3857,13 @@ let sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "util-deprecate-1.0.2" = { @@ -3389,13 +3893,22 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.2" = { + "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; - version = "7.0.2"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz"; - sha512 = "vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + }; + "v8-compile-cache-2.2.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; }; }; "vary-1.1.2" = { @@ -3416,13 +3929,13 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "which-1.3.1" = { + "which-2.0.2" = { name = "which"; packageName = "which"; - version = "1.3.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; "which-module-2.0.0" = { @@ -3443,31 +3956,22 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-3.2.1" = { + "winston-3.3.3" = { name = "winston"; packageName = "winston"; - version = "3.2.1"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; - sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; + sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-compat-0.1.4" = { - name = "winston-compat"; - packageName = "winston-compat"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.4.tgz"; - sha512 = "mMEfFsSm6GmkFF+f4/0UJtG4N1vSaczGmXLVJYmS/+u2zUaIPcw2ZRuwUg2TvVBjswgiraN+vNnAG8z4fRUZ4w=="; - }; - }; - "winston-daily-rotate-file-3.9.0" = { + "winston-daily-rotate-file-4.5.0" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; - version = "3.9.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.9.0.tgz"; - sha512 = "KicvoaLQapqjSDSCIUKik0dDb90vFkqx1/udUiAt6iOqAtBl2qBCrpSDNy3xp7WnT6xHCKAWEEp2XILtiN+zpQ=="; + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.0.tgz"; + sha512 = "/HqeWiU48dzGqcrABRlxYWVMdL6l3uKCtFSJyrqK+E2rLnSFNsgYpvwx15EgTitBLNzH69lQd/+z2ASryV2aqw=="; }; }; "winston-transport-4.3.0" = { @@ -3479,6 +3983,33 @@ let sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; }; }; + "winston-transport-4.4.0" = { + name = "winston-transport"; + packageName = "winston-transport"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "workerpool-6.0.2" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; + sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; + }; + }; "wrap-ansi-5.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -3488,6 +4019,15 @@ let sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -3506,31 +4046,40 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "xtend-4.0.1" = { + "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.0" = { + "y18n-4.0.1" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; }; }; - "yargs-13.2.4" = { - name = "yargs"; - packageName = "yargs"; - version = "13.2.4"; + "y18n-5.0.5" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz"; - sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"; + sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; "yargs-13.3.2" = { @@ -3542,13 +4091,13 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; + "yargs-16.2.0" = { + name = "yargs"; + packageName = "yargs"; + version = "16.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; "yargs-parser-13.1.2" = { @@ -3560,13 +4109,22 @@ let sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-unparser-1.6.0" = { + "yargs-parser-20.2.4" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; + }; + }; + "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; "yn-3.1.1" = { @@ -3578,93 +4136,137 @@ let sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; }; args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.4.0"; + version = "1.7.0"; src = ./.; dependencies = [ - sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/highlight-7.9.0" - sources."@slack/logger-1.1.0" - (sources."@slack/rtm-api-5.0.3" // { + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + (sources."@babel/highlight-7.10.4" // { + dependencies = [ + sources."chalk-2.4.2" + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."@babel/runtime-7.12.13" + sources."@dabh/diagnostics-2.0.2" + (sources."@eslint/eslintrc-0.2.2" // { + dependencies = [ + sources."debug-4.3.1" + sources."ignore-4.0.6" + sources."ms-2.1.2" + ]; + }) + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + sources."@slack/logger-2.0.0" + (sources."@slack/rtm-api-5.0.5" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.5.0" - (sources."@slack/web-api-5.8.0" // { + sources."@slack/types-1.10.0" + (sources."@slack/web-api-5.15.0" // { dependencies = [ - sources."form-data-2.5.1" - sources."p-queue-2.4.2" + sources."axios-0.21.1" ]; }) sources."@types/body-parser-1.19.0" - sources."@types/caseless-0.12.2" - sources."@types/chai-4.2.11" - sources."@types/connect-3.4.33" - sources."@types/events-3.0.0" - sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.3" + sources."@types/chai-4.2.14" + sources."@types/connect-3.4.34" + sources."@types/express-4.17.10" + sources."@types/express-serve-static-core-4.17.18" sources."@types/is-stream-1.1.0" - sources."@types/mime-2.0.1" - sources."@types/mocha-7.0.2" - sources."@types/nedb-1.8.9" - sources."@types/node-13.9.3" + sources."@types/json-schema-7.0.6" + sources."@types/mime-2.0.3" + sources."@types/mocha-8.2.0" + sources."@types/nedb-1.8.11" + sources."@types/node-14.14.20" sources."@types/node-emoji-1.8.1" sources."@types/nunjucks-3.1.3" sources."@types/p-queue-2.3.2" + sources."@types/qs-6.9.5" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" - (sources."@types/request-2.48.4" // { + sources."@types/retry-0.12.0" + sources."@types/serve-static-1.13.8" + sources."@types/uuid-8.3.0" + sources."@types/ws-7.2.6" + sources."@types/yargs-15.0.12" + sources."@types/yargs-parser-15.0.0" + (sources."@typescript-eslint/eslint-plugin-4.13.0" // { dependencies = [ - sources."form-data-2.5.1" + sources."debug-4.3.1" + sources."ms-2.1.2" ]; }) - sources."@types/request-promise-native-1.0.17" - sources."@types/retry-0.12.0" - sources."@types/serve-static-1.13.3" - sources."@types/tough-cookie-2.3.6" - sources."@types/uuid-7.0.2" - sources."@types/ws-5.1.2" - sources."@types/yargs-13.0.0" - sources."@types/yargs-parser-13.0.0" + sources."@typescript-eslint/eslint-plugin-tslint-4.13.0" + sources."@typescript-eslint/experimental-utils-4.13.0" + (sources."@typescript-eslint/parser-4.13.0" // { + dependencies = [ + sources."debug-4.3.1" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/scope-manager-4.13.0" + sources."@typescript-eslint/types-4.13.0" + (sources."@typescript-eslint/typescript-estree-4.13.0" // { + dependencies = [ + sources."debug-4.3.1" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/visitor-keys-4.13.0" + sources."@ungap/promise-all-settled-1.1.2" sources."Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.10.2" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.6" sources."another-json-0.2.0" - sources."ansi-colors-3.2.3" - sources."ansi-regex-4.1.0" + sources."ansi-colors-4.1.1" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" + sources."array-union-2.1.0" sources."array-uniq-1.0.2" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."assert-options-0.6.2" + sources."assert-options-0.7.0" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" + sources."astral-regex-2.0.0" sources."async-0.2.10" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.0" - sources."axios-0.19.2" - sources."babel-runtime-6.26.0" + sources."aws4-1.11.0" + sources."axios-0.21.1" sources."balanced-match-1.0.0" sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" - sources."bluebird-2.11.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -3673,387 +4275,484 @@ let sources."bs58-4.0.1" sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" - sources."builtin-modules-1.1.1" sources."bytes-3.1.0" + sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chai-4.2.0" - (sources."chalk-2.4.2" // { + (sources."chalk-4.1.0" // { dependencies = [ - sources."escape-string-regexp-1.0.5" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."check-error-1.0.2" - sources."chokidar-3.3.0" - sources."cliui-5.0.0" + sources."chokidar-3.4.1" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."colornames-1.1.1" sources."colors-1.3.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."comment-parser-0.7.6" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" - sources."cycle-1.0.3" + sources."create-require-1.1.1" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-eql-3.0.1" - sources."define-properties-1.1.3" + sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diagnostics-1.1.1" - sources."diff-3.5.0" + sources."diff-4.0.2" + sources."dir-glob-3.0.1" + sources."doctrine-3.0.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."emoji-regex-7.0.3" - sources."enabled-1.0.2" + sources."emoji-regex-8.0.0" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.1" - sources."env-variable-0.0.5" - sources."es-abstract-1.17.5" - sources."es-to-primitive-1.2.1" + sources."enquirer-2.3.6" + sources."escalade-3.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-2.0.0" + sources."escape-string-regexp-4.0.0" + (sources."eslint-7.17.0" // { + dependencies = [ + sources."debug-4.3.1" + sources."ignore-4.0.6" + sources."ms-2.1.2" + ]; + }) + (sources."eslint-plugin-jsdoc-30.7.13" // { + dependencies = [ + sources."debug-4.3.1" + sources."ms-2.1.2" + ]; + }) + sources."eslint-plugin-prefer-arrow-1.2.2" + sources."eslint-scope-5.1.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" + (sources."esquery-1.3.1" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" - sources."execa-1.0.0" sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.6" - sources."fecha-2.3.3" - sources."file-stream-rotator-0.4.1" + sources."fastq-1.10.0" + sources."file-entry-cache-6.0.0" + sources."file-stream-rotator-0.5.7" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-up-3.0.0" + sources."find-up-5.0.0" sources."finity-0.5.4" - sources."flat-4.1.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."flat-5.0.2" + sources."flat-cache-3.0.4" + sources."flatted-3.1.0" + sources."fn.name-1.1.0" + sources."follow-redirects-1.13.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-2.5.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" - sources."function-bind-1.1.1" + sources."fsevents-2.1.3" + sources."functional-red-black-tree-1.0.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" - sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.6" sources."glob-parent-5.1.1" + sources."globals-12.4.0" + sources."globby-11.0.2" sources."growl-1.10.5" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-1.0.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" sources."he-1.2.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" + sources."ignore-5.1.8" sources."immediate-3.0.6" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."invert-kv-2.0.0" - sources."ipaddr.js-1.9.0" + sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.1.5" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" + sources."is-my-json-valid-2.20.5" sources."is-number-7.0.0" + sources."is-plain-obj-2.1.0" sources."is-property-1.0.2" - sources."is-regex-1.0.5" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" + sources."jsdoctypeparser-9.0.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonpointer-4.0.1" + sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" - sources."kuler-1.0.1" - sources."lcid-2.0.0" + sources."kuler-2.0.0" + sources."levn-0.4.1" sources."lie-3.1.1" sources."localforage-1.7.3" - sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."locate-path-6.0.0" + sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" - sources."log-symbols-3.0.0" - (sources."logform-2.1.2" // { + sources."log-symbols-4.0.0" + (sources."logform-2.2.0" // { dependencies = [ + sources."fecha-4.2.0" sources."ms-2.1.2" ]; }) - sources."loglevel-1.6.8" + sources."loglevel-1.7.1" + sources."lru-cache-6.0.0" sources."make-error-1.3.6" - sources."map-age-cleaner-0.1.3" - sources."matrix-appservice-0.4.1" - sources."matrix-appservice-bridge-1.12.2" - (sources."matrix-js-sdk-2.4.6" // { + sources."matrix-appservice-0.7.1" + (sources."matrix-appservice-bridge-2.5.0" // { dependencies = [ - sources."bluebird-3.5.5" + sources."argparse-2.0.1" + sources."js-yaml-4.0.0" + ]; + }) + (sources."matrix-js-sdk-9.6.0" // { + dependencies = [ + sources."qs-6.9.6" ]; }) sources."media-typer-0.3.0" - sources."mem-4.3.0" sources."merge-descriptors-1.0.1" + sources."merge2-1.4.1" sources."methods-1.1.2" + sources."micromatch-4.0.2" sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-7.1.1" // { + (sources."mocha-8.2.1" // { dependencies = [ - sources."debug-3.2.6" - sources."escape-string-regexp-1.0.5" - sources."minimist-1.2.5" - sources."mkdirp-0.5.3" - sources."ms-2.1.1" - sources."supports-color-6.0.0" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + sources."ansi-regex-4.1.0" + sources."chokidar-3.4.3" + sources."debug-4.2.0" + sources."emoji-regex-7.0.3" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" + sources."ms-2.1.2" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."readdirp-3.5.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."supports-color-7.2.0" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."find-up-3.0.0" + ]; + }) ]; }) sources."moment-2.24.0" - sources."morgan-1.9.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."ms-2.0.0" + sources."nanoid-3.1.12" + sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" - sources."nice-try-1.0.5" sources."node-emoji-1.10.0" - sources."node-environment-flags-1.0.6" - sources."nopt-3.0.6" + sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - (sources."nunjucks-3.2.1" // { + (sources."nunjucks-3.2.2" // { dependencies = [ - sources."commander-3.0.2" + sources."commander-5.1.0" ]; }) sources."oauth-sign-0.9.0" - sources."object-hash-1.3.1" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" + sources."object-hash-2.0.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."one-time-0.0.4" - sources."os-locale-3.1.0" + sources."one-time-1.0.0" + sources."optionator-0.9.1" sources."p-cancelable-1.1.0" - sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" - sources."p-locate-3.0.0" - (sources."p-queue-6.3.0" // { + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + (sources."p-queue-6.6.2" // { dependencies = [ - sources."eventemitter3-4.0.0" + sources."eventemitter3-4.0.7" ]; }) sources."p-retry-4.2.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."packet-reader-1.0.0" + sources."parent-module-1.0.1" sources."parseurl-1.3.3" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" sources."pathval-1.1.0" sources."performance-now-2.1.0" - (sources."pg-8.1.0" // { - dependencies = [ - sources."semver-4.3.2" - ]; - }) - sources."pg-connection-string-2.2.2" + sources."pg-8.5.1" + sources."pg-connection-string-2.4.0" sources."pg-int8-1.0.1" - sources."pg-minify-1.6.0" - sources."pg-pool-3.2.0" - sources."pg-promise-10.5.5" - sources."pg-protocol-1.2.3" + sources."pg-minify-1.6.2" + sources."pg-pool-3.2.2" + sources."pg-promise-10.8.7" + sources."pg-protocol-1.4.0" sources."pg-types-2.2.0" - sources."pgpass-1.0.2" + sources."pgpass-1.0.4" sources."picomatch-2.2.2" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.5" + sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" + sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" - sources."prom-client-11.5.3" - sources."proxy-addr-2.0.5" - sources."psl-1.1.33" - sources."pump-3.0.0" + sources."progress-2.0.3" + sources."prom-client-13.1.0" + sources."proxy-addr-2.0.6" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-5.0.0" + sources."quick-lru-5.1.1" + sources."randombytes-2.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readable-stream-3.4.0" - sources."readdirp-3.2.0" - sources."regenerator-runtime-0.11.1" - (sources."request-2.88.0" // { + sources."readable-stream-3.6.0" + sources."readdirp-3.4.0" + sources."regenerator-runtime-0.13.7" + sources."regexpp-3.1.0" + sources."regextras-0.7.1" + (sources."request-2.88.2" // { dependencies = [ + sources."form-data-2.3.3" sources."qs-6.5.2" sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-from-4.0.0" sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-7.3.4" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" ]; }) + sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."simple-swizzle-0.2.2" + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."source-map-0.6.1" - sources."source-map-support-0.5.16" - sources."spex-3.0.1" - sources."split-1.0.1" + sources."source-map-support-0.5.19" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.7" + sources."spex-3.2.0" + sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."statuses-1.5.0" - sources."stealthy-require-1.1.1" - sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" - sources."string_decoder-1.2.0" - sources."strip-ansi-5.2.0" - sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" + sources."string-width-4.2.0" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.0.3" + sources."json-schema-traverse-1.0.0" + ]; + }) sources."tdigest-0.1.1" sources."text-hex-1.0.0" - sources."through-2.3.8" + sources."text-table-0.2.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.8.1" // { - dependencies = [ - sources."diff-4.0.2" - ]; - }) - sources."tslib-1.11.1" - (sources."tslint-6.1.0" // { - dependencies = [ - sources."diff-4.0.2" - ]; - }) - sources."tsutils-2.29.0" + sources."ts-node-9.1.1" + sources."tslib-1.14.1" + sources."tsutils-3.19.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" sources."type-detect-4.0.8" + sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typescript-3.8.3" + sources."typescript-4.1.3" sources."underscore-1.4.4" - sources."unhomoglyph-1.0.5" + sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-7.0.2" + sources."uuid-8.3.2" + sources."v8-compile-cache-2.2.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; }) - (sources."winston-3.2.1" // { + (sources."winston-3.3.3" // { dependencies = [ - sources."async-2.6.2" + sources."async-3.2.0" + sources."is-stream-2.0.0" + sources."string_decoder-1.1.1" + (sources."winston-transport-4.4.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) ]; }) - (sources."winston-compat-0.1.4" // { - dependencies = [ - sources."logform-1.10.0" - sources."ms-2.1.2" - ]; - }) - sources."winston-daily-rotate-file-3.9.0" + sources."winston-daily-rotate-file-4.5.0" (sources."winston-transport-4.3.0" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) - sources."wrap-ansi-5.1.0" + sources."word-wrap-1.2.3" + sources."workerpool-6.0.2" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."wrappy-1.0.2" sources."ws-5.2.2" - sources."xtend-4.0.1" - sources."y18n-4.0.0" - sources."yargs-13.2.4" - sources."yargs-parser-13.1.1" - (sources."yargs-unparser-1.6.0" // { + sources."xtend-4.0.2" + sources."y18n-4.0.1" + sources."yallist-4.0.0" + (sources."yargs-16.2.0" // { dependencies = [ - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + sources."ansi-styles-4.3.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.5" + sources."yargs-parser-20.2.4" + ]; + }) + sources."yargs-parser-13.1.2" + (sources."yargs-unparser-2.0.0" // { + dependencies = [ + sources."camelcase-6.2.0" + sources."decamelize-4.0.0" ]; }) sources."yn-3.1.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index a17d8a55ac..934ce797d5 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "sha256-RkMgzYu6r30uqUCtCS/FuvJQiTInRYWiWhlTtDQQh5g="; + sha256 = "sha256-0nwE3+GkJAvz5s8G23TvLVO8ykQK0ZIwEWAaTWHHOuU="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-p6TW5ACXjqCR5IAVleMEIWYW4SHI1ZRL5KJFZpPc7yU="; + vendorSha256 = "sha256-FRXG0HmYfum9G/LYm6oWLLx1ZYQ3Jq7qV/mq6ofN9f5="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index 42b071427f..e69014c4f4 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.28"; + version = "2.0.29"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "sha256-XvQhLqGP1TliSrIm55dP04yGoOMnHmcI2gH00SYVLVY="; + sha256 = "sha256-8FfI9TPtIoQ/D5AdKRy7fq/eGZ6ha8z0tqBnWcziMTA="; }; - vendorSha256 = "sha256-NKpMLjro06gWN2Xu5M+xM4hVNvlOZ12F3Jv+bL5E0I8="; + vendorSha256 = "sha256-y7w+SHy0yPws365PKJeRStZS3Y5vjyPWHK3w84VvJsI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index ce53f30929..dcf7f7bf9f 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-03-17T02-33-02Z"; + version = "2021-03-26T00-00-41Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-nCCU9hSt8VaLpZmqZFl3GczqDJXEQJ4rFn/9B0gV/5g="; + sha256 = "sha256-WH7gAO8ghwMhLU/ioHrZUgIk1h6yeUzM+xg1GnkFDHM="; }; - vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0="; + vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index 2a6c675ce1..9a172120da 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.9.0"; + version = "3.9.4"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-0m2dL7oFF45yR4Vu+AW3ROf16w1iioI5McVauOQA/XQ="; + sha256 = "sha256-h5Bv6Us1NrxhUWBckUcGzh3qDk8yDbkmLnV6ZYDdClU="; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix index 02841c6acb..c55c67f5f6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute2, nettools , fetchFromGitHub, makeWrapper }: @@ -18,9 +18,9 @@ perlPackages.buildPerlPackage rec { patchShebangs bin substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip ''; buildTools = []; @@ -67,7 +67,7 @@ perlPackages.buildPerlPackage rec { for cur in $out/bin/*; do if [ -x "$cur" ]; then sed -e "s|./lib|$out/lib|" -i "$cur" - wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]} + wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute2]} fi done ''; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 9bf10165e0..364d2e4435 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.4.5"; + version = "7.5.2"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "10pnwd4d19ry7w2x46acc3j8gjn73b45fzc579gz1hc8hx2b3s0s"; + sha256 = "sha256-8Qy5YgJZpvaAjeBAi092Jxg4yAD1fYmMteTRm5b0Q+g="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1x9jx3ww37cn6r6cn6gqlavmllxydks23vm8w4934bv8zppj1zwz"; + sha256 = "sha256-yVswMNOLX/AFtv45TXm8WcHEytyYgtjvi7V0dRewDdc="; }; - vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc"; + vendorSha256 = "sha256-oh3GB6Iaqy05IS2MU5LJqTXnlr0vtkACZA6wpmW7W2Q="; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index efbaeda937..07694688c4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.2"; - zipHash = "sha256-HWQdhstnrDuXPithZ8kOG2ZtSeAT215MJ1ftMCt6/tc="; + version = "1.2.3"; + zipHash = "sha256-Eu3dTPfJxAWwqqGT6l4El4MqviBbzERarU30OXU+eEM="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index a8cf124fc7..8051602489 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute2, nettools }: buildGoModule rec { pname = "mackerel-agent"; @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix new file mode 100644 index 0000000000..a0bc409a7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "domain-exporter"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "caarlos0"; + repo = "domain_exporter"; + rev = "v${version}"; + sha256 = "0pvz5vx9jvxdrkmzqzh7dfi09sb55j6zpx5728m5v38p8cl8vyh6"; + }; + + vendorSha256 = "02m2mnx93xq6cl54waazgxq6vqbswfn9aafz0h694n6rskvdn784"; + + doCheck = false; # needs internet connection + + passthru.tests = { inherit (nixosTests.prometheus-exporters) domain; }; + + meta = with lib; { + homepage = "https://github.com/caarlos0/domain_exporter"; + description = "Exports the expiration time of your domains as prometheus metrics"; + license = licenses.mit; + maintainers = with maintainers; [ mmilata prusnak ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix new file mode 100644 index 0000000000..3aabe6e723 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -0,0 +1,29 @@ +{ buildGoPackage, lib, fetchFromGitHub }: + +buildGoPackage rec { + pname = "openldap_exporter"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "tomcz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Di1GiyVp/hGCFhqxhlqJSucGZK7f/FDDUFtJRaiAZu4="; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/tomcz/openldap_exporter.tag=v${version} + -X github.com/tomcz/openldap_exporter.commit=unknown + ''; + + goPackagePath = "github.com/tomcz/openldap_exporter"; + + meta = with lib; { + homepage = "https://github.com/tomcz/openldap_exporter"; + description = " Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 81ccaee659..9b3cda6e7a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "postgres_exporter"; - version = "0.8.0"; - - goPackagePath = "github.com/wrouesnel/postgres_exporter"; + version = "0.9.0"; src = fetchFromGitHub { owner = "wrouesnel"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "0mid2kvskab3a32jscygg5jh0741nr7dvxzj4v029yiiqcx55nrc"; + sha256 = "sha256-Kv+sjqhlmH36L4YvDuGYODR/eTHA2TKQ6IUCXAiItyo="; }; + vendorSha256 = "sha256-yMcoUl9NsiiZQyEHlLu79DzIyl6BbhLZ/xNFavaGrEs="; + doCheck = true; passthru.tests = { inherit (nixosTests.prometheus-exporters) postgres; }; @@ -21,6 +21,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A Prometheus exporter for PostgreSQL"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz globin willibutz ]; + maintainers = with maintainers; [ fpletz globin willibutz ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 2b0be2803e..ac19ddda79 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-GJKTQGMmFJeUQn02GWP4KKpKdM8eT+VxDBDzST+5NXk="; + sha256 = "sha256-FryVKOabokw2+RyD94QLVpC9ZGIHPuSXZf5H+eitj80="; }; - vendorSha256 = "sha256-s11iJFcJ1Ez6TkhCU3VD2ThU5/9otHz5rDF8z9ux79E="; + vendorSha256 = "sha256-GBjPMZ6BwUOKywNf1Bc2WeA14qvKQ0R5gWvVxgO/7Lo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix index 8297503b67..992a92a273 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unifi-poller"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "unifi-poller"; repo = "unifi-poller"; rev = "v${version}"; - sha256 = "16q9hrbl9qgilj3vb7865l1yx0xhm7m4sx5j1ys5vi63drq59g93"; + sha256 = "sha256-C7QjMzmy2CMCk2oqRiThUQBKgltT0PzZArvZ+gOmJ2I="; }; - vendorSha256 = "1fgcbg34g0a0f85qv7bjanv2lpnnszcrspfppp2lnj9kv52j4c1w"; + vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; buildFlagsArray = '' -ldflags=-w -s diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 06d7a954aa..4f62c6f777 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.2.0"; + version = "2.2.1"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-CNCdJUug99a9yE8YxSk7/s1CIEYJd9n8Gahz+B3ZyjI="; + sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/ombi/default.nix b/third_party/nixpkgs/pkgs/servers/ombi/default.nix new file mode 100644 index 0000000000..bbad311edd --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/ombi/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchurl, makeWrapper, patchelf, openssl, libunwind, zlib, krb5, icu, nixosTests }: + +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + }."${stdenv.hostPlatform.system}" or (throw + "Unsupported system: ${stdenv.hostPlatform.system}"); + + hash = { + x64-linux_hash = "sha256-Cuvz9Mhwpg8RIaiSXib+QW00DM66qPRQulrchRL2BSk="; + arm64-linux_hash = "sha256-uyVwa73moHWMZScNNSOU17lALuK3PC/cvTZPJ9qg7JQ="; + x64-osx_hash = "sha256-FGXLsfEuCW94D786LJ/wvA9TakOn5sG2M1rDXPQicYw="; + }."${arch}-${os}_hash"; + + rpath = lib.makeLibraryPath [ + stdenv.cc.cc openssl libunwind zlib krb5 icu + ]; + + dynamicLinker = stdenv.cc.bintools.dynamicLinker; + +in stdenv.mkDerivation rec { + pname = "ombi"; + version = "4.0.1292"; + + sourceRoot = "."; + + src = fetchurl { + url = "https://github.com/Ombi-app/Ombi/releases/download/v${version}/${os}-${arch}.tar.gz"; + sha256 = hash; + }; + + buildInputs = [ makeWrapper patchelf ]; + + installPhase = '' + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} + + makeWrapper $out/share/${pname}-${version}/Ombi $out/bin/Ombi \ + --run "cd $out/share/${pname}-${version}" + ''; + + dontPatchELF = true; + postFixup = '' + patchelf --set-interpreter "${dynamicLinker}" \ + --set-rpath "$ORIGIN:${rpath}" $out/share/${pname}-${version}/Ombi + + find $out -type f -name "*.so" -exec \ + patchelf --set-rpath '$ORIGIN:${rpath}' {} ';' + ''; + + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.ombi; + }; + + meta = with lib; { + description = "Self-hosted web application that automatically gives your shared Plex or Emby users the ability to request content by themselves"; + homepage = "https://ombi.io/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ woky ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/ombi/update.sh b/third_party/nixpkgs/pkgs/servers/ombi/update.sh new file mode 100755 index 0000000000..fb2549bb74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/ombi/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq + +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + arch=$2 + os=$3 + + hashKey="${arch}-${os}_hash" + + url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sriHash="$(nix to-sri --type sha256 $hash)" + + sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; ombi.version)') + +latestTag=$(curl https://api.github.com/repos/Ombi-App/Ombi/tags | jq -r '.[] | .name' | sort --version-sort | tail -1) +latestVersion="$(expr $latestTag : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Ombi is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion $latestVersion + +updateHash $latestVersion x64 linux +updateHash $latestVersion arm64 linux +updateHash $latestVersion x64 osx diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix index f7944e6a17..918a20ce5a 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file +, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. @@ -16,9 +16,9 @@ in stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl - which yacc ] ++ optionals withDevdoc [ doxygen dblatex ]; + which bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 1bb6ee3239..53389db39c 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: +{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -13,10 +13,10 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; patches = [ # LINUX 5.8: Replace kernel_setsockopt with new funcs @@ -91,5 +91,4 @@ in stdenv.mkDerivation { maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; - } diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix index f7944e6a17..918a20ce5a 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file +, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. @@ -16,9 +16,9 @@ in stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl - which yacc ] ++ optionals withDevdoc [ doxygen dblatex ]; + which bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix index 5ed09a2174..a242d59e2d 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: +{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -13,10 +13,10 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; patches = []; @@ -60,5 +60,4 @@ in stdenv.mkDerivation { maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; - } diff --git a/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix b/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix index 58f799c97b..20b8699aef 100644 --- a/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, bison }: let openbsd_version = @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw="; }; - nativeBuildInputs = [ autoconf automake libtool m4 yacc ]; + nativeBuildInputs = [ autoconf automake libtool m4 bison ]; preConfigure = '' mkdir ./openbsd diff --git a/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix b/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix index 6752a8089a..0889deee92 100644 --- a/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pim6sd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }: +{ stdenv, fetchFromGitHub, lib, autoreconfHook, bison, flex }: stdenv.mkDerivation rec { pname = "pim6sd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw"; }; - nativeBuildInputs = [ autoreconfHook yacc flex ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; meta = with lib; { description = "PIM for IPv6 sparse mode daemon"; diff --git a/third_party/nixpkgs/pkgs/servers/pounce/default.nix b/third_party/nixpkgs/pkgs/servers/pounce/default.nix index 65b1cbc7dd..3ff6b112a9 100644 --- a/third_party/nixpkgs/pkgs/servers/pounce/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pounce/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, libressl, fetchzip, fetchpatch, pkg-config }: +{ lib, stdenv, libressl, fetchzip, pkg-config }: stdenv.mkDerivation rec { pname = "pounce"; - version = "2.1p1"; + version = "2.3"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "1gphia45swj4ws6nrklqg1hvjrc6yw921v0pf29cvjhwrfl6dl0h"; + sha256 = "0pk3kwr6k6dz2vdx1kyv7mhj756j4bwsmdlmjzhh8ghczjqp2s2x"; }; buildInputs = [ libressl ]; diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index ada7ea1c22..df9cab557b 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uahgIphp2/iE11v33sPNrm0evz6dQvzjEQ9uMVEuTTI="; + sha256 = "sha256-XuyE0gubkE08Qei30/q8fLdX8V7zBsbFsdaiqbXgeI4="; }; - vendorSha256 = "sha256-nAeP9ZmYu5VPKR628aJVNS8t41V/AYkgwOcO/d0nQv4="; + vendorSha256 = "sha256-4R2gA9QwfyBNDasRuDawDFEmXu31yGuZUQZS6cZL3B0="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix index 64a6dddfaa..14aa161069 100644 --- a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -20,14 +20,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.2.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-h+efFsyCqcMktKpKOqaHkfFdJKGAjvIOc6NmIyXnZDA="; + sha256 = "sha256-y2uaXa2DPZHBLukAdwKTwXauaJHX5Uft35vsthzGwME="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 3dd811b51f..d3cc2304c6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -216,6 +216,7 @@ in self: { this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; + icu = self.icu67; }; postgresql_11 = self.callPackage generic { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix index c1aefa1770..74cb0674f3 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.3.0"; + version = "1.3.1"; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "1hvd0nfaq5q9yfxfcb0fbrjbdal06adjplvmaag88a0msdlirl7z"; + rev = "v${version}"; + sha256 = "0vhqm9xi84v21ijlbi3fznj799j81mmc9kaawhwn0djhxcs2symd"; }; installPhase = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; + changelog = "https://github.com/citusdata/pg_cron/raw/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 69e140058f..505aff6667 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.1.0"; + version = "2.1.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "03bsvf5iwgiwxq4p1pxri795n3qm70gvd1sz9p0dxixxsjl34vxf"; + sha256 = "0mjqy0d60l62vqqbrayj6270173501i6aqgnkczywrqyzqw8522l"; }; # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 714cf51745..d051395027 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2 }: buildGoModule rec { pname = "tailscale"; @@ -30,7 +30,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/tailscaled --prefix PATH : ${ - lib.makeBinPath [ iproute iptables ] + lib.makeBinPath [ iproute2 iptables ] } sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 61f9c78518..9c1bc1cc3d 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.6.1"; + version = "2.6.8"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34="; + sha256 = "0pkki72maxnrp3frninw2qbxyf76rvkza23k3s8fppandkr7qpvj"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/tegola/default.nix b/third_party/nixpkgs/pkgs/servers/tegola/default.nix index f2161d5d47..5e3aa2d0ef 100644 --- a/third_party/nixpkgs/pkgs/servers/tegola/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tegola/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tegola"; - version = "0.12.1"; + version = "0.13.0"; goPackagePath = "github.com/go-spatial/tegola"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "go-spatial"; repo = pname; rev = "v${version}"; - sha256 = "0x8wv9xx0dafn55y0i7x43plg1blnslzj0l5047laipw7gnmfwad"; + sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ="; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix index 974b7a62e5..fcab309118 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.197"; + version = "2.5.201"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-0xM9BtQvSt5WkbKBri+KxB+Ghc4wgY8/TUgI6PCFmm0="; + sha256 = "sha256-k2G+jUne/lq0dRJsIQpWlRFg1Nq92bM28YkawKOKlsI="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index 59879c652f..11dcd57d9c 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -2471,11 +2471,11 @@ lib.makeScope newScope (self: with self; { }) {}; xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbcomp-1.4.4"; + name = "xkbcomp-1.4.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.4.tar.bz2"; - sha256 = "0zpjkbap9160pdd6jpgb5f0yg5281w0rkkx1l0i7g887lq1ydk2r"; + url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; + sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 54082ce812..4c83229159 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt, + mcpp, epoxy, openssl, pkg-config, llvm, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -433,7 +433,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa llvm_6 ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa llvm ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; @@ -800,6 +800,10 @@ self: super: }; }); + xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [ self.libXv ]; + }); + xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: { patches = [ # fixes invalid open mode diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index aaab0c994f..1da7180950 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -46,7 +46,7 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.8.tar.bz2 mirror://xorg/individual/app/xinit-1.4.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.3.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.4.4.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index 0ae93ed146..c4e9e91538 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config -, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages +, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -122,11 +122,11 @@ in stdenv.mkDerivation rec { done substituteInPlace scripts/zmdbbackup.in \ - --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump + --replace /usr/bin/mysqldump ${mariadb.client}/bin/mysqldump substituteInPlace scripts/zmupdate.pl.in \ - --replace "'mysql'" "'${mysql.client}/bin/mysql'" \ - --replace "'mysqldump'" "'${mysql.client}/bin/mysqldump'" + --replace "'mysql'" "'${mariadb.client}/bin/mysql'" \ + --replace "'mysqldump'" "'${mariadb.client}/bin/mysqldump'" for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib + curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib util-linuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies diff --git a/third_party/nixpkgs/pkgs/shells/dash/default.nix b/third_party/nixpkgs/pkgs/shells/dash/default.nix index 24d5af7e74..f044c41b73 100644 --- a/third_party/nixpkgs/pkgs/shells/dash/default.nix +++ b/third_party/nixpkgs/pkgs/shells/dash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl }: +{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }: stdenv.mkDerivation rec { pname = "dash"; @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # Temporary fix until a proper one is accepted upstream patches = [ (fetchurl { # Dash executes code when noexec ("-n") is specified @@ -19,9 +18,18 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; }) - ] ++ lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + ] ++ lib.optionals stdenv.isDarwin [ + # Temporary fix until a proper one is accepted upstream + ./0001-fix-dirent64-et-al-on-darwin.patch + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + buildInputs = [ libedit ]; + + configureFlags = [ "--with-libedit" ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; diff --git a/third_party/nixpkgs/pkgs/shells/es/default.nix b/third_party/nixpkgs/pkgs/shells/es/default.nix index 7b2251a3f4..5efb860c1d 100644 --- a/third_party/nixpkgs/pkgs/shells/es/default.nix +++ b/third_party/nixpkgs/pkgs/shells/es/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, readline, yacc }: +{ lib, stdenv, fetchurl, readline, bison }: let version = "0.9.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { sourceRoot=. ''; - buildInputs = [ readline yacc ]; + buildInputs = [ readline bison ]; configureFlags = [ "--with-readline" ]; diff --git a/third_party/nixpkgs/pkgs/shells/ksh/default.nix b/third_party/nixpkgs/pkgs/shells/ksh/default.nix index 822f1dc349..cfd278aaca 100644 --- a/third_party/nixpkgs/pkgs/shells/ksh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/ksh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch +{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python3, fetchpatch , libiconv }: stdenv.mkDerivation rec { @@ -19,10 +19,12 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja which python ]; + nativeBuildInputs = [ meson ninja which python3 ]; buildInputs = [ libiconv ]; + strictDeps = true; + meta = with lib; { description = "KornShell Command And Programming Language"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 3b570c89ae..70022b5c2a 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-8mS4Yvzyka85ZkV2LT68h4EGmumQtYpOxCIDRqa3fk0="; + sha256 = "sha256-RZz8hmcLOJRz0HpPXc3121B1UcbtDgCFv8Zdv29E+XQ="; }; - cargoSha256 = "sha256-jbziXOrmHkZPp3YkPJypNj7l62Q6nKyamBBYjlfYiVE="; + cargoSha256 = "sha256-V6Qdg8xSm2/6BbSEOH5mH92Gjx+xy0J2CZ9FQxmhI88="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index 78cef0df26..9df88affb9 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ lheckemann alva ]; + changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 6d5000e6f6..f25e714763 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-03-15"; + version = "2021-03-31"; pname = "oh-my-zsh"; - rev = "95a06f3927a286db257dc99791b02caba757fe33"; + rev = "2b1d4122796fea12dcaa7545cfca59fb43e6393e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1w0g68rvw17jg085qj1g264dsii25gph6vpp6gpn8wby0972h7n0"; + sha256 = "1c1hcmvfrfwds1zn165vpfh11a19s6kb20bxy2dzpby5cs15g6bc"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix index fafb4a5057..ee0f702780 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2021-02-14"; + version = "unstable-2021-04-01"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "8cebb8f01ca57076c3c7cd66365270d989bcaa89"; - sha256 = "119m84g2c4z9xdr22j401p09n3cpiyj61dw5m7xkm6309nd7zz0a"; + rev = "0c36bdcf6a80ec009280897f07f56969f94d377e"; + sha256 = "0ymp9ky0jlkx9b63jajvpac5g3ll8snkf8q081g0yw42b9hwpiid"; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index 7168ce4084..a73474c952 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -157,7 +157,8 @@ addToSearchPathWithCustomDelimiter() { local delimiter="$1" local varName="$2" local dir="$3" - if [ -d "$dir" ]; then + if [[ -d "$dir" && "${!varName:+${delimiter}${!varName}${delimiter}}" \ + != *"${delimiter}${dir}${delimiter}"* ]]; then export "${varName}=${!varName:+${!varName}${delimiter}}${dir}" fi } diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 9b4b09c248..63ca45452e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; version = "2.8.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { openssl curl dnsutils - (if stdenv.isLinux then iproute else unixtools.netstat) + (if stdenv.isLinux then iproute2 else unixtools.netstat) ] }" ''; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 56a0d252a8..d9f20a9bc3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,13 +1,13 @@ { buildGoModule, lib, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "aws-vault"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bmqmT/gkdgczrDfZdI+FySX5CuesJXWKS0JatzaubIw="; + sha256 = "sha256-yNmjoCq9fYzt/lZQlVgxQvxKWCh5Lxd4NSX7c+gE/As="; }; vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 173bf13295..943c69e762 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -7,13 +7,6 @@ let py = python3.override { packageOverrides = self: super: { - rsa = super.rsa.overridePythonAttrs (oldAttrs: rec { - version = "3.4.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; - }; - }); # TODO: https://github.com/aws/aws-cli/pull/5712 colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { version = "0.4.3"; @@ -28,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.39"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.41"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-qX8ThQwvwc5wGud5Q4KqO24kGdqvi3oK7K71O5aeJeQ="; + sha256 = "sha256-DKKE2iMn6BHmcohHY6Uv7q9Om8FkbTbsk0CaxueBJHA="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 514b16eca8..c55bde7982 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-vYezpO5Oe5KXmCx6D70GMKamhK8/EiaV2BPb0tQLDzg="; + sha256 = "sha256-bKciwcYGETwVdUS4qdByHLWKt16PpBtTvW/dvuclIpA="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 1d70fa24fb..2ff2bf92f8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "09jhcv0ysq37k06b4rw3f9w33spvkkxx7fydraikm3zzvy28l58x"; + sha256 = "0csgdmzr9h3vnqn8gxvgg2mnjzackkvrid1i55l2fqcad69h6w1k"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1971fz8cv69y7kvirgw9n0xr7z9b1yyh4y43mg10lvv3glx46xcy"; + sha256 = "0gcxldk3c03dipbkj9yzaa4v1s6bf9zlwslvi8dv3s3kbljjd84b"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "332.0.0"; + version = "334.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index eb748cc42c..91f71ece42 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -1,6 +1,6 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq -, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap +, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu @@ -48,7 +48,7 @@ buildGoPackage rec { wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs - ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ] ++ [ (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 5cb9eb241c..707aff2011 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.22.0"; + version = "2.23.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.22.0-linux-x64.tar.gz"; - sha256 = "14czj8xc4l014bc1bgpf1rlw4qkf4q6nrw9f0b1xp5zrhvjiky1k"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.23.2-linux-x64.tar.gz"; + sha256 = "0bg90kj8lb1bw3vx0672rbzmc5wylx90cad3h93qlwxsfvijmk7x"; } { - 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-auth0-v1.9.1-linux-amd64.tar.gz"; + sha256 = "084l6si66sxy55i4y14rn287v69vli17n283s718v00zrmgdah35"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.32.0-linux-amd64.tar.gz"; - sha256 = "1pnh43asg2f8gs85i8y666f626q4vpsqj96ni10kpfalkby6b8fd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.34.2-linux-amd64.tar.gz"; + sha256 = "1xpil1a7gwcmjb3my9s37gf45i17l5mnxh0bkfbfwiw5znv7cjqa"; } { - 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-cloudflare-v2.14.2-linux-amd64.tar.gz"; + sha256 = "00ibqxb1qzwi93dsq56av0vxq80lx2rr8wll4q6d8wlph215hlqs"; } { - 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-consul-v2.9.1-linux-amd64.tar.gz"; + sha256 = "04sk6km29ssqkv0xw26vq3iik2kfzc3dnzacn324m7fddv3p9wx9"; } { - 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-datadog-v2.17.1-linux-amd64.tar.gz"; + sha256 = "0b3bz952wz7fsbk51j0mlfsyyg9ymc9wnq8kgm7dvs1p5zgzv4ni"; } { - 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-digitalocean-v3.6.1-linux-amd64.tar.gz"; + sha256 = "114r26ncf3rlw6h0wsmyxhpcxb5hy20fk8kav858hvqacby5w6sq"; } { - 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-docker-v2.9.1-linux-amd64.tar.gz"; + sha256 = "178l4h7wj9pn1283zajaqm7fwcfwzpzq7swrgr8q880qsa611gjs"; } { - 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-gcp-v4.17.0-linux-amd64.tar.gz"; + sha256 = "0xzix9mn3n3n4y7l6xl0bn2xq338436ykb34j2fi20wxg5wb99lf"; } { - 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-github-v3.3.1-linux-amd64.tar.gz"; + sha256 = "1pg1q70gkp300swl5hnjdx7s9yjg0d88r280ylga73syncms4s3w"; } { - 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-gitlab-v3.8.1-linux-amd64.tar.gz"; + sha256 = "1xhrj950lk6qdazg4flymn3dmkbivc2rd71k8sdy9zfanyxnq8vv"; } { - 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-hcloud-v0.7.1-linux-amd64.tar.gz"; + sha256 = "0n2p14iam44icms4c8qrjfy1z7p4m6igxckvqxr0gphi8ngk4ggh"; } { - 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-kubernetes-v2.8.3-linux-amd64.tar.gz"; + sha256 = "0l9r0gqhhjbkv4vn4cxm2s9zf93005w8vrb103w101h1gc5gh93l"; } { - 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-mailgun-v2.5.1-linux-amd64.tar.gz"; + sha256 = "0clck5cra6bplfxd0nb6vkji50gg4ah4yfvc7202hi3w2b9hfjjg"; } { - 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-mysql-v2.5.1-linux-amd64.tar.gz"; + sha256 = "1cd2bm030fa9spv7bx817id419lz1c54i8h84ifinkx88ig7ngyx"; } { - 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-openstack-v2.17.1-linux-amd64.tar.gz"; + sha256 = "1q9sx2lszmkcgphp3vwx0lvs5vc67sk98rn8s6ywhz0p426wakmr"; } { 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.7.2-linux-amd64.tar.gz"; - sha256 = "1lx4yk7wcnbn419zqjyp2aw81q5bg5dqjy74ghbc74qhbbxjz6q0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.8.1-linux-amd64.tar.gz"; + sha256 = "05rcvp2gkx14gy46a0vx9ch3xysnn0wlgsn80rfav35v932x9f3g"; } { - 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-random-v3.1.1-linux-amd64.tar.gz"; + sha256 = "1zpwlvdgjvhnhlzyppqg76csma8kan33amxa1svlhcai8b168878"; } { - 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-vault-v3.5.1-linux-amd64.tar.gz"; + sha256 = "16b1449vb6inlyjpb1iyr5j5mwg1g2d6bcd5g2kmxcsw4yhc7ai7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-linux-amd64.tar.gz"; - sha256 = "1clhdj8jlmhfykirdfp8lkg9grhyyamjimxcy2mxshm6mwlaajcm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.13.1-linux-amd64.tar.gz"; + sha256 = "1z6v5vz0p9g3hrrgrchx2wnbparkbf5b8vn9pwnw69nkplr1qzff"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.22.0-darwin-x64.tar.gz"; - sha256 = "18qp2da7hnycbzhzy91kypybr08x969zszzm3lqrrawqapgx4ig5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.23.2-darwin-x64.tar.gz"; + sha256 = "19g3bsmrjwfbnmw20zh0cqnhz83jl4ikfwg4rhdxsvazdmbym905"; } { - 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-auth0-v1.9.1-darwin-amd64.tar.gz"; + sha256 = "1jkw0pvwz25dvxva7dipdxf4lppgr2m8ynbjl32fijzqs61y690m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.32.0-darwin-amd64.tar.gz"; - sha256 = "166ca370fwnfq73pj3q6qw1gm2rf3g71p46nwqawi0cf3cxvf6ys"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.34.2-darwin-amd64.tar.gz"; + sha256 = "0chjps0m203xb1ybky77lg1miv7d4cp1z8xxqhymrylfqaz4xj8q"; } { - 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-cloudflare-v2.14.2-darwin-amd64.tar.gz"; + sha256 = "05ggw10z0pp45yqq8bl32l3xjxvgwbs58czpw74whydqbd3qy8av"; } { - 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-consul-v2.9.1-darwin-amd64.tar.gz"; + sha256 = "022458yxscfg56s2nqdr95wp2ffm7sni4kaksj87i6c5ddc9f1gx"; } { - 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-datadog-v2.17.1-darwin-amd64.tar.gz"; + sha256 = "09nd5nfvjqgpbjs82bm5ym5wdg37mg863wvdp8s3fd8id4gdqb24"; } { - 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-digitalocean-v3.6.1-darwin-amd64.tar.gz"; + sha256 = "1f3mfgh24h2hwmshs4qpplgrxplxl7iab29xp4c7p1g573na3b7a"; } { - 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-docker-v2.9.1-darwin-amd64.tar.gz"; + sha256 = "10vp75fc41yk9lg5x7wyhs4mn2f4krfnw4jn5xys7dd475blm6rh"; } { - 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-gcp-v4.17.0-darwin-amd64.tar.gz"; + sha256 = "0cl7im10is9wvw3ygis9xy3f77npijsf1dsb49ww057kqhgv1v3i"; } { - 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-github-v3.3.1-darwin-amd64.tar.gz"; + sha256 = "1b7azajh9kzq8akyf5pf16hh3had8iwph6cw06b7mv1wqyd01k6z"; } { - 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-gitlab-v3.8.1-darwin-amd64.tar.gz"; + sha256 = "14gqwz5nalbv97vl9apwda0xxl7cgkp5mixrc10xvx6a94w5758p"; } { - 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-hcloud-v0.7.1-darwin-amd64.tar.gz"; + sha256 = "0i0h1iz999pbz23gbs75bj3lxfg9a6044g4bwdwf3agxf3k9pji3"; } { - 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-kubernetes-v2.8.3-darwin-amd64.tar.gz"; + sha256 = "1nwwqq1nn1zr6mia2wd82lzqsa8l3rr50hl1mf6l6ffyxz1q1lzj"; } { - 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-mailgun-v2.5.1-darwin-amd64.tar.gz"; + sha256 = "0zkd3rm6z8bc7pcbwl0bbbn0zb3jrl69b84g62ma9vzskccrxxpr"; } { - 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-mysql-v2.5.1-darwin-amd64.tar.gz"; + sha256 = "0v4qqp1x8xi0fqiczmmh2qbf3azbgf09cphia5w8r2kkrn4i0jxn"; } { - 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-openstack-v2.17.1-darwin-amd64.tar.gz"; + sha256 = "1788ayj5zwlmvhd1qp6rzrcbman5i0hy1hw2fmgcrf66v5qc1f18"; } { 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.7.2-darwin-amd64.tar.gz"; - sha256 = "0c83zdnx12g2dmvi98v7w3739x91d9lhqx5j6cvq8c24y7lxga78"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.8.1-darwin-amd64.tar.gz"; + sha256 = "1r5rhn1yjjr0rw7qm2n8dqyqk1r1hkgvdmdq2x9smnvd2mwwjfah"; } { - 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-random-v3.1.1-darwin-amd64.tar.gz"; + sha256 = "1j30gkz1m9ap8pd2r3lb3nl82bq5bq3h7y6jq2c0dmv3ksnp197f"; } { - 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-vault-v3.5.1-darwin-amd64.tar.gz"; + sha256 = "1s5kbqri9k7cpajkgnl2s5l0nznzridj5iscwd9n1nj4bsr44lap"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-darwin-amd64.tar.gz"; - sha256 = "0wpqk93ns9z3yvpas9aix345jm38hffssnz1dn5cxl6y0d5scjd8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.13.1-darwin-amd64.tar.gz"; + sha256 = "133xspppmydjri5ba2yxc331ljzd8wj88q3hzmgvp0m50il1ks71"; } ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index 3fd8130a9a..af65df8dae 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/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.22.0" +VERSION="2.23.2" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.8.1" - "aws=3.32.0" - "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" + "auth0=1.9.1" + "aws=3.34.2" + "cloudflare=2.14.2" + "consul=2.9.1" + "datadog=2.17.1" + "digitalocean=3.6.1" + "docker=2.9.1" + "gcp=4.17.0" + "github=3.3.1" + "gitlab=3.8.1" + "hcloud=0.7.1" + "kubernetes=2.8.3" + "mailgun=2.5.1" + "mysql=2.5.1" + "openstack=2.17.1" "packet=3.2.2" - "postgresql=2.7.2" - "random=3.0.3" - "vault=3.4.1" - "vsphere=2.12.2" + "postgresql=2.8.1" + "random=3.1.1" + "vault=3.5.1" + "vsphere=2.13.1" ) function genMainSrc() { diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index 7df6e94e46..38ece95e3a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3002.6"; + version = "3003"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "/8R4VpNj4dF7ajoMQh6q6cB5u+q8THcloiLQ+/kDoKU="; + sha256 = "xGiXM9/nOM8ofjHLP908uNFgYpUgKxjY5m1I03LVync="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix b/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix index 5bfc00ac00..393d9d145c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix @@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; + checkInputs = with python3Packages; [ mock ]; + meta = with lib; { homepage = "https://github.com/zenhack/simp_le"; description = "Simple Let's Encrypt client"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index dd75474215..13620d164e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.11"; + version = "1.5.12"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aoflV4C7eH0RNdq8j7kPeAfnOEZECmfZ91/QBQy7oxY="; + sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg="; }; vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix index 571798fcd2..80664a6a44 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, zlib, bzip2, lzma, lzo, lz4, zstd, xz +, zlib, bzip2, lzo, lz4, zstd, xz , libgcrypt, e2fsprogs, util-linux, libgpgerror }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - zlib bzip2 lzma lzo lz4 zstd xz + zlib bzip2 xz lzo lz4 zstd xz libgcrypt e2fsprogs util-linux libgpgerror ]; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix index 844bd8de29..5f456f9221 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/gnutar/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnutar"; - version = "1.32"; + version = "1.34"; src = fetchurl { url = "mirror://gnu/tar/tar-${version}.tar.xz"; - sha256 = "1n7xy657ii0sa42zx6944v2m4v9qrh6sqgmw17l3nch3y43sxlyh"; + sha256 = "sha256-Y769JoecXh7qQ1Lw0DyZH5Zq6z3es8dEXJAlaNVBHSg="; }; # avoid retaining reference to CF during stdenv bootstrap diff --git a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix index 701c7429d6..4822ea82d1 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, cmake, makeWrapper, python -, boost, lzma +{ lib, stdenv, fetchurl, cmake, makeWrapper +, boost, xz , withGog ? false, unar ? null }: stdenv.mkDerivation rec { @@ -10,10 +10,15 @@ stdenv.mkDerivation rec { sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; - buildInputs = [ python lzma boost ]; + buildInputs = [ xz boost ]; + + # Python is reported as missing during the build, however + # including Python does not change the output. nativeBuildInputs = [ cmake makeWrapper ]; + strictDeps = true; + # we need unar to for multi-archive extraction postFixup = lib.optionalString withGog '' wrapProgram $out/bin/innoextract \ diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 26484b436c..e1c2844813 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.03.27"; + version = "2021.03.30"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-dOUdxH1jJUr9MkU6mf0nwbjY5NYUJpHGkjUZWbRSGsw="; + sha256 = "sha256-eOQbvs/mtFn7AmvSezO/jRm8+cO5tF7ggcF9DwwfqVc="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/acousticbrainz-client/default.nix b/third_party/nixpkgs/pkgs/tools/audio/acousticbrainz-client/default.nix new file mode 100644 index 0000000000..a08710fe12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/acousticbrainz-client/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchFromGitHub, python3Packages, essentia-extractor }: + +python3Packages.buildPythonApplication rec { + pname = "acousticbrainz-client"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "MTG"; + repo = "acousticbrainz-client"; + rev = version; + sha256 = "1g1nxh58939vysfxplrgdz366dlqnic05pkzbqh75m79brg4yrv1"; + }; + + propagatedBuildInputs = [ essentia-extractor python3Packages.requests ]; + + postPatch = '' + # The installer needs the streaming_extractor_music binary in the source directoy, + # so we provide a symlink to it. + ln -s ${essentia-extractor}/bin/streaming_extractor_music streaming_extractor_music + ''; + + postInstall = '' + # The installer includes a copy of the streaming_extractor_music binary (not a symlink), + # which we don't need, because the wrapper adds essentia-extractor/binary to PATH. + rm $out/bin/streaming_extractor_music + ''; + + # Tests seem to be broken, but the tool works + doCheck = false; + + pythonImportsCheck = [ "abz" ]; + + meta = with lib; { + description = "A client to upload data to an AcousticBrainz server"; + license = licenses.gpl3Plus; + homepage = "https://github.com/MTG/acousticbrainz-client"; + # essentia-extractor is only available for those platforms + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix b/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix new file mode 100644 index 0000000000..457ca2b0d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "isrcsubmit"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "JonnyJD"; + repo = "musicbrainz-isrcsubmit"; + rev = "v${version}"; + sha256 = "1lqs4jl2xv1zxmf0xsihk9rxzx2awq87g51vd7y3cq1vhj1icxqa"; + }; + + propagatedBuildInputs = with python3Packages; [ musicbrainzngs discid ]; + + meta = with lib; { + # drutil is required on Darwin, which does not seem to be available in nixpkgs + broken = stdenv.isDarwin; + description = "Script to submit ISRCs from disc to MusicBrainz"; + license = licenses.gpl3Plus; + homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/"; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix new file mode 100644 index 0000000000..520af8404a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +, fetchFromGitHub +, ffmpeg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "spotdl"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "spotDL"; + repo = "spotify-downloader"; + rev = "v${version}"; + sha256 = "1nxf911hi578jw24hlcvyy33z1pkvr41pfrywbs3157rj1fj2vfi"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + spotipy + pytube + rich + rapidfuzz + mutagen + ytmusicapi + tqdm + beautifulsoup4 + requests + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + pytest-vcr + pyfakefs + ]; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ]) + ]; + + meta = with lib; { + description = "Download your Spotify playlists and songs along with album art and metadata"; + homepage = "https://github.com/spotDL/spotify-downloader"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix index 169ef7309f..5ecdcc4e7e 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }: +{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: stdenv.mkDerivation rec { pname = "automysqlbackup"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp automysqlbackup $out/bin/ cp automysqlbackup.conf $out/etc/ - wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} + wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mariadb mailutils pbzip2 pigz bzip2 gzip ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix similarity index 98% rename from third_party/nixpkgs/pkgs/tools/backup/borg/default.nix rename to third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index f07b19830d..86eee2bc9a 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -66,6 +66,8 @@ python3.pkgs.buildPythonApplication rec { inherit (nixosTests) borgbackup; }; + outputs = [ "out" "doc" ]; + meta = with lib; { description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 399d6b9ada..24e1a2954e 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchurl , pythonPackages , librsync @@ -9,7 +8,6 @@ , par2cmdline , util-linux , rsync -, backblaze-b2 , makeWrapper , gettext }: @@ -34,19 +32,23 @@ pythonPackages.buildPythonApplication rec { # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch ] ++ lib.optionals stdenv.isLinux [ + # Broken on Linux in Nix' build environment ./linux-disable-timezone-test.patch ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ makeWrapper gettext pythonPackages.wrapPython + pythonPackages.setuptools-scm ]; buildInputs = [ librsync ]; - propagatedBuildInputs = with pythonPackages; [ + pythonPath = with pythonPackages; [ b2sdk boto boto3 diff --git a/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix new file mode 100644 index 0000000000..f236a80547 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub, lepton }: + +buildGoModule { + pname = "gb-backup"; + version = "unstable-2021-03-06"; + + src = fetchFromGitHub { + owner = "leijurv"; + repo = "gb"; + rev = "5a94e60148628fc7796d15c53d0ed87184322053"; + sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm"; + }; + + vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx"; + + buildInputs = [ lepton ]; + + meta = with lib; { + description = "Gamer Backup, a super opinionated cloud backup system"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ babbaj ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix index 94c7e71126..3d908dd24a 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium -, llvmPackages, clang, lzma +, llvmPackages, clang, xz , Security }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; - buildInputs = [ openssl libsodium lzma ] + buildInputs = [ openssl libsodium xz ] ++ (lib.optional stdenv.isDarwin Security); configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 69eeb3db71..b30a876370 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,11 +1,11 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute +, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ]; + binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute2 ]; in stdenv.mkDerivation rec { pname = "blueman"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] + gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix index 2804ed7a0b..8a57d483ab 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pbzx/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, lzma, xar}: +{stdenv, lib, fetchFromGitHub, xz, xar}: stdenv.mkDerivation rec { pname = "pbzx"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; }; - buildInputs = [ lzma xar ]; + buildInputs = [ xz xar ]; buildPhase = '' cc pbzx.c -llzma -lxar -o pbzx ''; diff --git a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix index 833dcae885..d0418ffdd6 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, lzma + , libarchive, xz }: stdenv.mkDerivation rec { baseName = "pixz"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 docbook_xml_dtd_45 docbook_xsl - libarchive lzma + libarchive xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" diff --git a/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix index e337ccdd4a..eb1f5d3570 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, xz, lzma }: +{ lib, stdenv, fetchgit, xz }: let name = "pxz"; version = "4.999.9beta+git"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; }; - buildInputs = [ lzma ]; + buildInputs = [ xz ]; patches = [ ./_SC_ARG_MAX.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/xar/default.nix b/third_party/nixpkgs/pkgs/tools/compression/xar/default.nix index 5d7c2b0922..32b6c6d005 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/xar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: +{ lib, stdenv, fetchurl, libxml2, xz, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 lzma openssl zlib bzip2 fts autoconf ]; + buildInputs = [ libxml2 xz openssl zlib bzip2 fts autoconf ]; prePatch = '' substituteInPlace configure.ac \ diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 2da5a725e7..6394ea3338 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "018zgigp5xlrb4mgshgrvns0cfbhhcg89cifbjj4rv6s3n9riphw"; + sha256 = "18alxnym54gswsmsr5ra82q4k1q5fyzsyx0jykb2sk2nkpvx7334"; }; nativeBuildInputs = [ cmake ] @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; patches = [ + # This patches makes sure we do not attempt to use the MD5 implementation + # of the host platform when running the tests ./playtests-darwin.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch b/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch index a98365eec3..f829c93c70 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch @@ -1,18 +1,28 @@ --- a/tests/playTests.sh +++ b/tests/playTests.sh -@@ -109,5 +109,2 @@ esac +@@ -112,17 +112,10 @@ case "$OS" in + esac + case "$UNAME" in - Darwin) MD5SUM="md5 -r" ;; - FreeBSD) MD5SUM="gmd5sum" ;; +- NetBSD) MD5SUM="md5 -n" ;; - OpenBSD) MD5SUM="md5" ;; *) MD5SUM="md5sum" ;; -@@ -116,5 +113,2 @@ esac + esac + MTIME="stat -c %Y" -case "$UNAME" in -- Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;; +- Darwin | FreeBSD | OpenBSD | NetBSD) MTIME="stat -f %m" ;; -esac -@@ -752,3 +746,2 @@ zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by de + DIFF="diff" + case "$UNAME" in +@@ -842,7 +835,6 @@ $MD5SUM dirTestDict/* > tmph1 + zstd -f --rm dirTestDict/* -D tmpDictC + zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by default case "$UNAME" in - Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5 *) $MD5SUM -c tmph1 ;; + esac + rm -rf dirTestDict \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index c55c1bc1c5..0e135d41a4 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.10.1"; + version = "5.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-E3nMcx/q5/RzrZ43yEW7+4czge9ns0Dxoi+8qaTaA0Q="; + sha256 = "sha256-1BlhsKkhYMgPiUrZoYgoIoicLh0ITL8+CLjCFKXPATc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix index 7b7eb7ba05..77c05a6166 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: # Common attributes of irods packages { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix index fe7a0d73f6..cbc9f19c66 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: let avro-cpp=avro-cpp_llvm; @@ -7,7 +7,7 @@ let common = import ./common.nix { inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson - zeromq openssl pam libiodbc kerberos gcc libcxx + zeromq openssl pam libiodbc libkrb5 gcc libcxx boost avro-cpp which catch2; }; in rec { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix index 7f92da6a22..66f7494415 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix @@ -2,7 +2,6 @@ , fetchurl , lz4 ? null , lz4Support ? false -, lzma , lzo , lib, stdenv , xz @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; - buildInputs = [ lzma lzo xz zlib ] + buildInputs = [ xz lzo xz zlib ] ++ lib.optional lz4Support lz4; patches = [ patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 322f57fdca..bb7df1aa94 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072"; + sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix new file mode 100644 index 0000000000..3602f8e31f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix @@ -0,0 +1,41 @@ +{ lib, rustPlatform, fetchFromGitHub +, clang, llvmPackages, pkg-config +, dbus, fuse, sqlite +}: + +rustPlatform.buildRustPackage rec { + pname = "supertag"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "amoffat"; + repo = pname; + rev = "v${version}"; + sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; + }; + + cargoSha256 = "1mzmp1jcxgn2swp52r9y7k09fk0z67i1qafzkkzlfxxd10vfr70v"; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + nativeBuildInputs = [ clang pkg-config ]; + buildInputs = [ dbus fuse sqlite ]; + + # The test are requiring extended permissions. + doCheck = false; + + meta = with lib; { + description = "A tag-based filesystem"; + longDescription = '' + Supertag is a tag-based filesystem, written in Rust, for Linux and MacOS. + It provides a tag-based view of your files by removing the hierarchy + constraints typically imposed on files and folders. In other words, it + allows you to think about your files not as objects stored in folders, but + as objects that can be filtered by folders. + ''; + homepage = "https://github.com/amoffat/supertag"; + license = licenses.agpl3Plus; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix index 009c5e05d5..85efb13b82 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "1schqzjx836jd54l10pqds7hyli2m77df3snk95xbr23dpj1fh70"; + sha256 = "0lxks616nmdk8zkdbwpq5sf9zz19smgy5rpmp3hpk2mvrl7kk70f"; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://xfs.org/"; description = "SGI XFS utilities"; - license = licenses.lgpl21; + license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright platforms = platforms.linux; maintainers = with maintainers; [ dezgeg ajs124 ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 34bb1b8cc3..30a3b9cc98 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, autoreconfHook, bison, glm, yacc, flex +, autoreconfHook, bison, glm, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3Packages @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { autoreconfHook bison flex - yacc + bison texinfo ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix index 977886e90e..000e2b2808 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango -, yacc, fetchpatch, xorg ? null, ApplicationServices }: +, bison, fetchpatch, xorg ? null, ApplicationServices }: let inherit (lib) optional optionals optionalString; @@ -37,7 +37,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + libpng libjpeg expat bison libtool fontconfig gd gts libdevil flex pango gettext ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) ++ optionals (stdenv.isDarwin) [ ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 1949f3f0da..ea82ccaf96 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkg-config, protobuf +{ lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: let diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix new file mode 100644 index 0000000000..02344d153d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromSourcehut +, writeText +, libinput +, libX11 +, conf ? null +, patches ? [ ] +}: + +stdenv.mkDerivation rec { + pname = "lisgd"; + version = "0.3.0"; + + src = fetchFromSourcehut { + owner = "~mil"; + repo = "lisgd"; + rev = version; + sha256 = "0g2pwff2c6ipxz83l26kx4rs3vah9qlm4h0n4x1k80mzqzf15hb6"; + }; + + inherit patches; + + postPatch = let + configFile = if lib.isDerivation conf || lib.isPath conf then + conf + else + writeText "config.def.h" conf; + in lib.optionalString (conf != null) '' + cp ${configFile} config.def.h + ''; + + buildInputs = [ + libinput + libX11 + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "Bind gestures via libinput touch events"; + homepage = "https://git.sr.ht/~mil/lisgd"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix index c0822b9e10..e839d9ef09 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/betterdiscordctl/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "betterdiscordctl"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${version}"; - sha256 = "0qpmm5l8jhm7k0kqblc0bnr9fl4b6z8iddhjar03bb4kqgr962fa"; + sha256 = "12c3phcfwl4p2jfh22ihm57vxw4nq5kwqirb7y4gzc91swfh5yj1"; }; - patches = [ - (fetchpatch { # Required till https://github.com/bb010g/betterdiscordctl/pull/67 is merged upstream. - url = "https://github.com/bb010g/betterdiscordctl/pull/67/commits/f1c7170fc2626d9aec4d244977b5a73c401aa1d4.patch"; - sha256 = "003zqd9ljb9h674sjwjvvdfs7q4cw0p1ydg3lax132vb4vz9k0zi"; - }) - ]; - preBuild = "sed -i 's/^nix=$/&yes/g;s/^DISABLE_UPGRADE=$/&yes/g' ./betterdiscordctl"; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 626e7de1a4..78a2dcb456 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.4"; + version = "2.0.8"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-jvit6Z0SwxjDmpEqojmPUJ3TVmVmW3RC+3tfvG1ev4Q="; + sha256 = "sha256-bGrGekZLystw3AvQP9bdFGlxteGCzwrhamaO8WLKf7U="; }; - vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA="; + vendorSha256 = "sha256-YU+t8GVsLYWONezUIB4NUrVxtYOmf/2b5v4v3VSYtBU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/clickclack/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clickclack/default.nix new file mode 100644 index 0000000000..75518e554c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/clickclack/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromSourcehut +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "clickclack"; + version = "0.1.1"; + + src = fetchFromSourcehut { + owner = "~proycon"; + repo = "clickclack"; + rev = version; + sha256 = "1q8r0ng1bld5n82gh7my7ck90f4plf8vf019hm2wz475dl38izd5"; + }; + + buildInputs = [ + SDL2 + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A vibration/audio feedback tool to be used with virtual keyboards"; + homepage = "https://git.sr.ht/~proycon/clickclack"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 131ce2774d..bfe5c5c504 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation (rec { sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh + # Depends on the mountpoints + sed '2i echo Skipping df df-symlink test && exit 77' -i ./tests/df/df-symlink.sh + # Some target platforms, especially when building inside a container have # issues with the inotify test. sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh @@ -103,8 +106,7 @@ stdenv.mkDerivation (rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) - && builtins.storeDir == "/nix/store"; + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl); # Prevents attempts of running 'help2man' on cross-built binaries. PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 1e2efc7f9c..1717b88f19 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-F/tKW81bAyYtwpxhl5XC8YyMB+6S0XmqqigwJY2WFDU="; }; + patches = [ + # Look for kernel modules in /run/booted-system/kernel-modules/lib/modules/* + ./nixos-paths.diff + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ i2c-tools udev libgudev diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff new file mode 100644 index 0000000000..e45eb88b51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/nixos-paths.diff @@ -0,0 +1,32 @@ +diff --git a/src/app_sysenv/query_sysenv_modules.c b/src/app_sysenv/query_sysenv_modules.c +index 59df64f1..fb244dd0 100644 +--- a/src/app_sysenv/query_sysenv_modules.c ++++ b/src/app_sysenv/query_sysenv_modules.c +@@ -50,7 +50,9 @@ bool is_module_loadable(char * module_name, int depth) { + g_snprintf(module_name_ko, 100, "%s.ko", module_name); + + char dirname[PATH_MAX]; +- g_snprintf(dirname, PATH_MAX, "/lib/modules/%s/kernel/drivers/i2c", utsbuf.release); ++ g_snprintf(dirname, PATH_MAX, ++ "/run/booted-system/kernel-modules/lib/modules/%s/kernel/drivers/i2c", ++ utsbuf.release); + + struct dirent *dent; + DIR *d; +diff --git a/src/util/linux_util.c b/src/util/linux_util.c +index 5eb8491c..3a129ccf 100644 +--- a/src/util/linux_util.c ++++ b/src/util/linux_util.c +@@ -29,8 +29,10 @@ bool is_module_builtin(char * module_name) + int rc = uname(&utsbuf); + assert(rc == 0); + +- char modules_builtin_fn[100]; +- snprintf(modules_builtin_fn, 100, "/lib/modules/%s/modules.builtin", utsbuf.release); ++ char modules_builtin_fn[PATH_MAX]; ++ snprintf(modules_builtin_fn, PATH_MAX, ++ "/run/booted-system/kernel-modules/lib/modules/%s/modules.builtin", ++ utsbuf.release); + + char ko_name[40]; + snprintf(ko_name, 40, "%s.ko", module_name); diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 9437ef12f4..086c1a2b54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "166"; + version = "171"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0="; + sha256 = "sha256-8PUFKwSWf84ics4w9yrCWMYgzzNF5z1kNn7LnksfCtA="; }; outputs = [ "out" "man" ]; @@ -70,6 +70,8 @@ python3Packages.buildPythonApplication rec { disabledTests = [ "test_android_manifest" "test_sbin_added_to_path" + "test_diff_meta" + "test_diff_meta2" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix index ee3573f9f4..076eb33fbb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM="; + sha256 = "sha256-aRXm31sGHvHPpqPck5+jplbWT52OzaiQIgU/C7llJs8="; }; - vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i"; + vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch b/third_party/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch new file mode 100644 index 0000000000..6fb494cdf5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/empty/0.6-Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 1fe4c41..2c69558 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ LIBS = -lutil + PREFIX = /usr/local + + all: +- ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c ++ ${CC} ${CFLAGS} -Wall -o empty empty.c ${LIBS} + + FreeBSD: all + NetBSD: all diff --git a/third_party/nixpkgs/pkgs/tools/misc/empty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/empty/default.nix new file mode 100644 index 0000000000..d8fa41ef02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/empty/default.nix @@ -0,0 +1,46 @@ +{ fetchzip, lib, stdenv, which }: + +stdenv.mkDerivation rec { + pname = "empty"; + version = "0.6.21b"; + + src = fetchzip { + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tgz"; + sha256 = "1rkixh2byr70pdxrwr4lj1ckh191rjny1m5xbjsa7nqw1fw6c2xs"; + stripRoot = false; + }; + + patches = [ + ./0.6-Makefile.patch + ]; + + nativeBuildInputs = [ which ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + rm empty + ''; + + meta = with lib; { + homepage = "http://empty.sourceforge.net"; + description = "A simple tool to automate interactive terminal applications"; + license = licenses.bsd3; + platforms = platforms.all; + longDescription = '' + The empty utility provides an interface to execute and/or interact with + processes under pseudo-terminal sessions (PTYs). This tool is definitely + useful in programming of shell scripts designed to communicate with + interactive programs like telnet, ssh, ftp, etc. In some cases empty can + be the simplest replacement for TCL/expect or other similar programming + tools because empty: + + - can be easily invoked directly from shell prompt or script + - does not use TCL, Perl, PHP, Python or anything else as an underlying language + - is written entirely in C + - has small and simple source code + - can easily be ported to almost all UNIX-like systems + ''; + maintainers = [ maintainers.djwf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix index 326a978f06..51873d479f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -4,15 +4,15 @@ rustPlatform.buildRustPackage rec { pname = "exa"; - version = "unstable-2021-01-14"; + version = "0.10.0"; - cargoSha256 = "1lmjh0grpnx20y6raxnxgjkr92h395r6jk8mm2ypc4cxpxczdqvl"; + cargoSha256 = "sha256-hslQZkmZ023gKxBbfgwqazBPUk0qWyy51uRJtr3QvWE="; src = fetchFromGitHub { owner = "ogham"; repo = pname; - rev = "13b91cced4cab012413b25c9d3e30c63548639d0"; - sha256 = "18y4v1s102lh3gvgjwdd66qlsr75wpwpcj8zsk5y5r95a405dkfm"; + rev = "v${version}"; + sha256 = "sha256-xolanu4zhAwsbSPdGKgY2/uHtP30DSpr/7Vv1z4jEnQ="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://the.exa.website"; license = licenses.mit; - maintainers = with maintainers; [ ehegnes lilyball globin ]; + maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index 2350fd6afe..71ed340d14 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-udHSyw7tf1toB+v67BvJ49INFJdNR2BjQuHEzQJyIoU="; + sha256 = "sha256-gwFX5c5y4bL+KhPDnvCbDco1ORYyqZYFsetMrmOATZU="; }; - cargoSha256 = "sha256-vVIanMkc0sPzu0L48oOh8wEEUOckR/AYkz81u4OR+fE="; + cargoSha256 = "sha256-2cs+5UL3tNfUzjlFIdsG05moiOktXSJOZJlgo/rZINw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix index 5d3259c4b6..de2b809eea 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -8,7 +8,7 @@ , libarchive , libconfuse , libsodium -, lzma +, xz , zlib , coreutils , dosfstools @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libarchive libconfuse libsodium - lzma + xz zlib ] ++ lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 035b6f6551..3cca3ab6dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -71,5 +71,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ]; platforms = platforms.unix; + changelog = "https://github.com/junegunn/fzf/blob/${version}/CHANGELOG.md"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 7ec9070290..8732ee66ef 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.161.1"; + version = "0.162.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hCb9w8jyHJ7wGszseyweJDAVjnuxErXdwIRUGfXLRfI="; + sha256 = "sha256-nhl6GATzFsfEQjKVxz65REn9QTvOH49omU00ZCfO6CY="; }; - vendorSha256 = "sha256-rQF9B5syexMzHji7zXSj7YVIJnOwMR0hzTrRzKCMGYw="; + vendorSha256 = "sha256-zq/RIOK/Hs1GJ2yLE7pe0UoDuR6LGUrPQAuQzrTvuKs="; buildFlagsArray = [ "-ldflags=" diff --git a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix index d58661babc..bef1e59e65 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.1.0"; + version = "1.2.0"; - cargoSha256 = "0kf2n2j7kfrfzid1h2gd0qf53fah0hpyrrlh2k5vrhd0panv3bwc"; + cargoSha256 = "sha256-EZnuGoysTZMpk2pndOzfXyRnN696RpKze27utQWNFTY="; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; + sha256 = "sha256-3M6wQB7+1MKPcxSvjDTNs33TrFjCEeFlbh1akwJHLLU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/i3minator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/i3minator/default.nix index 6e207ce691..4db029ef8f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/i3minator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, python3Packages, glibcLocales }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "i3minator"; version = "0.0.4"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ]; + propagatedBuildInputs = [ python3Packages.pyyaml python3Packages.i3-py ]; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index 97ee5b2ed3..1c7ab29cbc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -3,12 +3,13 @@ , lib, stdenv , fetchurl , makeWrapper +, nixosTests , jre }: with lib; -stdenv.mkDerivation rec { +let this = stdenv.mkDerivation rec { version = elk6Version; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; @@ -52,4 +53,12 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; -} + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-6; + } + ); +}; +in this diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index 0817a7ab08..1abc0ff9bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -3,12 +3,13 @@ , lib, stdenv , fetchurl , makeWrapper +, nixosTests , jre }: with lib; -stdenv.mkDerivation rec { +let this = stdenv.mkDerivation rec { version = elk7Version; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; @@ -52,4 +53,12 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; -} + passthru.tests = + optionalAttrs (!enableUnfree) ( + assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + { + elk = nixosTests.elk.ELK-7; + } + ); +}; +in this diff --git a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix index 6fdd4a69eb..2ab76e8dfd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20200929"; + version = "20210209"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk"; + sha256 = "sha256-6B8niOJiHyD4SBge8ssZrG0SMoaRQ38wFXSyU/2Jmgw="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix index 3fe8e3f387..39fd7d3e5f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-a0OyIONKtVWh9g/FZ6H0JSRuA1U48HSOX53G9z/h7t8="; + sha256 = "sha256-87x+MRQ1SjtN+wNCy42VJwlRwgQzHjNEK3J1bkvo7eQ="; }; # Substitute instead of wrapping because the resulting file is diff --git a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index cb3e8bd057..4ee1749c6d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 -, libxslt, libarchive, bzip2, lzma, json-glib, libsoup +, libxslt, libarchive, bzip2, xz, json-glib, libsoup }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 xz libsoup ]; meta = with lib; { description = "Tools for managing the osinfo database"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index dc013cfe19..53966705c2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -25,7 +25,7 @@ , libarchive , libcap , bzip2 -, yacc +, bison , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { gobject-introspection which makeWrapper - yacc + bison libxslt docbook-xsl-nons docbook_xml_dtd_42 diff --git a/third_party/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix index fc2c2c3d67..98d9ef2010 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ovh-ttyrec"; - version = "1.1.6.6"; + version = "1.1.6.7"; src = fetchFromGitHub { owner = "ovh"; repo = "ovh-ttyrec"; rev = "v${version}"; - sha256 = "176g3k2pzw6zpvmcc2f8idn6vhlygf7lfzxvrhysav2izc5dd130"; + sha256 = "sha256-OkSs0Cu79u53+fN57px48f6kJKuOJLjGUar+lLTdUJU="; }; nativeBuildInputs = [ zstd ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index ea49038724..25f96d3253 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.2"; + version = "1.2021.3"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-06PrqYf1Cc4FZPr0K2xUc83t+/qGbwMXe/BOV81Fuxc="; + sha256 = "sha256-Kx2fTx71oVkAgsytl1OFBcENMnJ1ZHmg8qvYDFTSS2M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix new file mode 100644 index 0000000000..40e5d4d23a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchpatch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "qmk"; + version = "0.0.45"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "43f297f36b21d68c34c5efa0ce1449dddb2e28753f80939cadf761ee7a2a0901"; + }; + + patches = [ + # https://github.com/qmk/qmk_cli/pull/48 + (fetchpatch { + name = "remove-unused-install-requires.patch"; + url = "https://github.com/qmk/qmk_cli/commit/75b6ada1feccfa5a9bc2bb07a4cc749ef40d02dd.patch"; + sha256 = "0lwi1dz35p07vha5gwq2jxm5q49vm99ix4jyhd6g6ypqbq1qiwc8"; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + milc + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "A program to help users work with QMK Firmware"; + homepage = "https://github.com/qmk/qmk_cli"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/quich/default.nix b/third_party/nixpkgs/pkgs/tools/misc/quich/default.nix new file mode 100644 index 0000000000..ea4fbc7eea --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/quich/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "quich"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "Usbac"; + repo = pname; + rev = "v${version}"; + sha256 = "1n9c01q2v6g9wnmxp248yclhp8cxclnj0yyn1qrvjsn6srcpr22c"; + }; + + doCheck = true; + + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with lib; { + description = "The advanced terminal calculator"; + longDescription = '' + Quich is a compact, fast, powerful and useful calculator for your terminal + with numerous features, supporting Windows and Linux Systems, + written in ANSI C. + ''; + homepage = "https://github.com/Usbac/quich"; + license = licenses.mit; + maintainers = [ maintainers.xdhampus ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix index 23ab5c16fb..ebe1f056f4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = "v${version}"; - sha256 = "sha256-gszvWetreafIP9I8hi9zz24TOTSsGzDsm/vXJS6n4Q4="; + sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4"; }; vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix index 37a60e714d..a410eaa923 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-xpanes"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "greymd"; repo = pname; rev = "v${version}"; - sha256 = "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0"; + sha256 = "sha256-e0dEkkEkColBQ0PgOQpoVbIkR3aVsrMZoSGbg4O11SU="; }; buildInputs = [ openssl perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index 4e5ca70b95..2043cfe101 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/share/bash-completion/completions cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux diff --git a/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix index c0c6fe9ec3..c46137bd9e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tz"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "oz"; repo = "tz"; rev = "v${version}"; - sha256 = "sha256-36nTau7xjABdeUOioHar28cuawFWW3DBaDH0YAvdufI="; + sha256 = "sha256-OwjhV3n1B1yQTNYm4VOW500t0524g85YYiOAAu9yPeo="; }; vendorSha256 = "sha256-Soa87I7oMa34LjYKxNAz9Limi0kQ6JUtb/zI4G7yZnw="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 8a04d07b65..b2d3883176 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc="; + sha256 = "sha256-dnswE/DU2jCfxWW10Ctjw8woktwWZqyd3E9IuKkle1M="; }; postPatch = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; + hash = "sha256-92BHPSVIPZLn399AcaJJjRq2WkxzDm8knKN3FIdAxAA="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index f207eda0de..04eb29ca1e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -1,41 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform -, openssl, pkg-config, protobuf -, Security, libiconv, rdkafka +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, protobuf +, Security +, libiconv +, rdkafka , tzdata - -, features ? - ((if stdenv.isAarch64 - then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] - else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]) - ++ - (lib.optional stdenv.targetPlatform.isUnix "unix") - ++ - [ "sinks" "sources" "transforms" ]) , coreutils , CoreServices +, features ? ([ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] + ++ (lib.optional stdenv.targetPlatform.isUnix "unix") + ++ [ "sinks" "sources" "transforms" ]) }: rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.10.0"; + version = "0.12.2"; src = fetchFromGitHub { - owner = "timberio"; - repo = pname; - rev = "v${version}"; - sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0"; + owner = "timberio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LutCzpJo47wvEze7bAObRVraNhVuQFc9NQ79NzKA9CM="; }; - cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc="; + cargoSha256 = "sha256-GU5p9DB5Bk8eQc1B/WA87grbVJVcT1ELJ0WzmRYgDzc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf rdkafka ] - ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library - PROTOC="${protobuf}/bin/protoc"; - PROTOC_INCLUDE="${protobuf}/include"; + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; - cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; + cargoBuildFlags = [ "--no-default-features" "--features" (lib.concatStringsSep "," features) ]; checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1"; # recent overhauls of DNS support in 0.9 mean that we try to resolve @@ -49,19 +50,21 @@ rustPlatform.buildRustPackage rec { # nor do I know why it depends on rustc. # However, in order for the closure size to stay at a reasonable level, # transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for. - patchPhase = '' + postPatch = '' substituteInPlace ./src/dns.rs \ - --replace "#[test]" "" + --replace "#[tokio::test]" "" ${lib.optionalString (!builtins.elem "transforms-geoip" features) '' substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' "" ''} ''; + passthru = { inherit features; }; + meta = with lib; { description = "A high-performance logs, metrics, and events router"; - homepage = "https://github.com/timberio/vector"; - license = with licenses; [ asl20 ]; + homepage = "https://github.com/timberio/vector"; + license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice happysalada ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 9ee81cd1b1..818ad5ec64 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20201022"; + version = "20210212"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp"; + sha256 = "sha256-0JnigYmslQ/7KsQAFg3AaWPAU/tD1lS7lF6OCcv/ze4="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 8586897789..8afd978656 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/third_party/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.03.25"; + version = "2021.04.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3"; + sha256 = "1vw9l32bv115129v1lfar626y3vivvxkp36bc1phjcrsjfayz67h"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index df369147d3..6129fd4b9d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-286rN3g6leSnbZZ0VjWl43nhBAMPJDUMv7DhgVTsjKw="; + sha256 = "09az557479d3s1my46d2w86ndkvs2xi127kaw0csag0wlq2qq10p"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch index 13e57abb49..db7d4b40fc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch @@ -1,13 +1,13 @@ diff --git a/ytfzf b/ytfzf -index f7871c7..179c836 100755 +index 42f41c0..f75f5cb 100755 --- a/ytfzf +++ b/ytfzf -@@ -829,23 +829,8 @@ send_notify () { +@@ -892,23 +892,8 @@ send_notify () { } update_ytfzf () { -- local branch="$1" -- local updatefile="/tmp/ytfzf-update" +- branch="$1" +- updatefile="/tmp/ytfzf-update" - curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" - - if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then diff --git a/third_party/nixpkgs/pkgs/tools/networking/ddclient/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ddclient/default.nix index 51454ac119..f62eba66f9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ddclient/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, iproute, perl }: +{ lib, fetchurl, perlPackages, iproute2, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; @@ -19,8 +19,8 @@ perlPackages.buildPerlPackage rec { touch Makefile.PL substituteInPlace ddclient \ --replace 'in the output of ifconfig' 'in the output of ip addr show' \ - --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ - --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \ + --replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \ + --replace 'ifconfig $arg' '${iproute2}/sbin/ip addr show $arg' \ --replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix index 751dd2c8c1..08b3543c5c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cp client/scripts/linux $out/sbin/dhclient-script substituteInPlace $out/sbin/dhclient-script \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \ "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 5bc56b9e03..cc1bad106f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://roy.marples.name/cgit/dhcpcd.git/patch/?id=114870290a8d3d696bc4049c32eef3eed03d6070"; + name = "?id=114870290a8d3d696bc4049c32eef3eed03d6070"; + url = "https://roy.marples.name/git/dhcpcd/commitdiff_plain/114870290a8d3d696bc4049c32eef3eed03d6070"; sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb"; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index d8f4285e0b..a9e4b1390a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch -, libidn, libnetfilter_conntrack }: +, libidn, libnetfilter_conntrack, buildPackages }: with lib; let @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" "MANDIR=$(out)/man" "LOCALEDIR=$(out)/share/locale" + "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index 671a80e578..bb63e05c0e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.5.0"; + version = "2.5.2"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "0wcjs512in9w36hbn4mffca02cn5df3s1x7zaj02qv8na5nqq11m"; + sha256 = "0dzi28z7hnyxbibwdsalvd93czf4d5pgmvrbn6hlh52znsn40gbb"; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 318a56df6f..8a124c978f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-1IG1AKMz6WzDDbdZnSaAS4HHlPApCG1qND7xJcQ97Hk="; + sha256 = "sha256-/aezkwg/BVyNZQ9Vb6rz0OcD9kzjGRMxFvDeFtwr71Y="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvpe/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gvpe/default.nix index 788d61e9ca..59748f6f96 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gvpe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gvpe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: +{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }: stdenv.mkDerivation rec { pname = "gvpe"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C + sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix index 27c2a145a6..be4a8f2a16 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, curl, pythonPackages, glibcLocales }: +{ lib, fetchFromGitHub, curl, python3Packages, glibcLocales }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "httpstat"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 92465a9fc7..7f27efc873 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-f1ew2i/tgRdIAo/oOgFIFquKve+ImRzqoZqmlzfwpz8="; + sha256 = "sha256-//ootg0RZR2vzO702jGXuJ5qGMO49GSG0Lw6dKzGGt8="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix index 3546e1aa11..1059baf13e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, - bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python, + bash, iproute2, iptables, procps, coreutils, gnused, gawk, nss, which, python3, docs ? false, xmlto, libselinux, ldns }: let binPath = lib.makeBinPath [ - bash iproute iptables procps coreutils gnused gawk nss.tools which python + bash iproute2 iptables procps coreutils gnused gawk nss.tools which python3 ]; in @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3"; }; + strictDeps = true; + # These flags were added to compile v3.18. Try to lift them when updating. NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" # these flags were added to build with gcc7 @@ -35,9 +37,15 @@ stdenv.mkDerivation rec { "-DNSS_PKCS11_2_0_COMPAT=1" ]; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent - libcap_ng curl nspr nss python ldns ] + nativeBuildInputs = [ + bison + flex + makeWrapper + pkg-config + ]; + + buildInputs = [ bash iproute2 iptables systemd coreutils gnused gawk gmp unbound pam libevent + libcap_ng curl nspr nss python3 ldns ] ++ lib.optional docs xmlto ++ lib.optional stdenv.isLinux libselinux; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 6c1f454ca8..74d4b61064 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools + gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi gss libmysqlclient python3 - ]; + ] ++ lib.optionals stdenv.isLinux [ nettools ]; patches = [ ./fix-build-mb-len-max.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/maxscale/default.nix b/third_party/nixpkgs/pkgs/tools/networking/maxscale/default.nix index c4e16ef8b1..bef421a7ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/maxscale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/maxscale/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc -, bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient +, bison, curl, flex, gperftools, jansson, jemalloc, libkrb5, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - bison curl flex gperftools jansson jemalloc kerberos lua libmysqlclient + bison curl flex gperftools jansson jemalloc libkrb5 lua libmysqlclient ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl libaio libedit libtool libui libuuid zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix index 9642f25483..05b04cf948 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, iptables, libuuid, pkg-config -, which, iproute, gnused, coreutils, gawk, makeWrapper +, which, iproute2, gnused, coreutils, gawk, makeWrapper }: let - scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; + scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { name = "miniupnpd-2.1.20190502"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/miredo/default.nix b/third_party/nixpkgs/pkgs/tools/networking/miredo/default.nix index 48b6f5dc4c..94565db207 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/miredo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/miredo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettools, iproute, judy }: +{ lib, stdenv, fetchurl, nettools, iproute2, judy }: stdenv.mkDerivation rec { version = "1.2.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { substituteInPlace misc/client-hook.bsd \ --replace '/sbin/route' '${nettools}/bin/route' \ --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' - substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip' + substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip' ''; configureFlags = [ "--with-Judy" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix new file mode 100644 index 0000000000..95140467f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix @@ -0,0 +1,34 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "moodle-dl"; + version = "2.1.2.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1gc4037dwyi48h4vi0bam23rr7pfyn6jrz334radz0r6rk94y8lz"; + }; + + # nixpkgs (and the GitHub upstream for readchar) are missing 2.0.1 + postPatch = '' + substituteInPlace setup.py --replace 'readchar>=2.0.1' 'readchar>=2.0.0' + ''; + + propagatedBuildInputs = with python3Packages; [ + sentry-sdk + colorama + readchar + youtube-dl + certifi + html2text + requests + slixmpp + ]; + + meta = with lib; { + homepage = "https://github.com/C0D3D3V/Moodle-Downloader-2"; + maintainers = [ maintainers.kmein ]; + description = "A Moodle downloader that downloads course content fast from Moodle"; + license = licenses.gpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix index a4737d6baa..e7d984a798 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netboot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, yacc, lzo, db4 }: +{ lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { name = "netboot-0.10.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; - buildInputs = [ yacc lzo db4 ]; + buildInputs = [ bison lzo db4 ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch deleted file mode 100644 index 60ee437f6f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c -index ace205e80..f19c1dea0 100644 ---- a/clients/common/nm-polkit-listener.c -+++ b/clients/common/nm-polkit-listener.c -@@ -552,7 +552,7 @@ begin_authentication (AuthRequest *request) - { - int fd_flags; - const char *helper_argv[] = { -- POLKIT_PACKAGE_PREFIX "/lib/polkit-1/polkit-agent-helper-1", -+ "/run/wrappers/bin/polkit-agent-helper-1", - request->username, - NULL, - }; -diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 74ff52bb2..638857df4 100644 ---- a/clients/common/nm-vpn-helpers.c -+++ b/clients/common/nm-vpn-helpers.c -@@ -213,10 +213,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host, - NULL, - }; - -- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, -- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); -- if (!path) -- return FALSE; -+ path = "@openconnect@/bin/openconnect"; - - if (!g_spawn_sync (NULL, - (char **) NM_MAKE_STRV (path, "--authenticate", host), -diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules -index e398cb9f2..a43d61864 100644 ---- a/data/84-nm-drivers.rules -+++ b/data/84-nm-drivers.rules -@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" - # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) - ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" - DRIVERS=="?*", GOTO="nm_drivers_end" --PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" -+PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" - - LABEL="nm_drivers_end" -diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 91ebd9a36..5201a56c3 100644 ---- a/data/NetworkManager.service.in -+++ b/data/NetworkManager.service.in -@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ - [Service] - Type=dbus - BusName=org.freedesktop.NetworkManager --ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0 -+ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0 - #ExecReload=/bin/kill -HUP $MAINPID - ExecStart=@sbindir@/NetworkManager --no-daemon - Restart=on-failure -diff --git a/libnm/meson.build b/libnm/meson.build -index d3991ab19..58f01c666 100644 ---- a/libnm/meson.build -+++ b/libnm/meson.build -@@ -283,7 +283,6 @@ if enable_introspection - output: 'nm-settings-docs-gir.xml', - command: [ - generate_setting_docs_env, -- python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', -diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index de09e4807..2755db165 100644 ---- a/src/devices/nm-device.c -+++ b/src/devices/nm-device.c -@@ -13705,14 +13705,14 @@ nm_device_start_ip_check (NMDevice *self) - gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); - if (gw) { - _nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); -- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL); -+ ping_binary = "@iputils@/bin/ping"; - log_domain = LOGD_IP4; - } - } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { - gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); - if (gw) { - _nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); -- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL); -+ ping_binary = "@iputils@/bin/ping"; - log_domain = LOGD_IP6; - } - } -diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c -index 3950c3c3a..a9436d75a 100644 ---- a/src/nm-core-utils.c -+++ b/src/nm-core-utils.c -@@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char * - - /* construct the argument list */ - argv = g_ptr_array_sized_new (4); -- g_ptr_array_add (argv, "/sbin/modprobe"); -+ g_ptr_array_add (argv, "@kmod@/bin/modprobe"); - g_ptr_array_add (argv, "--use-blacklist"); - g_ptr_array_add (argv, (char *) arg1); - diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/default.nix similarity index 98% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/default.nix index d7dd99b58f..757c886fdf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/default.nix @@ -3,7 +3,7 @@ , libgcrypt, perl, libgudev, avahi, ppp, kmod }: stdenv.mkDerivation rec { - pname = "network-manager"; + pname = "networkmanager"; version = "0.9.8.10"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/applet/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 88e50579dc..ba172a3922 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -9,12 +9,12 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { - pname = "network-manager"; - version = "1.26.0"; + pname = "networkmanager"; + version = "1.30.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj"; + sha256 = "1yf3k3pcszn904lk6rdya1qhp3yxbzsbhcd9l6yfrhlbc8r15w1r"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -45,6 +45,7 @@ in stdenv.mkDerivation rec { "-Ddocs=true" "-Dtests=no" "-Dqt=false" + "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1" # Allow using iwd when configured to do so "-Diwd=true" "-Dlibaudit=yes-disabled-by-default" @@ -55,20 +56,13 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit iputils kmod openconnect ethtool gnused systemd polkit; + inherit iputils kmod openconnect ethtool gnused systemd; inherit runtimeShell; }) # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch - - # Fix build - # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/620 - (fetchpatch { - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/54e25f23f53af889703dfc50d51a8afeeea8a439.patch"; - sha256 = "oy/AZhOC15anWeIMYJfDBcITqJ7CiU715he68XvPRxk="; - }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/dmenu/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/fix-install-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-install-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/fix-install-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-install-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch new file mode 100644 index 0000000000..cb9d3c3a0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -0,0 +1,92 @@ +diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c +index 15c47c3ec..4d1913aa6 100644 +--- a/clients/common/nm-vpn-helpers.c ++++ b/clients/common/nm-vpn-helpers.c +@@ -208,15 +208,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host, + NULL, + }; + +- path = nm_utils_file_search_in_paths("openconnect", +- "/usr/sbin/openconnect", +- DEFAULT_PATHS, +- G_FILE_TEST_IS_EXECUTABLE, +- NULL, +- NULL, +- error); +- if (!path) +- return FALSE; ++ path = "@openconnect@/bin/openconnect"; + + if (!g_spawn_sync(NULL, + (char **) NM_MAKE_STRV(path, "--authenticate", host), +diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules +index e398cb9f2..a43d61864 100644 +--- a/data/84-nm-drivers.rules ++++ b/data/84-nm-drivers.rules +@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" + # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) + ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" + DRIVERS=="?*", GOTO="nm_drivers_end" +-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" + + LABEL="nm_drivers_end" +diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in +index 91ebd9a36..5201a56c3 100644 +--- a/data/NetworkManager.service.in ++++ b/data/NetworkManager.service.in +@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ + [Service] + Type=dbus + BusName=org.freedesktop.NetworkManager +-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0 ++ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0 + #ExecReload=/bin/kill -HUP $MAINPID + ExecStart=@sbindir@/NetworkManager --no-daemon + Restart=on-failure +diff --git a/libnm/meson.build b/libnm/meson.build +index d0846419c..a7adb2cc6 100644 +--- a/libnm/meson.build ++++ b/libnm/meson.build +@@ -280,7 +280,6 @@ if enable_introspection + output: 'nm-settings-docs-gir.xml', + command: [ + generate_setting_docs_env, +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), + '--lib-path', meson.current_build_dir(), + '--gir', '@INPUT@', +diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c +index 040dd0b4d..98aea3aa9 100644 +--- a/src/core/devices/nm-device.c ++++ b/src/core/devices/nm-device.c +@@ -13957,14 +13957,14 @@ nm_device_start_ip_check(NMDevice *self) + gw = nm_ip4_config_best_default_route_get(priv->ip_config_4); + if (gw) { + _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); +- ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL); ++ ping_binary = "@iputils@/bin/ping"; + log_domain = LOGD_IP4; + } + } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { + gw = nm_ip6_config_best_default_route_get(priv->ip_config_6); + if (gw) { + _nm_utils_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf); +- ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL); ++ ping_binary = "@iputils@/bin/ping"; + log_domain = LOGD_IP6; + } + } +diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c +index 9075c30dd..4b140e92b 100644 +--- a/src/core/nm-core-utils.c ++++ b/src/core/nm-core-utils.c +@@ -333,7 +333,7 @@ nm_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *a + + /* construct the argument list */ + argv = g_ptr_array_sized_new(4); +- g_ptr_array_add(argv, "/sbin/modprobe"); ++ g_ptr_array_add(argv, "@kmod@/bin/modprobe"); + g_ptr_array_add(argv, "--use-blacklist"); + g_ptr_array_add(argv, (char *) arg1); + diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/iodine/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/iodine/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/iodine/fix-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/openconnect/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/openvpn/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/sstp/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/tray.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/tray.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/tray.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/tray.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/vpnc/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/default.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch rename to third_party/nixpkgs/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 9420f77e61..1319e7997d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoconf, automake, libtool, pkg-config -, bzip2, libpcap, flex, yacc }: +, bzip2, libpcap, flex, bison }: let version = "1.6.22"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; }; - nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; + nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; buildInputs = [ bzip2 libpcap ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 0f886fda03..48c2064358 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "047mncv9abs4xj7bh9lhc3wan37cldjjyrpkis7pvx6zhzml74kf"; + sha256 = "sha256-UD67xYBb1rvGMSPurte5z2Hcd7+JtXDPbgp3BVBdLuk="; }; - vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp"; + vendorSha256 = "sha256-d+YE618OywSDOWiiULHENFEqzRmFVUFKPuPXnL1JubM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix new file mode 100644 index 0000000000..55babb4ca2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -0,0 +1,122 @@ +{ pname +, version +, extraDesc ? "" +, src +, extraPatches ? [] +, extraNativeBuildInputs ? [] +, extraMeta ? {} +}: + +{ lib, stdenv +# This *is* correct, though unusual. as a way of getting krb5-config from the +# package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606 +, pkgs +, fetchurl +, fetchpatch +, zlib +, openssl +, libedit +, pkg-config +, pam +, etcDir ? null +, withKerberos ? true +, libkrb5 +, libfido2 +, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl +, linkOpenssl ? true +}: + +with lib; +stdenv.mkDerivation rec { + inherit pname version src; + + patches = [ + ./locale_archive.patch + + # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 + ./dont_create_privsep_path.patch + ] ++ extraPatches; + + postPatch = + # On Hydra this makes installation fail (sometimes?), + # and nix store doesn't allow such fancy permission bits anyway. + '' + substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' + ''; + + nativeBuildInputs = [ pkg-config ] + # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is + # needed here to access krb5-config in order to cross compile. See: + # https://github.com/NixOS/nixpkgs/pull/107606 + ++ optional withKerberos pkgs.libkrb5 + ++ extraNativeBuildInputs; + buildInputs = [ zlib openssl libedit ] + ++ optional withFIDO libfido2 + ++ optional withKerberos libkrb5 + ++ optional stdenv.isLinux pam; + + preConfigure = '' + # Setting LD causes `configure' and `make' to disagree about which linker + # to use: `configure' wants `gcc', but `make' wants `ld'. + unset LD + '' + # Upstream build system does not support static build, so we fall back + # on fragile patching of configure script. + # + # libedit is found by pkg-config, but without --static flag, required + # to get also transitive dependencies for static linkage, hence sed + # expression. + # + # Kerberos can be found either by krb5-config or by fall-back shell + # code in openssh's configure.ac. Neither of them support static + # build, but patching code for krb5-config is simpler, so to get it + # into PATH, libkrb5.dev is added into buildInputs. + + optionalString stdenv.hostPlatform.isStatic '' + sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure + sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure + sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure + ''; + + # I set --disable-strip because later we strip anyway. And it fails to strip + # properly when cross building. + configureFlags = [ + "--sbindir=\${out}/bin" + "--localstatedir=/var" + "--with-pid-dir=/run" + "--with-mantype=man" + "--with-libedit=yes" + "--disable-strip" + (if stdenv.isLinux then "--with-pam" else "--without-pam") + ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" + ++ optional withFIDO "--with-security-key-builtin=yes" + ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") + ++ optional stdenv.isDarwin "--disable-libutil" + ++ optional (!linkOpenssl) "--without-openssl"; + + buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; + + enableParallelBuilding = true; + + hardeningEnable = [ "pie" ]; + + postInstall = '' + # Install ssh-copy-id, it's very useful. + cp contrib/ssh-copy-id $out/bin/ + chmod +x $out/bin/ssh-copy-id + cp contrib/ssh-copy-id.1 $out/share/man/man1/ + ''; + + installTargets = [ "install-nokeys" ]; + installFlags = [ + "sysconfdir=\${out}/etc/ssh" + ]; + + meta = { + description = "An implementation of the SSH protocol${extraDesc}"; + homepage = "https://www.openssh.com/"; + changelog = "https://www.openssh.com/releasenotes.html"; + license = licenses.bsd2; + platforms = platforms.unix ++ platforms.windows; + maintainers = with maintainers; [ eelco aneeshusa ]; + } // extraMeta; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index 17a227c496..3ea35daaeb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -1,141 +1,71 @@ -{ lib, stdenv -, pkgs -, fetchurl -, fetchpatch -, zlib -, openssl -, libedit -, pkg-config -, pam -, autoreconfHook -, etcDir ? null -, hpnSupport ? false -, withKerberos ? true -, withGssapiPatches ? false -, kerberos -, libfido2 -, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl -, linkOpenssl ? true -}: - +{ callPackage, fetchurl, fetchpatch, autoreconfHook }: let + common = opts: callPackage (import ./common.nix opts) {}; +in { - version = "8.4p1"; + openssh = common rec { + pname = "openssh"; + version = "8.5p1"; - # **please** update this patch when you update to a new openssh release. - gssapiPatch = fetchpatch { - name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch"; - sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2"; + src = fetchurl { + url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; + sha256 = "09gc8rv7728chxraab85dzkdikaw4aph1wlcwcc9kai9si0kybzm"; + }; + + extraPatches = [ ./ssh-keysign-8.5.patch ]; }; -in -with lib; -stdenv.mkDerivation rec { - pname = "openssh"; - inherit version; + openssh_hpn = common rec { + pname = "openssh-with-hpn"; + version = "8.4p1"; + extraDesc = " with high performance networking patches"; - src = if hpnSupport then - fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; - } - else - fetchurl { - url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; - sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as"; - }; + src = fetchurl { + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; + sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; + }; - patches = - [ - ./locale_archive.patch - - # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 - ./dont_create_privsep_path.patch - - ./ssh-keysign.patch + extraPatches = [ + ./ssh-keysign-8.4.patch # See https://github.com/openssh/openssh-portable/pull/206 ./ssh-copy-id-fix-eof.patch - ] - ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); + ]; - postPatch = - # On Hydra this makes installation fail (sometimes?), - # and nix store doesn't allow such fancy permission bits anyway. - '' - substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' - ''; + extraNativeBuildInputs = [ autoreconfHook ]; - nativeBuildInputs = [ pkg-config ] - ++ optional (hpnSupport || withGssapiPatches) autoreconfHook - ++ optional withKerberos pkgs.kerberos.dev; - buildInputs = [ zlib openssl libedit pam ] - ++ optional withFIDO libfido2 - ++ optional withKerberos kerberos; + extraMeta.knownVulnerabilities = [ + "CVE-2021-28041" + ]; + }; - preConfigure = '' - # Setting LD causes `configure' and `make' to disagree about which linker - # to use: `configure' wants `gcc', but `make' wants `ld'. - unset LD - '' - # Upstream build system does not support static build, so we fall back - # on fragile patching of configure script. - # - # libedit is found by pkg-config, but without --static flag, required - # to get also transitive dependencies for static linkage, hence sed - # expression. - # - # Kerberos can be found either by krb5-config or by fall-back shell - # code in openssh's configure.ac. Neither of them support static - # build, but patching code for krb5-config is simpler, so to get it - # into PATH, kerberos.dev is added into buildInputs. - + optionalString stdenv.hostPlatform.isStatic '' - sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure - sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure - sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure - ''; + openssh_gssapi = common rec { + pname = "openssh-with-gssapi"; + version = "8.4p1"; + extraDesc = " with GSSAPI support"; - # I set --disable-strip because later we strip anyway. And it fails to strip - # properly when cross building. - configureFlags = [ - "--sbindir=\${out}/bin" - "--localstatedir=/var" - "--with-pid-dir=/run" - "--with-mantype=man" - "--with-libedit=yes" - "--disable-strip" - (if pam != null then "--with-pam" else "--without-pam") - ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withFIDO "--with-security-key-builtin=yes" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") - ++ optional stdenv.isDarwin "--disable-libutil" - ++ optional (!linkOpenssl) "--without-openssl"; + src = fetchurl { + url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; + sha256 = "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as"; + }; - buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; + extraPatches = [ + ./ssh-keysign-8.4.patch - enableParallelBuilding = true; + # See https://github.com/openssh/openssh-portable/pull/206 + ./ssh-copy-id-fix-eof.patch - hardeningEnable = [ "pie" ]; + (fetchpatch { + name = "openssh-gssapi.patch"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch"; + sha256 = "1z1ckzimlkm1dmr9f5fqjnjg28gsqcwx6xka0klak857548d2lp2"; + }) + ]; - postInstall = '' - # Install ssh-copy-id, it's very useful. - cp contrib/ssh-copy-id $out/bin/ - chmod +x $out/bin/ssh-copy-id - cp contrib/ssh-copy-id.1 $out/share/man/man1/ - ''; + extraNativeBuildInputs = [ autoreconfHook ]; - installTargets = [ "install-nokeys" ]; - installFlags = [ - "sysconfdir=\${out}/etc/ssh" - ]; - - meta = { - description = "An implementation of the SSH protocol"; - homepage = "https://www.openssh.com/"; - changelog = "https://www.openssh.com/releasenotes.html"; - license = lib.licenses.bsd2; - platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ eelco aneeshusa ]; + extraMeta.knownVulnerabilities = [ + "CVE-2021-28041" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch b/third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign-8.4.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign.patch rename to third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign-8.4.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign-8.5.patch b/third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign-8.5.patch new file mode 100644 index 0000000000..67c45b6b7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/ssh-keysign-8.5.patch @@ -0,0 +1,24 @@ +diff --git a/pathnames.h b/pathnames.h +index cb44caa4..354fdf05 100644 +--- a/pathnames.h ++++ b/pathnames.h +@@ -124,7 +124,7 @@ + + /* Location of ssh-keysign for hostbased authentication */ + #ifndef _PATH_SSH_KEY_SIGN +-#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" ++#define _PATH_SSH_KEY_SIGN "ssh-keysign" + #endif + + /* Location of ssh-pkcs11-helper to support keys in tokens */ +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -2021,7 +2021,7 @@ + + debug3_f("[child] pid=%ld, exec %s", + (long)getpid(), _PATH_SSH_KEY_SIGN); +- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); ++ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); + fatal_f("exec(%s): %s", _PATH_SSH_KEY_SIGN, + strerror(errno)); + } diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix index dd5fa9cbed..6b98df2150 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -3,7 +3,7 @@ , pkg-config , makeWrapper , runtimeShell -, iproute +, iproute2 , lzo , openssl , pam @@ -40,13 +40,13 @@ let buildInputs = [ lzo openssl ] ++ optional stdenv.isLinux pam - ++ optional withIpRoute iproute + ++ optional withIpRoute iproute2 ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optionals withIpRoute [ "--enable-iproute2" - "IPROUTE=${iproute}/sbin/ip" + "IPROUTE=${iproute2}/sbin/ip" ] ++ optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" @@ -60,7 +60,7 @@ let '' + optionalString useSystemd '' install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]} + --prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]} ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 9d8e669fe4..5a34d5a7ff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper -, iproute, systemd, coreutils, util-linux }: +, iproute2, systemd, coreutils, util-linux }: stdenv.mkDerivation rec { pname = "update-systemd-resolved"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' wrapProgram $out/libexec/openvpn/update-systemd-resolved \ - --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]} + --prefix PATH : ${lib.makeBinPath [ iproute2 systemd coreutils util-linux ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix index 1534d1083f..7af9e324f2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, ppp, iproute }: +{ lib, stdenv, fetchurl, perl, ppp, iproute2 }: stdenv.mkDerivation rec { pname = "pptp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \ BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ PPPDIR=$out/etc/ppp ) ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 27b8197f4c..54c5701b8e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.9.2"; + version = "1.10.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1mqxfw21ilcy0gc2jrn5f385y3g9inabp9fjc39m5ydljja4g5b9"; + sha256 = "155v63v0wf0ky5nl2f1dvky8n9pdk40l1lqyz8l1i1kjcvvcmj26"; }; - cargoSha256 = "1ja2hcsa2wa0zmblz4ps35jcx1y29j469lf4i9a7sw0kgh3xp1ha"; + cargoSha256 = "1vb6kis54g4lfc9d0h1961dclaqhq019iw509ydcsa1n7bp25caq"; RUSTC_BOOTSTRAP = 1; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix index 2456a76072..f95fc9d92b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix @@ -3,7 +3,7 @@ , fetchurl , gnugrep , gnused -, iproute +, iproute2 , ipset , iptables , perl @@ -15,7 +15,7 @@ let PATH = lib.concatStringsSep ":" [ "${coreutils}/bin" - "${iproute}/bin" + "${iproute2}/bin" "${iptables}/bin" "${ipset}/bin" "${ebtables}/bin" @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils - iproute + iproute2 ipset iptables ebtables diff --git a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix index d65f4fae30..affe6577eb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools ,supportOpenstack ? true }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { done '' + optionalString supportOpenstack '' # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix index e93435515b..93fb6e1e35 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "2.4.17"; + version = "2.4.19"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://repo1.maven.org/maven2/io/swagger/${pname}-cli/${version}/${jarfilename}"; - sha256 = "06xx42ayh4xqpr71lq1hj7kv1v6m9ld9jm1d15fhs935zqckv32a"; + sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index 232e049e45..3c28133a2d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "18dj7migq6379hps59793457l81s3z7dll3y0fj6qcmhjlx08m59"; + sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 7515105948..5181216e1c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.36.2"; + version = "4.37.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1gvzr4kq4klld8m0jv6mizgrx3xj6s2i69kl9vmh5n355bakb7kk"; + sha256 = "00bw91n7210gsnc7bw2spl6k1yl2i7d1j55w98qf4rvn80z9d59r"; }; - vendorSha256 = "sha256-8O0xUNIdu3W//LtwiMZlSs1wkpa6Jt+vFkTavz6TBKU="; + vendorSha256 = "sha256-sc001qWdmhhaUh0nmvaqwwVE2Ee8IFWYi4K8aAURWBE="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202103170314"; - geoipSha256 = "147kajdhby92yxsvcpa6bpk11ilzvc4nj7rc0h84wp2f0y692kq2"; + geoipRev = "202104010913"; + geoipSha256 = "1kq6d68ii9hr2w0caxacqh5q8jran154b99aik4g7ripgx7lckpr"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210317031429"; - geositeSha256 = "0nzd0ll0x7hv75cbh1i3kgmffasi002a8n3mjw22zywj71v2jwmz"; + geositeRev = "20210403111045"; + geositeSha256 = "1b64yci0dmvw9divfv3njpzczz2ag3cnvyr29c2mk8y85vp05ysc"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/third_party/nixpkgs/pkgs/tools/networking/vtun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vtun/default.nix index af4cc0fe2e..4d79fdc9bc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vtun/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vtun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }: +{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }: stdenv.mkDerivation rec { name = "vtun-3.0.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in sed -i '/strip/d' Makefile.in ''; - buildInputs = [ lzo openssl zlib yacc flex ]; + buildInputs = [ lzo openssl zlib bison flex ]; configureFlags = [ "--with-lzo-headers=${lzo}/include/lzo" diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix index 1537da3616..3fd40f8a7b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix @@ -17,7 +17,7 @@ , libhsts , libidn2 , libpsl -, lzma +, xz , nghttp2 , sslSupport ? true , openssl @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ]; - buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl lzma nghttp2 pcre2 zlib zstd ] + buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl xz nghttp2 pcre2 zlib zstd ] ++ lib.optional sslSupport openssl; # TODO: include translation files diff --git a/third_party/nixpkgs/pkgs/tools/networking/wicd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wicd/default.nix index 7e702c0559..e4eb0a2cdc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wicd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wicd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute, iputils }: +, nettools, openresolv, iproute2, iputils }: let inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute2 ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index efb5b5c5b4..8bdcd8708d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -3,7 +3,7 @@ , fetchzip , nixosTests , iptables -, iproute +, iproute2 , makeWrapper , openresolv , procps @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin '' + lib.optionalString stdenv.isLinux '' for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]} done '' + lib.optionalString stdenv.isDarwin '' for f in $out/bin/*; do diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 04711b3d86..60da9b3abc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: +{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }: stdenv.mkDerivation rec { pname = "zerotierone"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ronn ]; - buildInputs = [ openssl lzo zlib iproute ]; + buildInputs = [ openssl lzo zlib iproute2 ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix index 178103cdb3..86982bf7f3 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, cmake, perlPackages, curl, gtest -, gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev +, gnutls, libtasn1, xz, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 # used when WITH_DOC=ON @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake gtest libxslt.bin ]; buildInputs = [ - perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg + perlPackages.perl curl gnutls libtasn1 xz bzip2 lz4 zstd libseccomp udev db dpkg ] ++ lib.optionals withDocs [ doxygen perlPackages.Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index 4a8cd9a1c6..c54a5b28ce 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -16,7 +16,7 @@ common = , jq, libarchive, libcpuid , lowdown, mdbook # Used by tests - , gmock + , gtest , busybox-sandbox-shell , storeDir , stateDir @@ -41,7 +41,7 @@ common = nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ] + ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive @@ -56,7 +56,7 @@ common = ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock lowdown ] + ++ lib.optionals is24 [ libarchive gtest lowdown ] ++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS diff --git a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix index 7f06cbbd3c..631274cb72 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, xz, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; + buildInputs = [ curl gpgme libarchive bzip2 xz attr acl libxml2 ]; meta = with lib; { description = "A lightweight package management system based upon ipkg"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix index 771454cd40..48fa91c796 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, -lzma, curl, runtimeShell }: +xz, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; + buildInputs = [ curl perl libarchive openssl zlib bzip2 xz ]; postFixup = '' substituteInPlace $out/bin/repo-add \ diff --git a/third_party/nixpkgs/pkgs/tools/security/chkrootkit/default.nix b/third_party/nixpkgs/pkgs/tools/security/chkrootkit/default.nix index f9f0dd96a1..338df2c2d1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chkrootkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chkrootkit/default.nix @@ -1,24 +1,30 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, makeWrapper, binutils-unwrapped }: stdenv.mkDerivation rec { - name = "chkrootkit-0.54"; + pname = "chkrootkit"; + version = "0.54"; src = fetchurl { - url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; - sha256 = "sha256-FUySaSH1PbYHKKfLyXyohli2lMFLfSiO/jg+CEmRVgc="; + url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${pname}-${version}.tar.gz"; + sha256 = "01snj54hhgiqzs72hzabq6abcn46m1yckjx7503vcggm45lr4k0m"; }; # TODO: a lazy work-around for linux build failure ... makeFlags = [ "STATIC=" ]; - postPatch = '' + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' substituteInPlace chkrootkit \ --replace " ./" " $out/bin/" - ''; + ''; installPhase = '' mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin + + wrapProgram $out/sbin/chkrootkit \ + --prefix PATH : "${lib.makeBinPath [ binutils-unwrapped ]}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index a49123aded..c0ef3b7400 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cosign"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "0rgq29vi0h378j0bqs53gjgp246rqxfpk6rwskzrmawgry0zr8pk"; + sha256 = "1zwb2q62ngb2zh1hasvq7r7pmrjlpgfhs5raibbhkxbk5kayvmii"; }; - vendorSha256 = "0pcp3wdvwq06ajdfbgadyq0ipfj65n276hj88p5v6wqfn821ahd6"; + vendorSha256 = "0nwbjaps4z5fhiknbj9pybxb6kgwb1vf2qhy0mzpycprf04q6g0v"; subPackages = [ "cmd/cosign" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/credslayer/default.nix b/third_party/nixpkgs/pkgs/tools/security/credslayer/default.nix new file mode 100644 index 0000000000..0de8d37c0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/credslayer/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, python3 +, wireshark-cli +}: + +python3.pkgs.buildPythonApplication rec { + pname = "credslayer"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "ShellCode33"; + repo = "CredSLayer"; + rev = "v${version}"; + sha256 = "1rbfy0h9c2gra1r2b39kngj3m7g177nmzzs5xy9np8lxixrh17pc"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + pyshark + ]; + + checkInputs = with python3.pkgs; [ + wireshark-cli + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/tests.py" ]; + + disabledTests = [ + # Requires a telnet setup + "test_telnet" + ]; + + pythonImportsCheck = [ "credslayer" ]; + + meta = with lib; { + description = "Extract credentials and other useful info from network captures"; + homepage = "https://github.com/ShellCode33/CredSLayer"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/crlfuzz/default.nix b/third_party/nixpkgs/pkgs/tools/security/crlfuzz/default.nix index 88bd45bb5e..d203d0d7f4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/crlfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/crlfuzz/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "crlfuzz"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "dwisiswant0"; repo = pname; rev = "v${version}"; - sha256 = "03g7z7cczn52hvg6srp1i5xhdbpia226adrh2d54cs640063bx3m"; + sha256 = "sha256-rqhdxOQmZCRtq+IZygKLleb5GoKP2akyEc3rbGcnZmw="; }; - vendorSha256 = "19cj07f7d3ksp7lh5amdjz1s8p7xmqbwal4vp61al82n8944ify8"; + vendorSha256 = "sha256-yLtISEJWIKqCuZtQxReu/Vykw5etqgLpuXqOdtwBkqU="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 597652c95c..b5fa405e93 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.23.1"; + version = "3.23.2"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-6sTsASfHIFH1V3Q20R2y8AiOVZ4NR4GGRCKRVr25kkc="; + sha256 = "sha256-qdBq1vjvvb55gyL4XuPDrPK58YLSSH5kLp1oP84vJsU="; }; vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; diff --git a/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix index 107bf56cf8..2444d1f1d7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix @@ -2,7 +2,7 @@ , glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python2Packages, lib -, lsof, curl, libuuid, cups, mesa, lzma, libxkbcommon +, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon }: let @@ -38,7 +38,7 @@ let curl libuuid cups - lzma + xz libxkbcommon ]); package = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix index a13e170723..c46dcb0189 100644 --- a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix @@ -22,14 +22,14 @@ buildPythonApplication rec { pname = "expliot"; - version = "0.9.6"; + version = "0.9.7"; disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "expliot_framework"; repo = pname; rev = version; - sha256 = "1wn8fyrvis0gw80zzmpivinw6mz5n33inhv39iallsl3is8xpgpa"; + sha256 = "sha256-k43PvH9BXcvxe7O5iCGzLuxv/WkB9YelH/d/1S7BpU0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix index 19e5f16924..bb607c1fbd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix @@ -1,4 +1,4 @@ -{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python, openssl, qrencode, lib, stdenv, yubikey-manager }: +{ coreutils, fetchFromGitHub, file, libcaca, makeWrapper, python3, openssl, qrencode, lib, stdenv, yubikey-manager }: stdenv.mkDerivation rec { pname = "gen-oath-safe"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { file libcaca.bin openssl.bin - python + python3 qrencode yubikey-manager ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix index 53350f0131..14d9ab9ccf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitjacker"; - version = "0.0.3"; + version = "0.1.0"; src = fetchFromGitHub { owner = "liamg"; repo = "gitjacker"; rev = "v${version}"; - sha256 = "sha256-cMjjVjHGTVT33bknAo2DVH/qPSeazVIIw3RpXGDxF5E="; + sha256 = "sha256-rEn9FpcRfEt2yGepIPEAO9m8JeVb+nMhYMBWhC/barc="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/security/hash-slinger/default.nix b/third_party/nixpkgs/pkgs/tools/security/hash-slinger/default.nix index b8759d3571..ee06c11248 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hash-slinger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hash-slinger/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: +{ lib, stdenv, fetchFromGitHub, python2Packages, unbound, libreswan }: let - inherit (pythonPackages) python; + pythonPackages = python2Packages; in stdenv.mkDerivation rec { pname = "hash-slinger"; version = "2.7"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/man $out/${python.sitePackages}/ + mkdir -p $out/bin $out/man $out/${pythonPackages.python.sitePackages}/ make install wrapPythonPrograms ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/john/default.nix b/third_party/nixpkgs/pkgs/tools/security/john/default.nix index b243e10d35..e56e99909f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/john/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/john/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 +{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 , gcc, python3Packages, perl, perlPackages, makeWrapper }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--with-systemwide" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ]; + buildInputs = [ openssl nss nspr libkrb5 gmp zlib libpcap re2 ]; nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ]; propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl diff --git a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix new file mode 100644 index 0000000000..89eda45322 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "knockpy"; + version = "5.0.0"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "guelfoweb"; + repo = "knock"; + rev = version; + sha256 = "1h7sibdxx8y53xm1wydyng418n4j6baiys257msq03cs04jlm7h9"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + colorama + requests + ]; + + postPatch = '' + # https://github.com/guelfoweb/knock/pull/95 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" + ''; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "knockpy" ]; + + meta = with lib; { + description = "Tool to scan subdomains"; + homepage = "https://github.com/guelfoweb/knock"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 7c2f230266..150f00e92b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/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.37" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.38" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 85d41fba9f..c64e2b31af 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: eae71004c4a1720d9af1513ca750cfe116d99a7b - ref: refs/tags/6.0.37 + revision: 4c7a221f3d186b0cd65d2a765533fda54f0848f4 + ref: refs/tags/6.0.38 specs: - metasploit-framework (6.0.37) + metasploit-framework (6.0.38) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -30,9 +30,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.39) + metasploit-payloads (= 2.0.41) metasploit_data_models - metasploit_payloads-mettle (= 1.0.7) + metasploit_payloads-mettle (= 1.0.8) mqtt msgpack nessus_rest @@ -92,26 +92,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.4.5) - actionview (= 5.2.4.5) - activesupport (= 5.2.4.5) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.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.5) - activesupport (= 5.2.4.5) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - 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) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activesupport (5.2.4.5) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -123,16 +123,16 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.435.0) - aws-sdk-core (3.113.0) + aws-partitions (1.441.0) + aws-sdk-core (3.113.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.230.0) + aws-sdk-ec2 (1.232.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.51.0) + aws-sdk-iam (1.52.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.43.0) @@ -181,10 +181,10 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) - irb (1.3.4) + irb (1.3.5) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -212,7 +212,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.39) + metasploit-payloads (2.0.41) metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -223,7 +223,7 @@ GEM railties (~> 5.2.2) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.7) + metasploit_payloads-mettle (1.0.8) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.4) @@ -236,7 +236,7 @@ GEM net-ldap (0.17.0) net-ssh (6.1.0) network_interface (0.0.2) - nexpose (7.2.1) + nexpose (7.3.0) nio4r (2.5.7) nokogiri (1.11.2) mini_portile2 (~> 2.5.0) @@ -272,9 +272,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.5) - actionpack (= 5.2.4.5) - activesupport (= 5.2.4.5) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -283,7 +283,7 @@ GEM recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.4) + reline (0.2.5) io-console (~> 0.5) rex-arch (0.1.14) rex-text diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 4a3da7d7f3..5dce17ff19 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.37"; + version = "6.0.38"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-q6/1GW02C1z5nQwAKXU7xbVVviwXwS+XS7ZfNjJryiA="; + sha256 = "sha256-/e1BWhkM4A+xrvDS6Z01sND9aOZDn+cL0RIcAgT5oZs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 0be20b6876..49fedb7a84 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; + sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; + sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; + sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; + sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; addressable = { groups = ["default"]; @@ -114,40 +114,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13hy3xhff1cqlzv5hi3lz7vb11wh10m6221hq471d8m94chmmkjs"; + sha256 = "07i9mqbh19pd25wd3laxv1bcmzcpriw54g0x3mqzkn600h8f3lg9"; type = "gem"; }; - version = "1.435.0"; + version = "1.441.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z"; + sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0"; type = "gem"; }; - version = "3.113.0"; + version = "3.113.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3"; + sha256 = "0n7hi66zpm8mgfgf32gw7c9p4rv09q9kipsr01l5l2n2d69k67q5"; type = "gem"; }; - version = "1.230.0"; + version = "1.232.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569"; + sha256 = "13mc05yx3f2g1543y349qysszzk811ns2dcjcidbszaasvpz3cci"; type = "gem"; }; - version = "1.51.0"; + version = "1.52.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -414,10 +414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; io-console = { groups = ["default"]; @@ -434,10 +434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zf8n7s823rs5byzxpin626hd532ql0w5hdj1i3bds3h8h5gvxwb"; + sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; jmespath = { groups = ["default"]; @@ -514,12 +514,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "eae71004c4a1720d9af1513ca750cfe116d99a7b"; - sha256 = "086adcr3cpxn9fbjzh8p5jz5bdf57dsjj00ckpwmq2rndlczbbxb"; + rev = "4c7a221f3d186b0cd65d2a765533fda54f0848f4"; + sha256 = "16x1z420470js45yg7s3wrlgvl5h6nfyklphmsqhzq0c35d43vgx"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.37"; + version = "6.0.38"; }; metasploit-model = { groups = ["default"]; @@ -536,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibvh45sbmzdn6gsd3dgj1a67mhgy6p3hvjbh9b2qb7ijc14gv49"; + sha256 = "1nnb6kidfm39qyhv694m7skbvmsp5sjw52633v89zq0ym4y5wld5"; type = "gem"; }; - version = "2.0.39"; + version = "2.0.41"; }; metasploit_data_models = { groups = ["default"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivxz2wl9k0j7ba7xas0bfm44c1iczfvlgyxhsgqbpqkqwc374vg"; + sha256 = "0nq6wxsaghj0yqwn988z71d9f0qwglcrliwkgqr9f16vbbv33p36"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; method_source = { groups = ["default"]; @@ -676,10 +676,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i108glkklwgjxhfhnlqf4b16plqf9b84qpfz0pnl2pbnal5af8m"; + sha256 = "0jz5xiwiwagd663qdlfhmc9fm76x78cqhighmfivy6w5v0n4xyq0"; type = "gem"; }; - version = "7.2.1"; + version = "7.3.0"; }; nio4r = { groups = ["default"]; @@ -876,10 +876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; + sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; rake = { groups = ["default"]; @@ -926,10 +926,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15gcafrzp9qzfv65cjapifpqg7cckyr14m9xw86fi56d2b6jms8b"; + sha256 = "1bf86g8a761mp516349gzmvxkafj36nznczznb3flkn4a84dlk3k"; type = "gem"; }; - version = "0.2.4"; + version = "0.2.5"; }; rex-arch = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index 1c1b0e4106..da654e74f9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QF9w3ZrW+Mbl6EOC1n2848+q71AhxXTf0j//Us9L1r8="; + sha256 = "sha256-qjbr3kTgIFdxyzRwSvWyh5krrlzD8i1nMeoLZYSbr6g="; }; vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU="; - preBuild = '' - mv v2/* . - ''; + modRoot = "./v2"; + subPackages = [ + "cmd/nuclei/" + ]; # Test files are not part of the release tarball doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix index ca3e1feef3..2d96c89970 100644 --- a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-XJcNhIMu60H5LmoRzMqhPq33cCU9PBPfIIUtaSnmrH8="; + sha256 = "sha256-1Jrgf5UW6k0x3q6kQIB6Q7moOhConEnUU9r+21W5Uu8="; }; - cargoSha256 = "sha256-4l/KQMtGfZX5Rg35AJxvwzg3aAzuPK2iKrHDRgIw+bg="; + cargoSha256 = "sha256-N3pLW/OGeurrl+AlwdfbZ3T7WzEOAuyUMdIR164Xp7k="; postPatch = '' # The GPGME backend is recommended diff --git a/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix b/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix new file mode 100644 index 0000000000..b260d46f93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix @@ -0,0 +1,51 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +let + generic = { pname, subPackages, description, postInstall }: + buildGoModule rec { + inherit pname; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = "rekor"; + rev = "v${version}"; + sha256 = "1hvkfvc747g5r4h8vb1d8ikqxmlyxsycnlh78agmmjpxlasspmbk"; + }; + + vendorSha256 = "0vdir9ia3hv27rkm6jnvhsfc3mxw36xfvwqnfd34rgzmzcfxlrbv"; + + inherit subPackages postInstall; + + meta = with lib; { + inherit description; + homepage = "https://github.com/sigstore/rekor"; + changelog = "https://github.com/sigstore/rekor/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; + }; + }; +in { + rekor-cli = generic { + pname = "rekor-cli"; + subPackages = [ "cmd/cli" ]; + # Will not be needed with the next version, the package as been renamed upstream + postInstall = '' + if [ -f "$out/bin/cli" ]; then + mv "$out/bin/cli" "$out/bin/rekor-client" + fi + ''; + description = "CLI client for Sigstore, the Signature Transparency Log"; + }; + rekor-server = generic { + pname = "rekor-server"; + subPackages = [ "cmd/server" ]; + # Will not be needed with the next version, the package as been renamed upstream + postInstall = '' + if [ -f "$out/bin/server" ]; then + mv "$out/bin/server" "$out/bin/rekor-server" + fi + ''; + description = "Sigstore server, the Signature Transparency Log"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix index 88e726bc86..f42a1ec96f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, yacc, flex}: +{ lib, stdenv, fetchurl, autoreconfHook, bison, flex}: stdenv.mkDerivation rec { version = "2.4.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ autoreconfHook yacc flex ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix index b072b3b557..29762fc527 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +}: stdenv.mkDerivation rec { pname = "sslscan"; - version = "1.11.13"; + version = "2.0.9"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; - rev = "${version}-rbsec"; - sha256 = "0sa8iw91wi3515lw761j84wagab1x9rxr0mn8m08qj300z2044yk"; + rev = version; + sha256 = "0594svwz4pya0syibar0ahmi5zdjbwd5kg6hrlhfpmmslrsyli6m"; }; buildInputs = [ openssl ]; @@ -18,8 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; homepage = "https://github.com/rbsec/sslscan"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ fpletz globin ]; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix index 4c94e2544c..a4bcc87eed 100644 --- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "teler"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "sha256-lExZWFj0PQFUBJgfhahF8PfYaOndRxKyVHoMlubmEpc="; + sha256 = "sha256-i4106PtoCJt5CY9ahczZYe9GufBkaZS+9Peh0IY9r1M="; }; vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE="; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index f040b17f89..0291d7bb3a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks -, libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests +, libseccomp, systemd, libcap, xz, zstd, scrypt, nixosTests , writeShellScript # for update.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ + buildInputs = [ libevent openssl zlib xz zstd scrypt ] ++ lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix new file mode 100644 index 0000000000..945f78dc55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -0,0 +1,106 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "wapiti"; + version = "3.0.4"; + + src = fetchFromGitHub { + owner = "wapiti-scanner"; + repo = pname; + rev = version; + sha256 = "0wnz4nq1q5y74ksb1kcss9vdih0kbrmnkfbyc2ngd9id1ixfamxb"; + }; + + nativeBuildInputs = with python3.pkgs; [ + pytest-runner + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + browser-cookie3 + Mako + markupsafe + pysocks + requests + six + tld + yaswfp + ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata ]; + + checkInputs = with python3.pkgs; [ + responses + pytestCheckHook + ]; + + postPatch = '' + # Is already fixed in the repo. Will be part of the next release + substituteInPlace setup.py \ + --replace "importlib_metadata==2.0.0" "importlib_metadata" + ''; + + disabledTests = [ + # Tests requires network access + "test_attr" + "test_bad_separator_used" + "test_blind" + "test_chunked_timeout" + "test_cookies_detection" + "test_csrf_cases" + "test_detection" + "test_direct" + "test_escape_with_style" + "test_explorer_filtering" + "test_false" + "test_frame" + "test_headers_detection" + "test_html_detection" + "test_implies_detection" + "test_inclusion_detection" + "test_meta_detection" + "test_no_crash" + "test_options" + "test_out_of_band" + "test_partial_tag_name_escape" + "test_prefix_and_suffix_detection" + "test_qs_limit" + "test_rare_tag_and_event" + "test_redirect_detection" + "test_request_object" + "test_script" + "test_ssrf" + "test_tag_name_escape" + "test_timeout" + "test_title_false_positive" + "test_title_positive" + "test_true_positive_request_count" + "test_url_detection" + "test_warning" + "test_whole" + "test_xss_inside_tag_input" + "test_xss_inside_tag_link" + "test_xss_uppercase_no_script" + "test_xss_with_strong_csp" + "test_xss_with_weak_csp" + "test_xxe" + ]; + + pythonImportsCheck = [ "wapitiCore" ]; + + meta = with lib; { + description = "Web application vulnerability scanner"; + longDescription = '' + Wapiti allows you to audit the security of your websites or web applications. + It performs "black-box" scans (it does not study the source code) of the web + application by crawling the webpages of the deployed webapp, looking for + scripts and forms where it can inject data. Once it gets the list of URLs, + forms and their inputs, Wapiti acts like a fuzzer, injecting payloads to see + if a script is vulnerable. + ''; + homepage = "https://wapiti-scanner.github.io/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix b/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix new file mode 100644 index 0000000000..516585f891 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/xcat/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "xcat"; + version = "1.2.0"; + disabled = python3.pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "orf"; + repo = pname; + rev = "v${version}"; + sha256 = "01r5998gdvqjdrahpk0ci27lx9yghbddlanqcspr3qp5y5930i0s"; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiodns + aiohttp + appdirs + cchardet + click + colorama + prompt_toolkit + xpath-expressions + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "xcat" ]; + + meta = with lib; { + description = "XPath injection tool"; + longDescription = '' + xcat is an advanced tool for exploiting XPath injection vulnerabilities, + featuring a comprehensive set of features to read the entire file being + queried as well as other files on the filesystem, environment variables + and directories. + ''; + homepage = "https://github.com/orf/xcat"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/zdns/default.nix b/third_party/nixpkgs/pkgs/tools/security/zdns/default.nix new file mode 100644 index 0000000000..913735d4cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/zdns/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zdns"; + version = "20210327-${lib.strings.substring 0 7 rev}"; + rev = "8c53210f0b9a4fe16c70a5d854e9413c3d0c1ba2"; + + src = fetchFromGitHub { + owner = "zmap"; + repo = pname; + inherit rev; + sha256 = "0pdfz1489ynpw72flalnlkwybp683v826icjx7ljys45xvagdvck"; + }; + + vendorSha256 = "0b8h5n01xmhar1a09svb35ah48k9zdy1mn5balq0h2l0jxr05z78"; + + subPackages = [ "zdns" ]; + + meta = with lib; { + description = "CLI DNS lookup tool"; + homepage = "https://github.com/zmap/zdns"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index c57c276698..839c48c320 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fQzKWgePF7SszYMwRSB3s59AmVjvzMvXPM49PXFTBGM="; + sha256 = "sha256-blvnwsmcHf0yH2C/NUCsVQECIH4SI0BTNiMzCuNd0H0="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; diff --git a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix b/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix index b653f24072..17fa948933 100644 --- a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix @@ -1,15 +1,14 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python3Packages }: let - inherit (pythonPackages) python; + inherit (python3Packages) python; pname = "honcho"; in -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; version = "1.0.1"; - namePrefix = ""; src = fetchFromGitHub { owner = "nickstenning"; @@ -18,7 +17,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b"; }; - checkInputs = with pythonPackages; [ jinja2 pytest mock coverage ]; + checkInputs = with python3Packages; [ jinja2 pytest mock coverage ]; buildPhase = '' ${python.interpreter} setup.py build diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index 5f3cc2f6fc..25a397bc98 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { description = "An interactive process viewer for Linux"; homepage = "https://htop.dev"; license = licenses.gpl2Only; - platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; + platforms = platforms.all; maintainers = with maintainers; [ rob relrod ]; + changelog = "https://github.com/htop-dev/${pname}/blob/${version}/ChangeLog"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix index 12f2a2ef07..d529e9cf02 100644 --- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -2,7 +2,7 @@ , ps, dnsutils # dig is recommended for multiple categories , withRecommends ? false # Install (almost) all recommended tools (see --recommends) , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode -, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools +, file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools , binutils, tree, upower, pciutils , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg }: @@ -11,7 +11,7 @@ let prefixPath = programs: "--prefix PATH ':' '${lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ - util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod + util-linuxMinimal dmidecode file hddtemp iproute2 ipmitool usbutils kmod lm_sensors smartmontools binutils tree upower pciutils ]; recommendedDisplayInformationPrograms = lib.optionals diff --git a/third_party/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix b/third_party/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix index 892920657d..0f8db091d6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng -, eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq +, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; - nativeBuildInputs = [ pkg-config autoreconfHook yacc ]; + nativeBuildInputs = [ pkg-config autoreconfHook bison ]; buildInputs = [ glib syslogng eventlog perl python protobufc libivykis libcap czmq diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index 5e42a79183..4d2ca81183 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -10,7 +10,7 @@ , libevdev , libtool , libxml2 -, lzma +, xz , pkg-config , lib, stdenv , upower @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dbus-glib libevdev libxml2 - lzma + xz upower ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix b/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix index 6f8ba2b07e..b4b92b8f90 100644 --- a/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, lzma }: +{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, xz }: stdenv.mkDerivation rec { version = "20180311"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libyaml lzma ]; + buildInputs = [ openssl libuuid libyaml xz ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix index 79d8c9079c..27c2a1ff28 100644 --- a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "asciigraph"; - version = "0.5.1"; + version = "0.5.2"; goPackagePath = "github.com/guptarohit/asciigraph"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "0aqf64b5d5lf9scvxdx5f3p0vvx5s59mrvr6hcjljg1prksah9ns"; + sha256 = "sha256-iVgJtxt0B6nMA3bieZ1CmZucwLMb5av6Wn5BMDRWfcI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/frangipanni/default.nix b/third_party/nixpkgs/pkgs/tools/text/frangipanni/default.nix new file mode 100644 index 0000000000..1f0dcfa941 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/frangipanni/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "frangipanni"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "birchb1024"; + repo = "frangipanni"; + rev = "v${version}"; + sha256 = "sha256-NgRDXrAsfnj1cqO+2AN8nSuxS9KGNIl+pJkCADmDOqY="; + }; + + vendorSha256 = "sha256-TSN5M/UCTtfoTf1hDCfrJMCFdSwL/NVXssgt4aefom8="; + + meta = with lib; { + description = "Convert lines of text into a tree structure"; + homepage = "https://github.com/birchb1024/frangipanni"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/html-tidy/default.nix b/third_party/nixpkgs/pkgs/tools/text/html-tidy/default.nix index 15ee4c7564..6caa3d34a0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/html-tidy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/html-tidy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "html-tidy"; - version = "5.6.0"; + version = "5.7.28"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "0w175c5d1babq0w1zzdzw9gl6iqbgyq58v8587s7srp05y3hwy9k"; + sha256 = "sha256-Tny53PtaQWAMAEjqw4tKnmGURfZhhwFQNCJr9jjWZQY="; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix index 3ead56298c..c051560151 100644 --- a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python3Packages, bash, git, less }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "icdiff"; version = "1.9.5"; @@ -11,6 +11,20 @@ pythonPackages.buildPythonApplication rec { sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd"; }; + checkInputs = [ + bash + git + less + ]; + + # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory + doCheck = false; + + checkPhase = '' + patchShebangs test.sh + ./test.sh ${python3Packages.python.interpreter} + ''; + meta = with lib; { homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index af96b09b14..0cccb644f9 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-IDW8dd2Bgr936hUKkfkoQ/kBnN+0uacJ1uX4Xhd27Vc="; + sha256 = "sha256-+mDUT9zkawa6Ad1uptc34RGK3bhU6WowwUZdwKbOnj4="; }; vendorSha256 = "sha256-nneQ0B7PyHAqiOzrmWqSssZM8B3np4VFUJLBqUvkjZE="; diff --git a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix index 383c3603bc..670c0612b3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.10.1"; + version = "5.10.2"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-S3OGc7rirNkP5aSnaASP6n7b7zYHSaDDWRVRWWTM2hc="; + sha256 = "sha256-NI57U3FpUfQ6ouBEYrzzG+9kpL58BD4HoAuRAFJMO9k="; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix b/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix index 177c556a33..8cd67b9926 100644 --- a/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/silver-searcher/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, lzma}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, xz}: stdenv.mkDerivation rec { pname = "silver-searcher"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pcre zlib lzma ]; + buildInputs = [ pcre zlib xz ]; meta = with lib; { homepage = "https://github.com/ggreer/the_silver_searcher/"; diff --git a/third_party/nixpkgs/pkgs/tools/text/zimreader/default.nix b/third_party/nixpkgs/pkgs/tools/text/zimreader/default.nix deleted file mode 100644 index 64e6bf60e3..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/zimreader/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool -, zimlib, cxxtools, tntnet -}: - -stdenv.mkDerivation { - name = "zimreader-0.92"; - - src = fetchFromGitHub { - owner = "wikimedia"; - repo = "openzim"; - rev = "r1.3"; # there multiple tools with different version in the repo - sha256 = "0x529137rxy6ld64xqa6xmn93121ripxvkf3sc7hv3wg6km182sw"; - }; - - patchFlags = [ "-p2" ]; - patches = [ - (fetchpatch { - name = "zimreader_tntnet221.patch"; - url = "https://github.com/wikimedia/openzim/compare/r1.3...juliendehos:3ee5f11eaa811284d340451e6f466529c00f6ef2.patch"; - sha256 = "0rc5n20svyyndqh7hsynjyblfraphgi0f6khw6f5jq89w9i1j1hd"; - }) - ]; - - enableParallelBuilding = true; - buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; - setSourceRoot = '' - sourceRoot=$(echo */zimreader) - ''; - preConfigure = "./autogen.sh"; - - meta = { - description = "A tool to serve ZIM files using HTTP"; - homepage = "http://git.wikimedia.org/log/openzim"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ robbinch juliendehos ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix b/third_party/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix index c2600ec46f..9a7e495df2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/zimwriterfs/default.nix @@ -9,7 +9,7 @@ , file , icu , gumbo -, lzma +, xz , xapian , zimlib , zlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; + buildInputs = [ file icu gumbo xz zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) ''; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index 849da7e606..6716d764d5 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -136,6 +136,7 @@ let url = "https://github.com/downloads/dagwieers/asciidoc-odf/odt-backend-0.1.zip"; sha256 = "1zaa97h9sx6ncxcdkl1x3ggydi7f8kjgvrnpjnkjiizi45k350kw"; }; + odpBackendSrc = fetchurl { url = "https://github.com/downloads/dagwieers/asciidoc-odf/odp-backend-0.1.zip"; sha256 = "08ya4bskygzqkfqwjllpg31qc5k08xp2k78z9b2480g8y57bfy10"; @@ -159,7 +160,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 unzip autoreconfHook ]; # install filters early, so their shebangs are patched too - patchPhase = with lib; '' + postPatch = with lib; '' mkdir -p "$out/etc/asciidoc/filters" mkdir -p "$out/etc/asciidoc/backends" '' + optionalString _enableDitaaFilter '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 06a1716251..4e321311f2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -1,60 +1,65 @@ GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.3) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + Ascii85 (1.1.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.10) - asciidoctor-diagram (1.5.18) - asciidoctor (>= 1.5.0, < 3.x) - asciidoctor-epub3 (1.5.0.alpha.9) - asciidoctor (>= 1.5.0, < 3.0.0) - concurrent-ruby (~> 1.1.5) - gepub (~> 1.0.2) - thread_safe (~> 0.3.6) - asciidoctor-mathematical (0.3.0) - asciidoctor (~> 2.0, >= 2.0.0) - mathematical (~> 1.5, >= 1.5.8) - ruby-enum (~> 0.4) - asciidoctor-pdf (1.5.0.alpha.18) + asciidoctor (2.0.12) + asciidoctor-diagram (2.1.0) + asciidoctor (>= 1.5.7, < 3.x) + asciidoctor-diagram-ditaamini (~> 0.13) + asciidoctor-diagram-plantuml (~> 1.2021) + rexml + asciidoctor-diagram-ditaamini (0.13.1) + asciidoctor-diagram-plantuml (1.2021.0) + asciidoctor-epub3 (1.5.0.alpha.19) + asciidoctor (>= 1.5.6, < 3.0.0) + gepub (~> 1.0.0) + mime-types (~> 3.0) + asciidoctor-mathematical (0.3.5) + asciidoctor (~> 2.0) + asciimath (~> 2.0) + mathematical (~> 1.6.0) + asciidoctor-pdf (1.5.4) asciidoctor (>= 1.5.3, < 3.0.0) concurrent-ruby (~> 1.1.0) prawn (~> 2.2.0) - prawn-icon (~> 2.3.0) - prawn-svg (~> 0.29.0) + prawn-icon (~> 2.5.0) + prawn-svg (~> 0.31.0) prawn-table (~> 0.2.0) prawn-templates (~> 0.1.0) safe_yaml (~> 1.0.0) thread_safe (~> 0.3.0) - treetop (~> 1.5.0) - asciidoctor-revealjs (4.0.1) + treetop (~> 1.6.0) + ttfunk (~> 1.5.0, >= 1.5.1) + asciidoctor-revealjs (4.1.0) asciidoctor (>= 2.0.0, < 3.0.0) concurrent-ruby (~> 1.0) thread_safe (~> 0.3.5) - asciimath (2.0.1) - coderay (1.1.2) - concurrent-ruby (1.1.5) - css_parser (1.7.0) + asciimath (2.0.2) + coderay (1.1.3) + concurrent-ruby (1.1.8) + css_parser (1.9.0) addressable - gepub (1.0.4) - nokogiri (>= 1.8.2, < 1.11) - rubyzip (>= 1.1.1) + gepub (1.0.13) + nokogiri (>= 1.8.2, < 1.12) + rubyzip (> 1.1.1, < 2.4) hashery (2.1.2) - i18n (1.6.0) + i18n (1.8.9) concurrent-ruby (~> 1.0) - mathematical (1.6.12) + mathematical (1.6.14) ruby-enum (~> 0.4) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mini_portile2 (2.4.0) - multi_json (1.13.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) + mime-types-data (3.2021.0225) + mini_portile2 (2.5.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) pdf-core (0.7.0) - pdf-reader (2.2.0) - Ascii85 (~> 1.0.0) + pdf-reader (2.4.2) + Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 @@ -63,27 +68,28 @@ GEM prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) - prawn-icon (2.3.0) + prawn-icon (2.5.0) prawn (>= 1.1.0, < 3.0.0) - prawn-svg (0.29.1) + prawn-svg (0.31.0) css_parser (~> 1.6) prawn (>= 0.11.1, < 3) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - prawn-templates (0.1.1) + prawn-templates (0.1.2) pdf-reader (~> 2.0) prawn (~> 2.2) - public_suffix (3.1.1) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) - rouge (3.5.1) - ruby-enum (0.7.2) + public_suffix (4.0.6) + pygments.rb (2.1.0) + racc (1.5.2) + rexml (3.2.4) + rouge (3.26.0) + ruby-enum (0.9.0) i18n ruby-rc4 (0.1.5) - rubyzip (1.2.3) + rubyzip (2.3.0) safe_yaml (1.0.5) thread_safe (0.3.6) - treetop (1.5.3) + treetop (1.6.11) polyglot (~> 0.3) ttfunk (1.5.1) diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix index 29b2b567be..73fb46d2e6 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, makeWrapper, # Optional dependencies, can be null - epubcheck, kindlegen, + epubcheck, bundlerUpdateScript }: @@ -20,8 +20,7 @@ let postBuild = '' wrapProgram "$out/bin/asciidoctor-epub3" \ - ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \ - ${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"} + ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix index db0f67d3a5..19106214c2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; afm = { groups = ["default"]; @@ -25,64 +25,84 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; + sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; asciidoctor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; + sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.12"; }; asciidoctor-diagram = { - dependencies = ["asciidoctor"]; + dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095ar1hj96mi9vxnjjdkj7yzc3lp4wjxh4qsijx9inqflbcw7x71"; + sha256 = "1fh73k306q1x4rzsly2fy1rdq1kpkdvs3r1084hgk0sh516ksc0s"; type = "gem"; }; - version = "1.5.18"; + version = "2.1.0"; + }; + asciidoctor-diagram-ditaamini = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08jwpyklcplmfcxs4z9z0b0la6xdwrnf9bk6c02y54502228bg6b"; + type = "gem"; + }; + version = "0.13.1"; + }; + asciidoctor-diagram-plantuml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bxlkq3k775lhhnbs85cx8cbixhw7p70hnxrqnnig470h6jhmj0b"; + type = "gem"; + }; + version = "1.2021.0"; }; asciidoctor-epub3 = { - dependencies = ["asciidoctor" "concurrent-ruby" "gepub" "thread_safe"]; + dependencies = ["asciidoctor" "gepub" "mime-types"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056yp0z64b1fhhkzz2kaiqsd11gpbgx2d1yjgq7cqma9c70bbxa5"; + sha256 = "1fgi0rb8026k0a43wnanan6nzc8386azygmfl4zv7c9vram4nr6h"; type = "gem"; }; - version = "1.5.0.alpha.9"; + version = "1.5.0.alpha.19"; }; asciidoctor-mathematical = { - dependencies = ["asciidoctor" "mathematical" "ruby-enum"]; + dependencies = ["asciidoctor" "asciimath" "mathematical"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6qhfp6xc5jlqkscr9g7zzp9f2cv28jzcqzawhl8vjgcny7i6j3"; + sha256 = "1lxfq7qn3ql642pva6jh3h1abm9j9daxg5icfn1h73k6cjsmcisp"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.5"; }; asciidoctor-pdf = { - dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"]; + dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop" "ttfunk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19rgi43abhkyv85r2gnwqq6kxwsn29hhv4clnnmln58d7s589n0j"; + sha256 = "0k8hn9lrvr08grqx17x2vrllw5qmfh0j08wp56464w2pj279ka67"; type = "gem"; }; - version = "1.5.0.alpha.18"; + version = "1.5.4"; }; asciidoctor-revealjs = { dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; @@ -90,40 +110,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "084aq9frv4irzgd9ab3xad9i0ml9lb58w0wvg76gnwwr51plbpp4"; + sha256 = "03vmbcc3x059h17ry4qwk1p0yar9wgh87l2qssi307gy45cjw2mq"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; asciimath = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aapydwwkydbwgz07n7ma3a5jy9n3v0shy6q6j8mi4wr3crhx45a"; + sha256 = "1yq9av7rh493xqmx4cq3fjl0c6d8njxp53qw4hg2d3xkyn2lyfc5"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; coderay = { groups = ["default"]; 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 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.8"; }; css_parser = { dependencies = ["addressable"]; @@ -131,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; type = "gem"; }; - version = "1.7.0"; + version = "1.9.0"; }; gepub = { dependencies = ["nokogiri" "rubyzip"]; @@ -142,10 +162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg2h0mscb2hq6l3wjzq5fp5vw4552nglq8n9pawm7bzacf1gzyf"; + sha256 = "01q33rkvqrhxqm8zgkhgcqhrqdfzgxswxfgiagdjxw67qdn1pids"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.13"; }; hashery = { groups = ["default"]; @@ -163,10 +183,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.9"; }; mathematical = { dependencies = ["ruby-enum"]; @@ -174,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19f9icaixg60wl8dvcxp6glbm5vpx2rsyx53sfk2rvwnzgsr42qh"; + sha256 = "05mn68gxhfa37qsnzsmdqaa005hf511j5lga76qsrad2gcnhan1b"; type = "gem"; }; - version = "1.6.12"; + version = "1.6.14"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -195,41 +215,31 @@ 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"; - }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; + version = "2.5.0"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.3"; + version = "1.11.1"; }; pdf-core = { groups = ["default"]; @@ -247,10 +257,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aas2f5clgwpgryywrh4gihdi10afx3kbyfs1n31cinri02psd43"; + sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.2"; }; polyglot = { groups = ["default"]; @@ -279,10 +289,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nc810wdpa93z162yzjgvf7mdanfxm4bjwinjjxx5smq6wdvhdqi"; + sha256 = "1ivkdf8rdf92hhy97vbmc2a4w97vcvqd58jcj4z9hz3hfsb1526w"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; prawn-svg = { dependencies = ["css_parser" "prawn"]; @@ -290,10 +300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwfv6lw2diywgjp15pd3awpr8g7xkjfi10jzhmvziikakzsz6gj"; + sha256 = "1rb5hmjqc4hvy6liw9y51y6glbw66f09r09w0nvdfxhfi2kka16l"; type = "gem"; }; - version = "0.29.1"; + version = "0.31.0"; }; prawn-table = { dependencies = ["prawn"]; @@ -312,41 +322,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gs894sj9zdlwx59h3rk4p0l3y8r18p22zhnfiyx9lngsa56gcrj"; + sha256 = "1w9irn3rllm992c6j7fsx81gg539i7yy8zfddyw7q53hnlys0yhi"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "3.1.1"; + version = "4.0.6"; }; "pygments.rb" = { - dependencies = ["multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; + sha256 = "1736rbjgin97p3vjknz60p6dl66c936djwsk7wnwvwmav8r1nx0y"; type = "gem"; }; - version = "1.2.1"; + version = "2.1.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.5.1"; + version = "3.26.0"; }; ruby-enum = { dependencies = ["i18n"]; @@ -354,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + sha256 = "1pys90hxylhyg969iw9lz3qai5lblf8xwbdg1g5aj52731a9k83p"; type = "gem"; }; - version = "0.7.2"; + version = "0.9.0"; }; ruby-rc4 = { groups = ["default"]; @@ -374,10 +403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.2.3"; + version = "2.3.0"; }; safe_yaml = { groups = ["default"]; @@ -405,10 +434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wpl5z33796nz2ah44waflrd1girbra281d9i3m9nz4ylg1ljg5b"; + sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.11"; }; ttfunk = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix deleted file mode 100644 index 6afa246f81..0000000000 --- a/third_party/nixpkgs/pkgs/tools/typesetting/kindlegen/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchurl, lib, stdenv, unzip }: - -let - version = "2.9"; - fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version; - - sha256 = { - x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); - - url = { - x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); - -in stdenv.mkDerivation { - pname = "kindlegen"; - inherit version; - - src = fetchurl { - inherit url; - inherit sha256; - }; - - sourceRoot = "."; - - nativeBuildInputs = lib.optional (lib.hasSuffix ".zip" url) unzip; - - installPhase = '' - mkdir -p $out/bin $out/share/kindlegen/doc - install -m755 kindlegen $out/bin/kindlegen - cp -r *.txt *.html docs/* $out/share/kindlegen/doc - ''; - - meta = with lib; { - broken = true; # download links got removed - description = "Convert documents to .mobi for use with Amazon Kindle"; - homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211"; - license = licenses.unfree; - maintainers = with maintainers; [ peterhoeg ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "x86_64-cygwin" "i686-cygwin" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index 655cd5a61e..aa1d68e708 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, makeWrapper, # Optional dependencies, can be null - epubcheck, kindlegen, + epubcheck, bundlerUpdateScript }: @@ -17,8 +17,7 @@ let # postBuild = '' # wrapProgram "$out/bin/asciidoctor-epub3" \ - # ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \ - # ${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"} + # ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} # ''; # passthru = { diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix new file mode 100644 index 0000000000..4d02e2e1ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix @@ -0,0 +1,27 @@ +{ rustPlatform, fetchFromGitHub, gtk3, pkg-config, glib, lib }: + +rustPlatform.buildRustPackage rec { + pname = "tex-match"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "zoeyfyi"; + repo = "TeX-Match"; + rev = "v${version}"; + sha256 = "1yb81j7mbqqb8jcn78dx4ydp7ncbzvaczkli6cqay5jf5j6dbk1z"; + }; + + nativeBuildInputs = [ pkg-config glib ]; + + buildInputs = [ gtk3 ]; + + cargoSha256 = "1sm2fd3dhs59rvmfjzrfz0qwqzyc9dllb8ph0wc2x0r3px16c71x"; + + meta = with lib; { + description = "Search through over 1000 different LaTeX symbols by sketching. A desktop version of detexify"; + homepage = "https://tex-match.zoey.fyi/"; + license = licenses.mit; + maintainers = [ maintainers.bootstrap-prime ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/video/play-with-mpv/default.nix b/third_party/nixpkgs/pkgs/tools/video/play-with-mpv/default.nix new file mode 100644 index 0000000000..d9ab049316 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/video/play-with-mpv/default.nix @@ -0,0 +1,35 @@ +{ lib, python3Packages, fetchFromGitHub, fetchurl, youtube-dl, git }: + +let + install_freedesktop = fetchurl { + url = "https://github.com/thann/install_freedesktop/tarball/2673e8da4a67bee0ffc52a0ea381a541b4becdd4"; + sha256 = "0j8d5jdcyqbl5p6sc1ags86v3hr2sghmqqi99d1mvc064g90ckrv"; + }; +in +python3Packages.buildPythonApplication rec { + pname = "play-with-mpv"; + version = "unstable-2020-05-18"; + + src = fetchFromGitHub { + owner = "thann"; + repo = "play-with-mpv"; + rev = "656448e03fe9de9e8bd21959f2a3b47c4acb8c3e"; + sha256 = "1qma8b3lnkdhxdjsnrq7n9zgy53q62j4naaqqs07kjxbn72zb4p4"; + }; + + nativeBuildInputs = [ git ]; + propagatedBuildInputs = [ youtube-dl ]; + + postPatch = '' + substituteInPlace setup.py --replace \ + '"https://github.com/thann/install_freedesktop/tarball/master#egg=install_freedesktop-0.2.0"' \ + '"file://${install_freedesktop}#egg=install_freedesktop-0.2.0"' + ''; + + meta = with lib; { + description = "Chrome extension and python server that allows you to play videos in webpages with MPV instead"; + homepage = "https://github.com/Thann/play-with-mpv"; + license = licenses.mit; + maintainers = with maintainers; [ dawidsowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix index ca3fd72e87..16699e15ba 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -1,8 +1,8 @@ -{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }: +{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c, libiconv }: rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.4.0"; + version = "0.4.1"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,12 +11,12 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "09w4476x6bdmh9pv4lchrzvfvbjvxxraa9f4dlbwgli89lcg9fcf"; + sha256 = "0jnq5a3fv6fzzbmprzfxidlcwwgblkwwm0135cfw741wjv7f7h6r"; }; cargoLock = fetchurl { url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; - sha256 = "0rkyi010z6qmwdpvzlzyrrhs8na929g11lszhbqx5y0gh3y5nyik"; + sha256 = "14fi9wam9rs5206rvcd2f3sjpzq41pnfml14w74wn2ws3gpi46zn"; }; installPhase = '' @@ -26,8 +26,9 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1iza2cws28hd4a3q90mc90l8ql4bsgapdznfr6bl65cjam43i5sg"; + cargoSha256 = "1j92prjyr86wyx58h10xq9c9z28ky86h291x65w7qrxpj658aiz1"; nativeBuildInputs = [ nasm cargo-c ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; postBuild = '' cargo cbuild --release --frozen --prefix=${placeholder "out"} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index a70eb45b06..6e29a5a8d8 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -22,16 +22,20 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; buildPhase = '' + runHook preBuild make binaries VERSION=${version} + runHook postBuild ''; installPhase = '' + runHook preInstall make install BINDIR=$out/bin for shell in bash fish zsh; do $out/bin/crictl completion $shell > crictl.$shell installShellCompletion crictl.$shell done + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 0409146629..75fed66865 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -225,6 +225,7 @@ mapAliases ({ fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 g4py = python3Packages.geant4; # added 2020-06-06 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 + gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 @@ -268,6 +269,7 @@ mapAliases ({ gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 + gmock = gtest; # moved from top-level 2021-03-14 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobby5 = gobby; # added 2021-02-01 @@ -309,7 +311,9 @@ mapAliases ({ infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; inter-ui = inter; # added 2021-03-27 + iproute = iproute2; # moved from top-level 2021-03-14 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + jack2Full = jack2; # moved from top-level 2021-03-14 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 jbuilder = dune_1; # added 2018-09-09 @@ -332,7 +336,9 @@ mapAliases ({ keybase-go = keybase; # added 2016-08-24 kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 + kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 krename-qt5 = krename; # added 2017-02-18 + kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; @@ -393,10 +399,12 @@ mapAliases ({ lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 + lzma = xz; # moved from top-level 2021-03-14 m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 + mysql = mariadb; # moved from top-level 2021-03-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 @@ -413,7 +421,7 @@ mapAliases ({ memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 # NOTE: 2018-07-12: legacy alias: - # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; @@ -583,6 +591,7 @@ mapAliases ({ python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 + qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 @@ -601,6 +610,9 @@ mapAliases ({ rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rssglx = rss-glx; #added 2015-03-25 rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 + # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, + # due to it being inside the linuxPackagesFor function. + rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 retroshare06 = retroshare; gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 @@ -624,6 +636,7 @@ mapAliases ({ rubyMinimal = throw "rubyMinimal was removed due to being unused"; rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 + subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 @@ -697,7 +710,7 @@ mapAliases ({ net_snmp = net-snmp; # added 2019-12-21 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09 - spaceOrbit = space-orbit; # addewd 2016-05-23 + spaceOrbit = space-orbit; # added 2016-05-23 speech_tools = speech-tools; # added 2018-04-25 speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 @@ -818,11 +831,14 @@ mapAliases ({ xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 xv = xxv; # added 2020-02-22 + yacc = bison; # moved from top-level 2021-03-14 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 yuzu = yuzu-mainline; # added 2021-01-25 + zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 zdfmediathk = mediathekview; # added 2019-01-19 + gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6b22227ce4..eb89241538 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -259,6 +259,16 @@ in protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; + + protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; + + protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; + + protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; + + protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -275,6 +285,8 @@ in creddump = callPackage ../tools/security/creddump {}; + credslayer = callPackage ../tools/security/credslayer { }; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; devour = callPackage ../tools/X11/devour {}; @@ -658,6 +670,8 @@ in acme-sh = callPackage ../tools/admin/acme.sh { }; + acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { ffmpeg = ffmpeg_2; }; @@ -767,6 +781,8 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + quich = callPackage ../tools/misc/quich { } ; + tfk8s = callPackage ../tools/misc/tfk8s { }; xtrt = callPackage ../tools/archivers/xtrt { }; @@ -891,6 +907,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; }; + writefreely = callPackage ../applications/misc/writefreely { }; + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; @@ -1022,6 +1040,8 @@ in async = callPackage ../development/tools/async {}; + async-profiler = callPackage ../development/tools/async-profiler { }; + atheme = callPackage ../servers/irc/atheme { }; atinout = callPackage ../tools/networking/atinout { }; @@ -1372,6 +1392,10 @@ in glasgow = with python3Packages; toPythonApplication glasgow; + gmni = callPackage ../applications/networking/browsers/gmni { }; + + gmnisrv = callPackage ../servers/gemini/gmnisrv { }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; @@ -1496,6 +1520,8 @@ in pebble = callPackage ../tools/admin/pebble { }; + play-with-mpv = callPackage ../tools/video/play-with-mpv { }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; skhd = callPackage ../os-specific/darwin/skhd { @@ -1771,7 +1797,7 @@ in bubblewrap = callPackage ../tools/admin/bubblewrap { }; - borgbackup = callPackage ../tools/backup/borg { }; + borgbackup = callPackage ../tools/backup/borgbackup { }; borgmatic = callPackage ../tools/backup/borgmatic { }; @@ -1980,6 +2006,8 @@ in cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; + clickclack = callPackage ../tools/misc/clickclack { }; + clog-cli = callPackage ../development/tools/clog-cli { }; cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; @@ -2399,6 +2427,8 @@ in firestarter = callPackage ../applications/misc/firestarter { }; + frangipanni = callPackage ../tools/text/frangipanni { }; + fselect = callPackage ../tools/misc/fselect { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -2445,6 +2475,8 @@ in g2o = libsForQt5.callPackage ../development/libraries/g2o { }; + gb-backup = callPackage ../tools/backup/gamerbackup { }; + gbsplay = callPackage ../applications/audio/gbsplay { }; gdrivefs = python27Packages.gdrivefs; @@ -2638,6 +2670,8 @@ in linuxptp = callPackage ../os-specific/linux/linuxptp { }; + lisgd = callPackage ../tools/inputmethods/lisgd { }; + lite = callPackage ../applications/editors/lite { }; loadwatch = callPackage ../tools/system/loadwatch { }; @@ -2724,6 +2758,8 @@ in monsoon = callPackage ../tools/security/monsoon {}; + moodle-dl = callPackage ../tools/networking/moodle-dl { }; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { inherit (pkgs.xorg) libX11 libXtst libXfixes; }; @@ -3038,8 +3074,6 @@ in }); asciidoctor = callPackage ../tools/typesetting/asciidoctor { - # kindlegen is unfree, don't enable by default - kindlegen = null; # epubcheck pulls in Java, which is problematic on some platforms epubcheck = null; }; @@ -3603,6 +3637,8 @@ in cutensor = cutensor_cudatoolkit_10; + curie = callPackage ../data/fonts/curie { }; + curlFull = curl.override { ldapSupport = true; }; @@ -3867,6 +3903,9 @@ in }; drone = callPackage ../development/tools/continuous-integration/drone { }; + drone-oss = callPackage ../development/tools/continuous-integration/drone { + enableUnfree = false; + }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; @@ -4136,6 +4175,8 @@ in emem = callPackage ../applications/misc/emem { }; + empty = callPackage ../tools/misc/empty { }; + emulsion = callPackage ../applications/graphics/emulsion { inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; }; @@ -4397,6 +4438,8 @@ in libbladeRF = callPackage ../development/libraries/libbladeRF { }; + libbtbb = callPackage ../development/libraries/libbtbb { }; + lp_solve = callPackage ../applications/science/math/lp_solve { }; fastlane = callPackage ../tools/admin/fastlane { }; @@ -4471,6 +4514,10 @@ in fprintd = callPackage ../tools/security/fprintd { }; + fprintd-tod = callPackage ../tools/security/fprintd { + libfprint = libfprint-tod; + }; + ferdi = callPackage ../applications/networking/instant-messengers/ferdi { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; @@ -4664,6 +4711,17 @@ in humanfriendly; }; + git-annex-remote-googledrive = callPackage ../applications/version-management/git-and-tools/git-annex-remote-googledrive { + inherit (python3Packages) + buildPythonApplication + fetchPypi + annexremote + drivelib + GitPython + tenacity + humanfriendly; + }; + git-annex-remote-rclone = callPackage ../applications/version-management/git-and-tools/git-annex-remote-rclone { }; git-annex-utils = callPackage ../applications/version-management/git-and-tools/git-annex-utils { }; @@ -5122,7 +5180,6 @@ in gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; - gmock = gtest; # TODO: move to aliases.nix gbenchmark = callPackage ../development/libraries/gbenchmark {}; @@ -5539,6 +5596,8 @@ in ispike = callPackage ../development/libraries/science/robotics/ispike { }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; + isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5739,6 +5798,8 @@ in knockknock = callPackage ../tools/security/knockknock { }; + knockpy = callPackage ../tools/security/knockpy { }; + kore = callPackage ../development/web/kore { }; krakenx = callPackage ../tools/system/krakenx { }; @@ -5843,13 +5904,23 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; + }; logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { enableUnfree = false; + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; + }; + logstash7 = callPackage ../tools/misc/logstash/7.x.nix { + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; }; - logstash7 = callPackage ../tools/misc/logstash/7.x.nix { }; logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { enableUnfree = false; + # https://www.elastic.co/support/matrix#logstash-and-jvm + jre = jdk11_headless; }; logstash = logstash6; @@ -5877,8 +5948,6 @@ in kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; - kippo = callPackage ../servers/kippo { }; - kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; lagrange = callPackage ../applications/networking/browsers/lagrange { @@ -5905,6 +5974,8 @@ in matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools; + matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { }; + matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; @@ -6059,8 +6130,6 @@ in jump = callPackage ../tools/system/jump {}; - kindlegen = callPackage ../tools/typesetting/kindlegen { }; - latex2html = callPackage ../tools/misc/latex2html { }; latexrun = callPackage ../tools/typesetting/tex/latexrun { }; @@ -6280,7 +6349,6 @@ in luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; - lzma = xz; # TODO: move to aliases.nix lz4 = callPackage ../tools/compression/lz4 { }; @@ -6667,33 +6735,33 @@ in }; # stripped down, needed by steam - networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { }; + networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { }; - networkmanager = callPackage ../tools/networking/network-manager { }; + networkmanager = callPackage ../tools/networking/networkmanager { }; - networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine { }; + networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; - networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; + networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp { }; + networkmanager-l2tp = callPackage ../tools/networking/networkmanager/l2tp { }; - networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc { }; + networkmanager-vpnc = callPackage ../tools/networking/networkmanager/vpnc { }; - networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect { }; + networkmanager-openconnect = callPackage ../tools/networking/networkmanager/openconnect { }; - networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/networkmanager/fortisslvpn { }; - networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { }; + networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { }; - networkmanager-sstp = callPackage ../tools/networking/network-manager/sstp { }; + networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; - networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { }; + networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { }; - libnma = callPackage ../tools/networking/network-manager/libnma { }; + libnma = callPackage ../tools/networking/networkmanager/libnma { }; - networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu { }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { }; - nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; + nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { inherit (darwin.apple_sdk.frameworks) Security Foundation; @@ -6932,6 +7000,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + ombi = callPackage ../servers/ombi { }; + omping = callPackage ../applications/networking/omping { }; onefetch = callPackage ../tools/misc/onefetch { @@ -7000,20 +7070,19 @@ in opensm = callPackage ../tools/networking/opensm { }; - openssh = - callPackage ../tools/networking/openssh { - hpnSupport = false; - etcDir = "/etc/ssh"; - pam = if stdenv.isLinux then pam else null; - }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); - openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { - hpnSupport = true; - }); + openssh = opensshPackages.openssh.override { + etcDir = "/etc/ssh"; + }; - openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { - withGssapiPatches = true; - }); + openssh_hpn = opensshPackages.openssh_hpn.override { + etcDir = "/etc/ssh"; + }; + + openssh_gssapi = opensshPackages.openssh_gssapi.override { + etcDir = "/etc/ssh"; + }; opensp = callPackage ../tools/text/sgml/opensp { }; @@ -7095,6 +7164,8 @@ in owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; + oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; + oxidized = callPackage ../tools/admin/oxidized { }; oxipng = callPackage ../tools/graphics/oxipng { }; @@ -7598,6 +7669,8 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; + qmk = callPackage ../tools/misc/qmk { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; @@ -7690,6 +7763,10 @@ in retext = libsForQt5.callPackage ../applications/editors/retext { }; + inherit (callPackage ../tools/security/rekor { }) + rekor-cli + rekor-server; + richgo = callPackage ../development/tools/richgo { }; rs = callPackage ../tools/text/rs { }; @@ -8280,6 +8357,8 @@ in splot = haskell.lib.justStaticExecutables haskellPackages.splot; + spotdl = callPackage ../tools/audio/spotdl { }; + squashfsTools = callPackage ../tools/filesystems/squashfs { }; squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { }; @@ -8331,6 +8410,8 @@ in super = callPackage ../tools/security/super { }; + supertag = callPackage ../tools/filesystems/supertag { }; + supertux-editor = callPackage ../applications/editors/supertux-editor { }; svgbob = callPackage ../tools/graphics/svgbob { }; @@ -8347,12 +8428,7 @@ in sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { - openssl = openssl_1_0_2.override { - enableSSL2 = true; - enableSSL3 = true; - }; - }; + sslscan = callPackage ../tools/security/sslscan { }; sslmate = callPackage ../development/tools/sslmate { }; @@ -8547,6 +8623,8 @@ in texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + tex-match = callPackage ../tools/typesetting/tex/tex-match { }; + thc-hydra = callPackage ../tools/security/thc-hydra { }; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; @@ -8809,6 +8887,8 @@ in ubridge = callPackage ../tools/networking/ubridge { }; + ubertooth = callPackage ../applications/radio/ubertooth { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -9540,8 +9620,6 @@ in zinnia = callPackage ../tools/inputmethods/zinnia { }; tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; - zimreader = callPackage ../tools/text/zimreader { }; - zimwriterfs = callPackage ../tools/text/zimwriterfs { }; par = callPackage ../tools/text/par { }; @@ -9895,6 +9973,7 @@ in }; }; + clang_12 = llvmPackages_12.clang; clang_11 = llvmPackages_11.clang; clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; @@ -9956,12 +10035,11 @@ in inherit (callPackages ../development/compilers/crystal { llvmPackages = llvmPackages_10; }) - crystal_0_31 - crystal_0_32 crystal_0_33 crystal_0_34 crystal_0_35 crystal_0_36 + crystal_1_0 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; @@ -10740,6 +10818,8 @@ in knightos-z80e = callPackage ../development/tools/knightos/z80e { }; + koka = haskellPackages.callPackage ../development/compilers/koka { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -10771,6 +10851,7 @@ in lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; lld_11 = llvmPackages_11.lld; + lld_12 = llvmPackages_12.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -10780,10 +10861,12 @@ in lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; lldb_11 = llvmPackages_11.lldb; + lldb_12 = llvmPackages_12.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_12 = llvmPackages_12.llvm; llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; llvm_9 = llvmPackages_9.llvm; @@ -10848,6 +10931,14 @@ in stdenv = gcc7Stdenv; })); + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_12.tools; + targetLlvmLibraries = targetPackages.llvmPackages_12.libraries; + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + })); + llvmPackages_latest = llvmPackages_11; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -11324,6 +11415,7 @@ in vala_0_44 vala_0_46 vala_0_48 + vala_0_50 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -12172,7 +12264,6 @@ in }); bison = callPackage ../development/tools/parsing/bison { }; - yacc = bison; # TODO: move to aliases.nix # Ruby fails to build with current bison bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec { @@ -12317,6 +12408,8 @@ in cookiecutter = with python3Packages; toPythonApplication cookiecutter; + corrosion = callPackage ../development/tools/build-managers/corrosion { }; + corundum = callPackage ../development/tools/corundum { }; confluent-platform = callPackage ../servers/confluent-platform {}; @@ -12605,6 +12698,8 @@ in inherit (xorg) libX11 libXext libXi libXtst; }; + gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; + github-release = callPackage ../development/tools/github/github-release { }; global = callPackage ../development/tools/misc/global { }; @@ -12850,7 +12945,7 @@ in mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; - go-md2man = callPackage ../development/tools/misc/md2man {}; + go-md2man = callPackage ../development/tools/misc/go-md2man {}; mage = callPackage ../development/tools/build-managers/mage { }; @@ -13140,6 +13235,8 @@ in shellcheck = callPackage ../development/tools/shellcheck {}; + shellharden = callPackage ../development/tools/shellharden {}; + schemaspy = callPackage ../development/tools/database/schemaspy { }; shncpd = callPackage ../tools/networking/shncpd { }; @@ -13825,7 +13922,7 @@ in cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; + libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; }; # Make bdb5 the default as it is the last release under the custom @@ -14066,7 +14163,7 @@ in fstrm = callPackage ../development/libraries/fstrm { }; - cfitsio = callPackage ../development/libraries/cfitsio { }; + cfitsio = callPackage ../development/libraries/science/astronomy/cfitsio { }; fontconfig = callPackage ../development/libraries/fontconfig { }; @@ -14178,8 +14275,6 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; - gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; gdcm = callPackage ../development/libraries/gdcm { }; @@ -14764,9 +14859,9 @@ in indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { }; 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 { }; + indilib = callPackage ../development/libraries/science/astronomy/indilib { }; + indi-3rdparty = callPackage ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { }; + indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; @@ -14865,7 +14960,6 @@ in }; krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; - kerberos = libkrb5; # TODO: move to aliases.nix l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; @@ -15233,6 +15327,10 @@ in libfprint = callPackage ../development/libraries/libfprint { }; + libfprint-tod = callPackage ../development/libraries/libfprint-tod { }; + + libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; + libfpx = callPackage ../development/libraries/libfpx { }; libgadu = callPackage ../development/libraries/libgadu { }; @@ -15270,7 +15368,9 @@ in libgxps = callPackage ../development/libraries/libgxps { }; - libiio = callPackage ../development/libraries/libiio { }; + libiio = callPackage ../development/libraries/libiio { + python = python3; + }; libinjection = callPackage ../development/libraries/libinjection { }; @@ -15721,7 +15821,7 @@ in libnih = callPackage ../development/libraries/libnih { }; - libnova = callPackage ../development/libraries/libnova { }; + libnova = callPackage ../development/libraries/science/astronomy/libnova { }; libnxml = callPackage ../development/libraries/libnxml { }; @@ -16367,7 +16467,7 @@ in openssl = openssl_1_0_2; }; - nettle = callPackage ../development/libraries/nettle { }; + nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {}; @@ -17596,7 +17696,7 @@ in waylandpp = callPackage ../development/libraries/waylandpp { }; - wcslib = callPackage ../development/libraries/wcslib { }; + wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; @@ -17762,6 +17862,8 @@ in zlib = callPackage ../development/libraries/zlib { }; + zlib-ng = callPackage ../development/libraries/zlib-ng { }; + libdynd = callPackage ../development/libraries/libdynd { }; zlog = callPackage ../development/libraries/zlog { }; @@ -18021,9 +18123,7 @@ in ### SERVERS - _389-ds-base = callPackage ../servers/ldap/389 { - kerberos = libkrb5; - }; + _389-ds-base = callPackage ../servers/ldap/389 { }; adguardhome = callPackage ../servers/adguardhome {}; @@ -18516,6 +18616,8 @@ in }; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; + pomerium = callPackage ../servers/http/pomerium { }; + postgrey = callPackage ../servers/mail/postgrey { }; pshs = callPackage ../servers/http/pshs { }; @@ -18603,7 +18705,6 @@ in inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; - mysql = mariadb; # TODO: move to aliases.nix mongodb = hiPrio mongodb-3_4; @@ -18768,6 +18869,7 @@ in prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; + prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; @@ -18787,6 +18889,7 @@ in prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; + prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; @@ -19400,7 +19503,6 @@ in iotop = callPackage ../os-specific/linux/iotop { }; iproute2 = callPackage ../os-specific/linux/iproute { }; - iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix) iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; @@ -19783,7 +19885,8 @@ in rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; - rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; + rtw88 = callPackage ../os-specific/linux/rtw88 { }; + rtlwifi_new = rtw88; openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; @@ -19820,6 +19923,8 @@ in sch_cake = callPackage ../os-specific/linux/sch_cake { }; + isgx = callPackage ../os-specific/linux/isgx { }; + sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; @@ -19869,7 +19974,7 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_5_4; + linuxPackages = linuxPackages_5_10; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! @@ -20365,7 +20470,7 @@ in rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; - rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; + rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; s3ql = callPackage ../tools/backup/s3ql { }; @@ -20994,6 +21099,8 @@ in koreader = callPackage ../applications/misc/koreader {}; + kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -21120,6 +21227,8 @@ in mustache-go = callPackage ../development/tools/mustache-go { }; + mustache-hpp = callPackage ../development/libraries/mustache-hpp { }; + myrica = callPackage ../data/fonts/myrica { }; nafees = callPackage ../data/fonts/nafees { }; @@ -21607,6 +21716,8 @@ in }); android-studio = androidStudioPackages.stable; + angelfish = libsForQt5.callPackage ../applications/networking/browsers/angelfish { }; + animbar = callPackage ../applications/graphics/animbar { }; antfs-cli = callPackage ../applications/misc/antfs-cli {}; @@ -21894,6 +22005,8 @@ in calibre = libsForQt5.callPackage ../applications/misc/calibre { }; + calibre-web = callPackage ../servers/calibre-web { }; + calligra = libsForQt5.callPackage ../applications/office/calligra { # Must use the same Qt version as Calligra itself: poppler = libsForQt5.poppler_0_61; @@ -22677,7 +22790,7 @@ in gthumb = callPackage ../applications/graphics/gthumb { }; - gtimelog = pythonPackages.gtimelog; + gtimelog = with python3Packages; toPythonApplication gtimelog; inherit (gnome3) gucharmap; @@ -22971,6 +23084,8 @@ in jdk = callPackage ../development/compilers/jetbrains-jdk { }; }); + jmusicbot = callPackage ../applications/audio/jmusicbot { }; + libquvi = callPackage ../applications/video/quvi/library.nix { }; librespot = callPackage ../applications/audio/librespot { @@ -23344,6 +23459,8 @@ in xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; + i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { }; + i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; @@ -23354,6 +23471,8 @@ in i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; + i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { }; + i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; @@ -23619,6 +23738,8 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; + kconf = callPackage ../applications/networking/cluster/kconf { }; + kail = callPackage ../tools/networking/kail { }; kanboard = callPackage ../applications/misc/kanboard { }; @@ -23677,7 +23798,7 @@ in ffmpeg = ffmpeg_2; }; - kiwix = callPackage ../applications/misc/kiwix { }; + kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -23725,6 +23846,10 @@ in kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kuttl = callPackage ../applications/networking/cluster/kuttl { + buildGoModule = buildGo115Module; + }; + kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; @@ -23735,6 +23860,8 @@ in k9s = callPackage ../applications/networking/cluster/k9s { }; + pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; + popeye = callPackage ../applications/networking/cluster/popeye { }; kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; @@ -25397,6 +25524,8 @@ in split2flac = callPackage ../applications/audio/split2flac { }; + spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; + spotify-tui = callPackage ../applications/audio/spotify-tui { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -25461,7 +25590,7 @@ in }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { - inherit (xfce) exo; + inherit (xfce) xfce4-dev-tools; }; lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; @@ -25609,7 +25738,7 @@ in sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) - subversion19 subversion_1_10 subversion; + subversion_1_10 subversion; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -25632,6 +25761,8 @@ in sunvox = callPackage ../applications/audio/sunvox { }; + svkbd = callPackage ../applications/accessibility/svkbd { }; + swaglyrics = callPackage ../tools/misc/swaglyrics { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -25950,6 +26081,8 @@ in unigine-valley = callPackage ../applications/graphics/unigine-valley { }; + unipicker = callPackage ../applications/misc/unipicker { }; + unison = callPackage ../applications/networking/sync/unison { ocamlPackages = ocaml-ng.ocamlPackages_4_09; enableX11 = config.unison.enableX11 or true; @@ -26242,6 +26375,8 @@ in pythonPackages = python3Packages; }; + wapiti = callPackage ../tools/security/wapiti { }; + way-cooler = throw ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); @@ -26515,6 +26650,8 @@ in xcape = callPackage ../tools/X11/xcape { }; + xcat = callPackage ../tools/security/xcat { }; + xchainkeys = callPackage ../tools/X11/xchainkeys { }; xchm = callPackage ../applications/misc/xchm { }; @@ -26748,6 +26885,8 @@ in zathura = callPackage ../applications/misc/zathura { }; + zdns = callPackage ../tools/security/zdns { }; + zerobin = callPackage ../applications/networking/zerobin { }; zeroc-ice = callPackage ../development/libraries/zeroc-ice { @@ -27324,9 +27463,7 @@ in icbm3d = callPackage ../games/icbm3d { }; - ingen = callPackage ../applications/audio/ingen { - inherit (pythonPackages) rdflib; - }; + ingen = callPackage ../applications/audio/ingen { }; ideogram = callPackage ../applications/graphics/ideogram { }; @@ -28003,6 +28140,7 @@ in clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; @@ -28598,6 +28736,8 @@ in cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; + crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet.nix { }; + caprice32 = callPackage ../misc/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { @@ -29007,7 +29147,7 @@ in stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; - stellarsolver = libsForQt5.callPackage ../development/libraries/stellarsolver { }; + stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { }; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; @@ -29179,6 +29319,8 @@ in cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; + cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { }; + # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -29365,8 +29507,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; inherit (darwin) libobjc; }; + libjack2 = jack2.override { prefix = "lib"; }; - jack2Full = jack2; # TODO: move to aliases.nix j2cli = with python3Packages; toPythonApplication j2cli; @@ -29416,6 +29558,8 @@ in martyr = callPackage ../development/libraries/martyr { }; + mas = callPackage ../os-specific/darwin/mas { }; + moltengamepad = callPackage ../misc/drivers/moltengamepad { }; openzwave = callPackage ../development/libraries/openzwave { }; @@ -29447,6 +29591,8 @@ in nixUnstable nixFlakes; + nixStatic = pkgsStatic.nix; + nixops = callPackage ../tools/package-management/nixops { }; nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); @@ -29696,7 +29842,11 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { - gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; + gdal = gdal.override { + libmysqlclient = mysql // { + lib = { dev = mysql; } + ;} + ;}; mysql = mysql; pcre = pcre-cpp; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -29936,6 +30086,8 @@ in spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { }; + spnavcfg = callPackage ../applications/misc/spnavcfg { }; + splix = callPackage ../misc/cups/drivers/splix { }; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; @@ -29977,6 +30129,8 @@ in callPackage ../applications/networking/cluster/terraform-providers {} ); + terraforming = callPackage ../applications/networking/cluster/terraforming { }; + terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {}; terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; @@ -30424,6 +30578,8 @@ in opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; + openring = callPackage ../applications/misc/openring { }; + phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; duti = callPackage ../os-specific/darwin/duti { @@ -30489,13 +30645,6 @@ in pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; - qmk_firmware = callPackage ../development/misc/qmk_firmware { - avrgcc = pkgsCross.avr.buildPackages.gcc; - avrbinutils = pkgsCross.avr.buildPackages.binutils; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; - }; - new-session-manager = callPackage ../applications/audio/new-session-manager { }; newlib = callPackage ../development/misc/newlib { }; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 0da4fea8f4..e15a1c3c87 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -58,6 +58,7 @@ let mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; + odd-order = callPackage ../development/coq-modules/odd-order { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; diff --git a/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix b/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix index e5c2c8be31..eaffce4c6e 100644 --- a/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/gnuradio-packages.nix @@ -31,6 +31,7 @@ in { ### Packages inherit gnuradio; + inherit (gnuradio) python; osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix index 38d1ed6b86..fbdf45d420 100644 --- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -106,6 +106,10 @@ let self = rec { inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { }; + inputstream-ffmpegdirect = callPackage ../applications/video/kodi-packages/inputstream-ffmpegdirect { }; + + inputstream-rtmp = callPackage ../applications/video/kodi-packages/inputstream-rtmp { }; + inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { }; kodi-six = callPackage ../applications/video/kodi-packages/kodi-six { }; diff --git a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix index b42f827d0d..62ddc14ff9 100644 --- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix @@ -8,7 +8,7 @@ { fetchurl, stdenv, lua, unzip, pkg-config , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat , autoreconfHook, gnum4 -, mysql, postgresql, cyrus_sasl +, postgresql, cyrus_sasl , fetchFromGitHub, which, writeText , pkgs , lib diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 61728d1409..87d4d52d38 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -238,8 +238,6 @@ let decompress = callPackage ../development/ocaml-modules/decompress { }; - decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { }; - diet = callPackage ../development/ocaml-modules/diet { }; digestif = callPackage ../development/ocaml-modules/digestif { }; @@ -415,9 +413,7 @@ let hxd = callPackage ../development/ocaml-modules/hxd { }; - imagelib = callPackage ../development/ocaml-modules/imagelib { - decompress = decompress-1-2; - }; + imagelib = callPackage ../development/ocaml-modules/imagelib { }; inotify = callPackage ../development/ocaml-modules/inotify { }; @@ -681,6 +677,8 @@ let mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; + mirage-clock-freestanding = callPackage ../development/ocaml-modules/mirage-clock/freestanding.nix { }; + mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; mirage-console = callPackage ../development/ocaml-modules/mirage-console { }; @@ -689,6 +687,8 @@ let mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; + mirage-crypto-ec = callPackage ../development/ocaml-modules/mirage-crypto/ec.nix { }; + mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; @@ -792,6 +792,8 @@ let ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; + gettext-camomile = callPackage ../development/ocaml-modules/ocaml-gettext/camomile.nix { }; + gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; @@ -928,6 +930,8 @@ let parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; + pbkdf = callPackage ../development/ocaml-modules/pbkdf { }; + pcap-format = callPackage ../development/ocaml-modules/pcap-format { }; pecu = callPackage ../development/ocaml-modules/pecu { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index a2aa171979..428c9b5579 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -15119,6 +15119,11 @@ let url = "mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz"; sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093"; }; + patches = [ + # Fix for security issue: prevent leading zeroes in ipv4 octets + # https://blog.urth.org/2021/03/29/security-issues-in-perl-ip-address-distros/ + ../development/perl-modules/Net-CIDR-Lite-prevent-leading-zeroes-ipv4.patch + ]; meta = { description = "Perl extension for merging IPv4 or IPv6 CIDR addresses"; }; @@ -15424,10 +15429,10 @@ let NetNetmask = buildPerlPackage { pname = "Net-Netmask"; - version = "1.9104"; + version = "2.0001"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz"; - sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y"; + url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-2.0001.tar.gz"; + sha256 = "0waiix46wv93a5zzjjv7ypdnfdf7lizwrhx12128rcvzcvw6wd8p"; }; buildInputs = [ Test2Suite TestUseAllModules ]; meta = { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 5e925957e5..c11dcd0859 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1100,6 +1100,8 @@ in { bpython = callPackage ../development/python-modules/bpython { }; + bracex = callPackage ../development/python-modules/bracex { }; + braintree = callPackage ../development/python-modules/braintree { }; branca = callPackage ../development/python-modules/branca { }; @@ -2059,6 +2061,8 @@ in { drf-yasg = callPackage ../development/python-modules/drf-yasg { }; + drivelib = callPackage ../development/python-modules/drivelib { }; + drms = callPackage ../development/python-modules/drms { }; dropbox = callPackage ../development/python-modules/dropbox { }; @@ -2153,6 +2157,8 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; + enrich = callPackage ../development/python-modules/enrich { }; + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; @@ -2233,6 +2239,8 @@ in { exifread = callPackage ../development/python-modules/exifread { }; + expiringdict = callPackage ../development/python-modules/expiringdict { }; + exrex = callPackage ../development/python-modules/exrex { }; extras = callPackage ../development/python-modules/extras { }; @@ -2539,6 +2547,8 @@ in { fpylll = callPackage ../development/python-modules/fpylll { }; + freebox-api = callPackage ../development/python-modules/freebox-api { }; + freetype-py = callPackage ../development/python-modules/freetype-py { }; freezegun = if isPy27 then @@ -3649,9 +3659,7 @@ in { keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + kerberos = callPackage ../development/python-modules/kerberos { }; keyring = if isPy3k then callPackage ../development/python-modules/keyring { } @@ -5904,6 +5912,8 @@ in { pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; + pylitterbot = callPackage ../development/python-modules/pylitterbot { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; pylru = callPackage ../development/python-modules/pylru { }; @@ -5948,6 +5958,8 @@ in { pymeeus = callPackage ../development/python-modules/pymeeus { }; + pymemcache = callPackage ../development/python-modules/pymemcache { }; + pymemoize = callPackage ../development/python-modules/pymemoize { }; pyment = callPackage ../development/python-modules/pyment { }; @@ -6057,7 +6069,9 @@ in { pyosf = callPackage ../development/python-modules/pyosf { }; - pyosmium = callPackage ../development/python-modules/pyosmium { }; + pyosmium = callPackage ../development/python-modules/pyosmium { + inherit (pkgs) lz4; + }; pyotp = callPackage ../development/python-modules/pyotp { }; @@ -6388,6 +6402,8 @@ in { pyte = callPackage ../development/python-modules/pyte { }; + pytenable = callPackage ../development/python-modules/pytenable { }; + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; pytesseract = callPackage ../development/python-modules/pytesseract { }; @@ -6631,6 +6647,8 @@ in { python-binance = callPackage ../development/python-modules/python-binance { }; + python-box = callPackage ../development/python-modules/python-box { }; + python-constraint = callPackage ../development/python-modules/python-constraint { }; python-crontab = callPackage ../development/python-modules/python-crontab { }; @@ -6891,8 +6909,12 @@ in { pytricia = callPackage ../development/python-modules/pytricia { }; + pytube = callPackage ../development/python-modules/pytube { }; + pytun = callPackage ../development/python-modules/pytun { }; + pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; @@ -7100,6 +7122,8 @@ in { random2 = callPackage ../development/python-modules/random2 { }; + rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; @@ -7204,6 +7228,8 @@ in { requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; + requests-pkcs12 = callPackage ../development/python-modules/requests-pkcs12 { }; + requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 @@ -7218,6 +7244,8 @@ in { respx = callPackage ../development/python-modules/respx { }; + restfly = callPackage ../development/python-modules/restfly { }; + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; @@ -7348,12 +7376,16 @@ in { rtslib = callPackage ../development/python-modules/rtslib { }; + ruamel-base = self.ruamel_base; ruamel_base = callPackage ../development/python-modules/ruamel_base { }; + ruamel-ordereddict = self.ruamel_ordereddict; ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + ruamel-yaml = self.ruamel_yaml; ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + ruamel-yaml-clib = self.ruamel_yaml_clib; ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; rubymarshal = callPackage ../development/python-modules/rubymarshal { }; @@ -8755,6 +8787,8 @@ in { WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; + wcmatch = callPackage ../development/python-modules/wcmatch { }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; weasyprint = callPackage ../development/python-modules/weasyprint { }; @@ -8956,6 +8990,8 @@ in { xnd = callPackage ../development/python-modules/xnd { }; + xpath-expressions = callPackage ../development/python-modules/xpath-expressions { }; + xpybutil = callPackage ../development/python-modules/xpybutil { }; xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { }; @@ -9002,6 +9038,8 @@ in { yarl = callPackage ../development/python-modules/yarl { }; + yaswfp = callPackage ../development/python-modules/yaswfp { }; + yattag = callPackage ../development/python-modules/yattag { }; ydiff = callPackage ../development/python-modules/ydiff { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-small.nix b/third_party/nixpkgs/pkgs/top-level/release-small.nix index a394c4d8ee..7f86b30aaf 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-small.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-small.nix @@ -93,7 +93,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; ltrace = linux; lvm2 = linux; lynx = linux; - lzma = linux; + xz = linux; man = linux; man-pages = linux; mc = all; diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix index b3fe7bf8c9..3cddcde603 100644 --- a/third_party/nixpkgs/pkgs/top-level/static.nix +++ b/third_party/nixpkgs/pkgs/top-level/static.nix @@ -93,27 +93,37 @@ in { clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; - zlib = super.zlib.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; - openssl = super.openssl_1_1.overrideAttrs (o: { - # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. - configureFlags = (removeUnknownConfigureFlags o.configureFlags); - }); boost = super.boost.override { # Don’t use new stdenv for boost because it doesn’t like the # --disable-shared flag stdenv = super.stdenv; }; + + curl = super.curl.override { + # brotli doesn't build static (Mar. 2021) + brotliSupport = false; + # disable gss becuase of: undefined reference to `k5_bcmp' + gssSupport = false; + }; + + ocaml-ng = self.lib.mapAttrs (_: set: + if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set + ) super.ocaml-ng; + + openssl = super.openssl_1_1.overrideAttrs (o: { + # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. + configureFlags = (removeUnknownConfigureFlags o.configureFlags); + }); + perl = super.perl.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - ocaml-ng = self.lib.mapAttrs (_: set: - if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set - ) super.ocaml-ng; + zlib = super.zlib.override { + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; }